diff --git a/Assets/Characters/Soullies/Coat.mat b/Assets/Characters/Soullies/Coat.mat index 8846d3974..a807edcdf 100644 --- a/Assets/Characters/Soullies/Coat.mat +++ b/Assets/Characters/Soullies/Coat.mat @@ -909,13 +909,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Decorations.mat b/Assets/Characters/Soullies/Decorations.mat index c9af4d2aa..009cdfe72 100644 --- a/Assets/Characters/Soullies/Decorations.mat +++ b/Assets/Characters/Soullies/Decorations.mat @@ -938,13 +938,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Hair01.mat b/Assets/Characters/Soullies/Hair01.mat index 09c2a806e..3c5ba2d96 100644 --- a/Assets/Characters/Soullies/Hair01.mat +++ b/Assets/Characters/Soullies/Hair01.mat @@ -909,13 +909,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Hair02.mat b/Assets/Characters/Soullies/Hair02.mat index 5aaf2b9a8..87a41d6f7 100644 --- a/Assets/Characters/Soullies/Hair02.mat +++ b/Assets/Characters/Soullies/Hair02.mat @@ -909,13 +909,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Hands.mat b/Assets/Characters/Soullies/Hands.mat index 6d865414f..127ffb417 100644 --- a/Assets/Characters/Soullies/Hands.mat +++ b/Assets/Characters/Soullies/Hands.mat @@ -937,13 +937,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Head.mat b/Assets/Characters/Soullies/Head.mat index 1eb0eb329..3d39c829d 100644 --- a/Assets/Characters/Soullies/Head.mat +++ b/Assets/Characters/Soullies/Head.mat @@ -908,13 +908,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Characters/Soullies/Legs.mat b/Assets/Characters/Soullies/Legs.mat index 05c13c5f1..086d95fcf 100644 --- a/Assets/Characters/Soullies/Legs.mat +++ b/Assets/Characters/Soullies/Legs.mat @@ -954,13 +954,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _HiLightColor: {r: 1, g: 1, b: 1, a: 1} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Characters/Soullies/Shirt Skirt.mat b/Assets/Characters/Soullies/Shirt Skirt.mat index 27c83f40d..799cd811a 100644 --- a/Assets/Characters/Soullies/Shirt Skirt.mat +++ b/Assets/Characters/Soullies/Shirt Skirt.mat @@ -909,13 +909,13 @@ Material: - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} - - _FaceForward: {r: -0.0665922, g: -0.42889756, b: 0.9008953, a: 0} - - _FaceUp: {r: 0.061814837, g: 0.8993918, b: 0.43275094, a: 0} + - _FaceForward: {r: 0.03887351, g: -0.33023596, b: 0.9430976, a: 0} + - _FaceUp: {r: -0.02244219, g: 0.9432844, b: 0.3312264, a: 0} - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} - - _HeadWorldPos: {r: -0.0049033333, g: 1.6045952, b: 0.033351183, a: 0} + - _HeadWorldPos: {r: 0.005572671, g: 1.5960494, b: 0.025174975, a: 0} - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/External VFXs/MasterStylizedProjectiles/Materials/Arrow/BloodSplash.mat b/Assets/External VFXs/MasterStylizedProjectiles/Materials/Arrow/BloodSplash.mat index 7e7f8126c..6521dde4f 100644 --- a/Assets/External VFXs/MasterStylizedProjectiles/Materials/Arrow/BloodSplash.mat +++ b/Assets/External VFXs/MasterStylizedProjectiles/Materials/Arrow/BloodSplash.mat @@ -19,11 +19,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - GRABPASS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -94,8 +96,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,11 +117,11 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 - __dirty: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat new file mode 100644 index 000000000..fe0023093 --- /dev/null +++ b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat @@ -0,0 +1,682 @@ +%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: ZQK Font SDF Glow + m_Shader: {fileID: 4800000, guid: bb134d7d4389e3a45a6c49e898a344a4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ISTEXTMESHPRO_ON + - _ISTEXT_ON + - _SHADERFADING_NONE + - _SHADERSPACE_UV + - _TEXTURELAYER1SHEETTOGGLE_ON + - _TEXTURELAYER2SHEETTOGGLE_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AddColorMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AddHueMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CustomFadeFadeMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadingMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _InnerOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -478184148220021899, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetalMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OuterOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PixelOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBYCPTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SineGlowMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _StrongTintMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer1Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer2Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UVDistortMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UberNoiseTexture: + m_Texture: {fileID: 2800000, guid: b8d18cd117976254d94a812a0bfc336e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _texcoord: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddColorContrast: 0.5 + - _AddColorContrastToggle: 0 + - _AddColorFade: 1 + - _AddColorMaskToggle: 0 + - _AddHueBrightness: 2 + - _AddHueContrast: 0.5 + - _AddHueFade: 1 + - _AddHueMaskToggle: 0 + - _AddHueSaturation: 1 + - _AddHueSpeed: 1 + - _AlphaTintFade: 1 + - _AlphaTintMinAlpha: 0.02 + - _Ambient: 0.5 + - _BakedMaterial: 0 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BlackTintFade: 1 + - _BlackTintPower: 4 + - _Brightness: 1 + - _BumpFace: 0 + - _BumpOutline: 0 + - _BurnEdgeNoiseFactor: 0.5 + - _BurnFade: 1 + - _BurnInsideContrast: 2 + - _BurnInsideNoiseFactor: 0.2 + - _BurnRadius: 5 + - _BurnSwirlFactor: 1 + - _BurnWidth: 0.1 + - _CamouflageAnimationToggle: 0 + - _CamouflageContrast: 1 + - _CamouflageDensityA: 0.4 + - _CamouflageDensityB: 0.4 + - _CamouflageFade: 1 + - _CamouflageSmoothnessA: 0.2 + - _CamouflageSmoothnessB: 0.2 + - _CheckerboardDarken: 0.5 + - _CheckerboardTiling: 1 + - _ColorMask: 15 + - _ColorReplaceContrast: 1 + - _ColorReplaceFade: 1 + - _ColorReplaceRange: 0.05 + - _ColorReplaceSmoothness: 0.1 + - _Contrast: 1 + - _CullMode: 0 + - _CustomFadeAlpha: 1 + - _CustomFadeNoiseFactor: 0 + - _CustomFadeSmoothness: 2 + - _Diffuse: 0.5 + - _DirectionalAlphaFadeFade: 0 + - _DirectionalAlphaFadeInvert: 0 + - _DirectionalAlphaFadeNoiseFactor: 0.2 + - _DirectionalAlphaFadeRotation: 0 + - _DirectionalAlphaFadeWidth: 0.2 + - _DirectionalDistortionFade: 0 + - _DirectionalDistortionInvert: 0 + - _DirectionalDistortionNoiseFactor: 0.2 + - _DirectionalDistortionRandomDirection: 0.1 + - _DirectionalDistortionRotation: 0 + - _DirectionalDistortionWidth: 0.5 + - _DirectionalGlowFadeFade: 0 + - _DirectionalGlowFadeInvert: 0 + - _DirectionalGlowFadeNoiseFactor: 0.2 + - _DirectionalGlowFadeRotation: 0 + - _DirectionalGlowFadeWidth: 0.1 + - _EnableAddColor: 0 + - _EnableAddHue: 0 + - _EnableAlphaTint: 0 + - _EnableBlackTint: 0 + - _EnableBrightness: 0 + - _EnableBurn: 0 + - _EnableCamouflage: 0 + - _EnableCheckerboard: 0 + - _EnableColorReplace: 0 + - _EnableContrast: 0 + - _EnableCustomFade: 0 + - _EnableDirectionalAlphaFade: 0 + - _EnableDirectionalDistortion: 0 + - _EnableDirectionalGlowFade: 0 + - _EnableEnchanted: 0 + - _EnableFlame: 0 + - _EnableFrozen: 0 + - _EnableFullAlphaDissolve: 0 + - _EnableFullDistortion: 0 + - _EnableFullGlowDissolve: 0 + - _EnableGaussianBlur: 0 + - _EnableGlitch: 0 + - _EnableHalftone: 0 + - _EnableHologram: 0 + - _EnableHue: 0 + - _EnableInkSpread: 0 + - _EnableInnerOutline: 0 + - _EnableMetal: 0 + - _EnableNegative: 0 + - _EnableOuterOutline: 0 + - _EnablePingPongGlow: 0 + - _EnablePixelOutline: 0 + - _EnablePixelate: 0 + - _EnablePoison: 0 + - _EnableRainbow: 0 + - _EnableRecolorRGB: 0 + - _EnableRecolorRGBYCP: 0 + - _EnableSaturation: 0 + - _EnableScreenTiling: 0 + - _EnableShadow: 0 + - _EnableSharpen: 0 + - _EnableShiftHue: 0 + - _EnableShifting: 0 + - _EnableShine: 0 + - _EnableSineGlow: 0 + - _EnableSineMove: 0 + - _EnableSineRotate: 0 + - _EnableSineScale: 0 + - _EnableSmoke: 0 + - _EnableSmoothPixelArt: 0 + - _EnableSourceAlphaDissolve: 0 + - _EnableSourceGlowDissolve: 0 + - _EnableSplitToning: 0 + - _EnableSqueeze: 0 + - _EnableSquish: 0 + - _EnableStrongTint: 0 + - _EnableTextureLayer1: 0 + - _EnableTextureLayer2: 0 + - _EnableUVDistort: 0 + - _EnableUVRotate: 0 + - _EnableUVScale: 0 + - _EnableUVScroll: 0 + - _EnableVibrate: 0 + - _EnableWiggle: 0 + - _EnableWind: 0 + - _EnableWorldTiling: 0 + - _EnchantedBrightness: 1 + - _EnchantedContrast: 0.5 + - _EnchantedFade: 1 + - _EnchantedLerpToggle: 0 + - _EnchantedRainbowDensity: 0.5 + - _EnchantedRainbowSaturation: 0.8 + - _EnchantedRainbowSpeed: 0.5 + - _EnchantedRainbowToggle: 0 + - _EnchantedReduce: 0 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _FadingFade: 1 + - _FadingNoiseFactor: 0.2 + - _FadingWidth: 0.3 + - _FlameBrightness: 10 + - _FlameNoiseFactor: 2.5 + - _FlameNoiseHeightFactor: 1.5 + - _FlameRadius: 0.2 + - _FlameSmooth: 2 + - _FrozenContrast: 2 + - _FrozenFade: 1 + - _FrozenHighlightContrast: 2 + - _FrozenHighlightDensity: 1 + - _FrozenSnowContrast: 1 + - _FrozenSnowDensity: 0.25 + - _FullAlphaDissolveFade: 0.5 + - _FullAlphaDissolveWidth: 0.5 + - _FullDistortionFade: 1 + - _FullGlowDissolveFade: 0.5 + - _FullGlowDissolveWidth: 0.5 + - _GaussianBlurFade: 1 + - _GaussianBlurOffset: 0.5 + - _GlitchBrightness: 4 + - _GlitchFade: 1 + - _GlitchHueSpeed: 1 + - _GlitchMaskMin: 0.4 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 9 + - _HalftoneFade: 1 + - _HalftoneFadeWidth: 1.5 + - _HalftoneInvert: 0 + - _HalftoneTiling: 4 + - _HologramContrast: 1 + - _HologramDistortionDensity: 0.5 + - _HologramDistortionOffset: 0.5 + - _HologramDistortionScale: 10 + - _HologramDistortionSpeed: 2 + - _HologramFade: 1 + - _HologramLineFrequency: 500 + - _HologramLineGap: 3 + - _HologramLineSpeed: 0.01 + - _HologramMinAlpha: 0.2 + - _Hue: 0 + - _InkSpreadContrast: 2 + - _InkSpreadDistance: 3 + - _InkSpreadFade: 1 + - _InkSpreadNoiseFactor: 0.5 + - _InkSpreadWidth: 0.2 + - _InnerOutlineDistortionToggle: 0 + - _InnerOutlineFade: 1 + - _InnerOutlineOutlineOnlyToggle: 0 + - _InnerOutlineTextureToggle: 0 + - _InnerOutlineWidth: 0.02 + - _IsText: 1 + - _IsTextMeshPro: 1 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MetalContrast: 2 + - _MetalFade: 1 + - _MetalHighlightContrast: 2 + - _MetalHighlightDensity: 1 + - _MetalMaskToggle: 0 + - _NegativeFade: 1 + - _OuterOutlineDistortionToggle: 0 + - _OuterOutlineFade: 1 + - _OuterOutlineOutlineOnlyToggle: 0 + - _OuterOutlineTextureToggle: 0 + - _OuterOutlineWidth: 0.04 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _PingPongGlowContrast: 1 + - _PingPongGlowFade: 1 + - _PingPongGlowFrequency: 3 + - _PixelOutlineAlphaLimit: 0.5 + - _PixelOutlineFade: 1 + - _PixelOutlineOutlineOnlyToggle: 0 + - _PixelOutlineTextureToggle: 0 + - _PixelOutlineWidth: 1 + - _PixelPerfectSpace: 0 + - _PixelPerfectUV: 0 + - _PixelateFade: 1 + - _PixelatePixelDensity: 16 + - _PixelatePixelsPerUnit: 100 + - _PixelsPerUnit: 100 + - _PoisonDensity: 3 + - _PoisonFade: 1 + - _PoisonNoiseBrightness: 2 + - _PoisonRecolorFactor: 0.5 + - _PoisonShiftSpeed: 0.2 + - _RainbowBrightness: 2 + - _RainbowContrast: 1 + - _RainbowDensity: 0.5 + - _RainbowFade: 1 + - _RainbowNoiseFactor: 0.2 + - _RainbowSaturation: 1 + - _RainbowSpeed: 1 + - _RecolorRGBFade: 1 + - _RecolorRGBTextureToggle: 0 + - _RecolorRGBYCPFade: 1 + - _RecolorRGBYCPTextureToggle: 0 + - _RectHeight: 100 + - _RectWidth: 100 + - _Reflectivity: 10 + - _Saturation: 1 + - _ScaleRatioA: 0.8888889 + - _ScaleRatioB: 0.7222222 + - _ScaleRatioC: 0.7222222 + - _ScaleX: 1 + - _ScaleY: 1 + - _ScreenTilingPixelsPerUnit: 100 + - _ScreenWidthUnits: 10 + - _ShaderFading: 0 + - _ShaderFlags: 0 + - _ShaderSpace: 0 + - _ShadowFade: 1 + - _SharpenFactor: 4 + - _SharpenFade: 1 + - _SharpenOffset: 2 + - _Sharpness: 0 + - _ShiftHueSpeed: 0.5 + - _ShiftingBrightness: 1 + - _ShiftingContrast: 0.5 + - _ShiftingDensity: 1.5 + - _ShiftingFade: 1 + - _ShiftingRainbowToggle: 0 + - _ShiftingSaturation: 0.8 + - _ShiftingSpeed: 0.5 + - _ShineContrast: 2 + - _ShineFade: 1 + - _ShineFrequency: 0.3 + - _ShineMaskToggle: 0 + - _ShineRotation: 30 + - _ShineSaturation: 0.5 + - _ShineSmooth: 1 + - _ShineSpeed: 5 + - _ShineWidth: 0.1 + - _SineGlowContrast: 1 + - _SineGlowFade: 1 + - _SineGlowFrequency: 4 + - _SineGlowMaskToggle: 0 + - _SineGlowMax: 1 + - _SineGlowMin: 0 + - _SineMoveFade: 1 + - _SineRotateAngle: 15 + - _SineRotateFade: 1 + - _SineRotateFrequency: 1 + - _SineScaleFrequency: 2 + - _SmokeAlpha: 1 + - _SmokeDarkEdge: 1 + - _SmokeNoiseFactor: 0.4 + - _SmokeNoiseScale: 0.5 + - _SmokeSmoothness: 1 + - _SmokeVertexSeed: 0 + - _SourceAlphaDissolveFade: 1 + - _SourceAlphaDissolveInvert: 0 + - _SourceAlphaDissolveNoiseFactor: 0.2 + - _SourceAlphaDissolveWidth: 0.2 + - _SourceGlowDissolveFade: 1 + - _SourceGlowDissolveInvert: 0 + - _SourceGlowDissolveNoiseFactor: 0.2 + - _SourceGlowDissolveWidth: 0.1 + - _SpecularPower: 2 + - _SplitToningBalance: 1 + - _SplitToningContrast: 1 + - _SplitToningFade: 1 + - _SplitToningShift: 0 + - _SpriteSheetFix: 0 + - _SqueezeFade: 1 + - _SqueezePower: 1 + - _SquishFade: 1 + - _SquishFlip: 0 + - _SquishSquish: 0.1 + - _SquishStretch: 0.1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _StrongTintContrast: 0 + - _StrongTintContrastToggle: 0 + - _StrongTintFade: 1 + - _StrongTintMaskToggle: 0 + - _TMPSmoothness: 5 + - _TMPThickness: -0.45 + - _TextureHeight: 1024 + - _TextureLayer1Columns: 3 + - _TextureLayer1Contrast: 1 + - _TextureLayer1ContrastToggle: 0 + - _TextureLayer1EdgeClip: 0.005 + - _TextureLayer1Fade: 1 + - _TextureLayer1Rows: 3 + - _TextureLayer1ScrollToggle: 0 + - _TextureLayer1SheetToggle: 1 + - _TextureLayer1Speed: 20 + - _TextureLayer1StartFrame: 0 + - _TextureLayer2Columns: 3 + - _TextureLayer2Contrast: 1 + - _TextureLayer2ContrastToggle: 0 + - _TextureLayer2EdgeClip: 0.005 + - _TextureLayer2Fade: 1 + - _TextureLayer2Rows: 3 + - _TextureLayer2ScrollToggle: 0 + - _TextureLayer2SheetToggle: 1 + - _TextureLayer2Speed: 20 + - _TextureLayer2StartFrame: 0 + - _TextureWidth: 1024 + - _TilingFix: 0 + - _TimeFPS: 5 + - _TimeFrequency: 2 + - _TimeRange: 0.5 + - _TimeSpeed: 1 + - _TimeValue: 0 + - _ToggleCustomTime: 0 + - _ToggleTimeFPS: 0 + - _ToggleTimeFrequency: 0 + - _ToggleTimeSpeed: 0 + - _ToggleUnscaledTime: 0 + - _UIVertexColorAlwaysGammaSpace: 0 + - _UVDistortFade: 1 + - _UVDistortMaskToggle: 0 + - _UVRotateSpeed: 1 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _UseUIAlphaClip: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _VertexTintFirst: 0 + - _VibrateFade: 1 + - _VibrateFrequency: 100 + - _VibrateOffset: 0.04 + - _VibrateRotation: 4 + - _WeightBold: 0.75 + - _WeightNormal: 0 + - _WiggleFade: 1 + - _WiggleFixedGroundToggle: 0 + - _WiggleFrequency: 2 + - _WiggleOffset: 0.02 + - _WiggleSpeed: 2 + - _WindFlip: 0 + - _WindHighQualityNoise: 0 + - _WindIsParallax: 0 + - _WindLocalWind: 0 + - _WindMaxIntensity: 0.4 + - _WindMaxRotation: 2 + - _WindMinIntensity: -0.4 + - _WindNoiseScale: 0.1 + - _WindNoiseSpeed: 1 + - _WindRotation: 0 + - _WindRotationWindFactor: 1 + - _WindSquishFactor: 0.3 + - _WindSquishWindFactor: 0 + - _WindXPosition: 0 + - _WorldTilingPixelsPerUnit: 100 + m_Colors: + - _AddColorColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _AlphaTintColor: {r: 95.87451, g: 5.019608, b: 95.87451, a: 0} + - _BlackTintColor: {r: 0, g: 0, b: 1, a: 0} + - _BurnEdgeColor: {r: 11.98431, g: 1.129412, b: 0.1254902, a: 0} + - _BurnEdgeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _BurnInsideColor: {r: 0.75, g: 0.5625, b: 0.525, a: 0} + - _BurnInsideNoiseColor: {r: 3084.047, g: 257.0039, b: 0, a: 0} + - _BurnInsideNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _BurnPosition: {r: 0, g: 5, b: 0, a: 0} + - _BurnSwirlNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageBaseColor: {r: 0.7450981, g: 0.7254902, b: 0.5686274, a: 0} + - _CamouflageColorA: {r: 0.62745106, g: 0.5882353, b: 0.43137258, a: 0} + - _CamouflageColorB: {r: 0.47058815, g: 0.43137258, b: 0.31372547, a: 0} + - _CamouflageDistortionIntensity: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageDistortionScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _CamouflageDistortionSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageNoiseScaleA: {r: 0.25, g: 0.25, b: 0, a: 0} + - _CamouflageNoiseScaleB: {r: 0.25, g: 0.25, b: 0, a: 0} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorReplaceFromColor: {r: 0, g: 0, b: 0, a: 0} + - _ColorReplaceToColor: {r: 0, g: 0, b: 0.2, a: 0} + - _CustomFadeNoiseScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalAlphaFadeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _DirectionalDistortionDistortion: {r: 0, g: 0.1, b: 0, a: 0} + - _DirectionalDistortionDistortionScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalDistortionNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _DirectionalGlowFadeEdgeColor: {r: 11.98431, g: 0.6901961, b: 0.6901961, a: 0} + - _DirectionalGlowFadeNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _EnchantedHighColor: {r: 0, g: 0.7098798, b: 4.237095, a: 0} + - _EnchantedLowColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _EnchantedScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _EnchantedSpeed: {r: 0, g: 1, b: 0, a: 0} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _FadingNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FadingPosition: {r: 0, g: 0, b: 0, a: 0} + - _FlameNoiseScale: {r: 1.2, g: 0.8, b: 0, a: 0} + - _FlameSpeed: {r: 0, g: -0.5, b: 0, a: 0} + - _FrozenHighlightColor: {r: 1.797647, g: 4.604501, b: 5.992157, a: 1} + - _FrozenHighlightDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FrozenHighlightDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _FrozenHighlightScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenSnowColor: {r: 1.123529, g: 1.373203, b: 1.498039, a: 0} + - _FrozenSnowScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenTint: {r: 1.819608, g: 4.611765, b: 5.992157, a: 0} + - _FullAlphaDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FullDistortionDistortion: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FullDistortionNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FullGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _FullGlowDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _GlitchDistortion: {r: 0.1, g: 0, b: 0, a: 0} + - _GlitchDistortionScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchDistortionSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlitchMaskScale: {r: 0, g: 0.2, b: 0, a: 0} + - _GlitchMaskSpeed: {r: 0, g: 4, b: 0, a: 0} + - _GlitchNoiseScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchNoiseSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _HalftonePosition: {r: 0, g: 0, b: 0, a: 0} + - _HologramTint: {r: 0.3137255, g: 1.662745, b: 2.996078, a: 1} + - _InkSpreadColor: {r: 8.47419, g: 5.013525, b: 0.08873497, a: 0} + - _InkSpreadNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _InkSpreadPosition: {r: 0.5, g: -1, b: 0, a: 0} + - _InnerOutlineColor: {r: 11.98431, g: 1.254902, b: 1.254902, a: 1} + - _InnerOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _InnerOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _InnerOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _InnerOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _MetalColor: {r: 5.992157, g: 3.639216, b: 0.3137255, a: 1} + - _MetalHighlightColor: {r: 5.992157, g: 3.796078, b: 0.6588235, a: 1} + - _MetalNoiseDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _MetalNoiseDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _MetalNoiseDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _MetalNoiseScale: {r: 0.25, g: 0.25, b: 0, a: 0} + - _MetalNoiseSpeed: {r: 0.05, g: 0.05, b: 0, a: 0} + - _OuterOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _OuterOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _OuterOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _OuterOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _OuterOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _PingPongGlowFrom: {r: 5.992157, g: 0.1882353, b: 0.1882353, a: 0} + - _PingPongGlowTo: {r: 0.1882353, g: 0.1882353, b: 5.992157, a: 0} + - _PixelOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _PixelOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _PoisonColor: {r: 0.3137255, g: 2.996078, b: 0.3137255, a: 0} + - _PoisonNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _PoisonNoiseSpeed: {r: 0, g: -0.2, b: 0, a: 0} + - _RainbowCenter: {r: 0, g: 0, b: 0, a: 0} + - _RainbowNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _RecolorRGBBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPCyanTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPPurpleTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPYellowTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ScreenTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _ScreenTilingScale: {r: 1, g: 1, b: 0, a: 0} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 0} + - _ShadowOffset: {r: 0.05, g: -0.05, b: 0, a: 0} + - _ShiftingColorA: {r: 1.498039, g: 0, b: 0, a: 0} + - _ShiftingColorB: {r: 1.498039, g: 0.7490196, b: 0, a: 0} + - _ShineColor: {r: 11.98431, g: 11.98431, b: 11.98431, a: 0} + - _SineGlowColor: {r: 0, g: 2.007843, b: 2.996078, a: 0} + - _SineMoveFrequency: {r: 1, g: 1, b: 0, a: 0} + - _SineMoveOffset: {r: 0, g: 0.5, b: 0, a: 0} + - _SineRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SineScaleFactor: {r: 0.2, g: 0.2, b: 0, a: 0} + - _SourceAlphaDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceAlphaDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SourceGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _SourceGlowDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceGlowDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _SplitToningHighlightsColor: {r: 1, g: 0.1, b: 0.1, a: 0} + - _SplitToningShadowsColor: {r: 0.1, g: 0.4000002, b: 1, a: 0} + - _SpriteSheetRect: {r: 0, g: 0, b: 1, a: 1} + - _SqueezeCenter: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SqueezeScale: {r: 2, g: 0, b: 0, a: 0} + - _StrongTintTint: {r: 1, g: 1, b: 1, a: 1} + - _TextureLayer1Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer1Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer1Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer1ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _TextureLayer2Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer2Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer2Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer2ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _UVDistortFrom: {r: -0.02, g: -0.02, b: 0, a: 0} + - _UVDistortNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _UVDistortSpeed: {r: 2, g: 2, b: 0, a: 0} + - _UVDistortTo: {r: 0.02, g: 0.02, b: 0, a: 0} + - _UVRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScalePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScaleScale: {r: 1, g: 1, b: 0, a: 0} + - _UVScrollSpeed: {r: 0.2, g: 0, b: 0, a: 0} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + - _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders.meta b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat.meta similarity index 52% rename from Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders.meta rename to Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat.meta index cc8f4b5a8..4513a6444 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders.meta +++ b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Glow.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f51589a19ab9f8f46834348da6cf70d0 -folderAsset: yes -DefaultImporter: +guid: d1840e4d5c5355a438fd745078e16187 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat new file mode 100644 index 000000000..14d3be2c4 --- /dev/null +++ b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat @@ -0,0 +1,111 @@ +%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: ZQK Font SDF Outline + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -478184148220021899, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 9 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.25 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.8888889 + - _ScaleRatioB: 0.7222222 + - _ScaleRatioC: 0.7222222 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 1024 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat.meta b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat.meta new file mode 100644 index 000000000..d06f5f824 --- /dev/null +++ b/Assets/Fonts/SDF/ZQK/ZQK Font SDF Outline.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 538d28bfaad57dc47b726847ab356ae6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Opsive/BehaviorDesigner/Add-Ons/CielonosPack/Conditionals/CheckCooldownTimer.cs b/Assets/Opsive/BehaviorDesigner/Add-Ons/CielonosPack/Conditionals/CheckCooldownTimer.cs index 1e9617e16..57a00c22f 100644 --- a/Assets/Opsive/BehaviorDesigner/Add-Ons/CielonosPack/Conditionals/CheckCooldownTimer.cs +++ b/Assets/Opsive/BehaviorDesigner/Add-Ons/CielonosPack/Conditionals/CheckCooldownTimer.cs @@ -15,7 +15,7 @@ namespace Cielonos.MainGame.Characters.AI public override TaskStatus OnUpdate() { CooldownTimer cooldownTimer = self.selfTimeSm.coolDownTimers[timerName.Value]; - bool conditionMet = checkIfCompleted ? cooldownTimer.IsCompleted : !cooldownTimer.IsCompleted; + bool conditionMet = checkIfCompleted ? cooldownTimer.isCompleted : !cooldownTimer.isCompleted; return conditionMet ? TaskStatus.Success : TaskStatus.Failure; } } diff --git a/Assets/OtherPlugins/Le Tai's Asset.meta b/Assets/OtherPlugins/Le Tai's Asset.meta deleted file mode 100644 index 6fa91733b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 762edfd7b07d0234683a7363f84f98c8 -folderAsset: yes -timeCreated: 1489330932 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common.meta b/Assets/OtherPlugins/Le Tai's Asset/Common.meta deleted file mode 100644 index 41879c2dc..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 9e0a8b8cb3a94310a4032b06bb85bc40 -timeCreated: 1751091994 \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs deleted file mode 100644 index 230f9acd3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using UnityEditor; -using UnityEngine; - -namespace LeTai.Common.Editor -{ -public static class Assets -{ - public static T Find(string assetName, string label = "TranslucentImageEditorResources") where T : Object - { - var guids = AssetDatabase.FindAssets($"l:{label} {assetName}"); - if (guids.Length == 0) - { - Debug.LogError($"Asset \"{assetName}\" not found. " + - $"Make sure it have the label \"TranslucentImageEditorResources\""); - return null; - } - - var path = AssetDatabase.GUIDToAssetPath(guids[0]); - return AssetDatabase.LoadAssetAtPath(path); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs.meta deleted file mode 100644 index 7640b7feb..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Assets.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 62f3490712e742dbafd854da4b66319c -timeCreated: 1751092491 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/Assets.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs deleted file mode 100644 index 04a2c1faa..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Common.Editor -{ -public static class EditorCustom -{ - static readonly GUIContent LABEL = new GUIContent(); - - public class LabelWidthScope : GUI.Scope - { - readonly float oldLabelWidth; - - public LabelWidthScope(float labelWidth) - { - oldLabelWidth = EditorGUIUtility.labelWidth; - EditorGUIUtility.labelWidth = labelWidth; - } - - protected override void CloseScope() - { - EditorGUIUtility.labelWidth = oldLabelWidth; - } - } - - public static (Rect labelRect, Rect fieldRect) PrefixLabel(Rect rect, int id, GUIContent label) - { - var fieldRect = EditorGUI.PrefixLabel(rect, id, label); - var labelRect = new Rect(rect.x, rect.y, rect.width - fieldRect.width, rect.height); - - return (labelRect, fieldRect); - } - - public static float LabelFloatField(Rect rectControl, Rect rectLabel, GUIContent label, float value, GUIStyle styleLabel = null, GUIStyle styleField = null) - { - var controlId = GUIUtility.GetControlID(FocusType.Keyboard, rectControl); - EditorGUI.HandlePrefixLabel(rectControl, rectLabel, label, controlId, styleLabel); - return EditorInternal.DoFloatFieldInternal(rectControl, rectLabel, controlId, value, style: styleField); - } - - public static void ComputedPropertyField(SerializedProperty property, Func compute) - { - using var _ = new EditorGUILayout.HorizontalScope(); - EditorGUILayout.PropertyField(property); - EditorGUILayout.LabelField(compute(property), GUILayout.ExpandWidth(false)); - } - - public static bool LinkButton(string label, params GUILayoutOption[] options) - { - LABEL.text = label; - return LinkButton(LABEL, options); - } - - public static bool LinkButton(GUIContent label, params GUILayoutOption[] options) - { - var rect = GUILayoutUtility.GetRect(label, EditorStyles.linkLabel, options); - rect = EditorGUI.IndentedRect(rect); - - // var prevHandleColor = Handles.color; - // Handles.color = EditorStyles.linkLabel.normal.textColor; - // Handles.DrawLine(new Vector3(position.xMin + EditorStyles.linkLabel.padding.left, position.yMax), - // new Vector3(position.xMax - EditorStyles.linkLabel.padding.right, position.yMax)); - // Handles.color = prevHandleColor; - - EditorGUIUtility.AddCursorRect(rect, MouseCursor.Link); - - return GUI.Button(rect, label, EditorStyles.linkLabel); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs.meta deleted file mode 100644 index c564502c4..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorCustom.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a42329183e3c49b9a43603047c1a7e92 -timeCreated: 1751092578 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/EditorCustom.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs deleted file mode 100644 index 9499135fa..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Reflection; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Common.Editor -{ -static class EditorInternal -{ - static readonly MethodInfo DO_FLOAT_FIELD_METHOD; -#if UNITY_6000_0_OR_NEWER - static readonly PropertyInfo RECYCLED_EDITOR_PROPERTY; -#else - static readonly FieldInfo RECYCLED_EDITOR_PROPERTY; -#endif - static readonly FieldInfo FLOAT_FIELD_FORMAT_STRING_CONST; - - static EditorInternal() - { - var editorGUIType = typeof(EditorGUI); - const BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Static; - - Type[] argumentTypes = { - Assembly.GetAssembly(editorGUIType).GetType("UnityEditor.EditorGUI+RecycledTextEditor"), - typeof(Rect), - typeof(Rect), - typeof(int), - typeof(float), - typeof(string), - typeof(GUIStyle), - typeof(bool) - }; - DO_FLOAT_FIELD_METHOD = editorGUIType.GetMethod("DoFloatField", flags, null, argumentTypes, null); -#if UNITY_6000_0_OR_NEWER - RECYCLED_EDITOR_PROPERTY = editorGUIType.GetProperty("s_RecycledEditor", flags); -#else - RECYCLED_EDITOR_PROPERTY = editorGUIType.GetField("s_RecycledEditor", flags); -#endif - FLOAT_FIELD_FORMAT_STRING_CONST = editorGUIType.GetField("kFloatFieldFormatString", flags); - } - - internal static float DoFloatFieldInternal( - Rect position, - Rect dragHotZone, - int id, - float value, - string formatString = null, - GUIStyle style = null, - bool draggable = true - ) - { - style = style ?? EditorStyles.numberField; - formatString = formatString ?? (string)FLOAT_FIELD_FORMAT_STRING_CONST.GetValue(null); - - var editor = RECYCLED_EDITOR_PROPERTY.GetValue(null); - - return (float)DO_FLOAT_FIELD_METHOD.Invoke(null, new[] { - editor, - position, - dragHotZone, - id, - value, - formatString, - style, - draggable - }); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs.meta deleted file mode 100644 index 63a658d8a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorInternal.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c8c94534f87244218d95b02d343eabf2 -timeCreated: 1695375609 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/EditorInternal.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs deleted file mode 100644 index aeaf9682a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using UnityEditor; - -namespace LeTai.Common.Editor -{ -public class EditorPrefValue -{ - readonly string key; - readonly T initialValue; - - public T Value - { - get - { - if (!EditorPrefs.HasKey(key)) - { - Value = initialValue; - return initialValue; - } - - return typeof(T) switch { - { } t when t == typeof(bool) => (T)(object)EditorPrefs.GetBool(key), - { } t when t == typeof(float) => (T)(object)EditorPrefs.GetFloat(key), - - _ => throw new ArgumentException("Type " + typeof(T) + " is not supported.") - }; - } - set - { - switch (value) - { - case bool v: - EditorPrefs.SetBool(key, v); - break; - case float v: - EditorPrefs.SetFloat(key, v); - break; - default: - throw new ArgumentException("Type " + typeof(T) + " is not supported."); - } - } - } - - public EditorPrefValue(string key, T initialValue = default) - { - this.key = key; - this.initialValue = initialValue; - } - - public static implicit operator T(EditorPrefValue value) - { - return value.Value; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs.meta deleted file mode 100644 index cc10e51cf..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorPrefValue.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6654bb5e80e849c999172d15fba0797d -timeCreated: 1751272512 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/EditorPrefValue.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs deleted file mode 100644 index d78290481..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Reflection; -using System.Text; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Common.Editor -{ -public class EditorProperty -{ - public readonly SerializedProperty serializedProperty; - - readonly SerializedObject serializedObject; - readonly MethodInfo propertySetter; - readonly SerializedProperty dirtyFlag; - - public EditorProperty(SerializedObject obj, string name, string serializedName = null) - { - serializedObject = obj; - serializedProperty = FindPropertyByName(serializedObject, name); - propertySetter = serializedObject.targetObject.GetType().GetProperty(name).SetMethod; - dirtyFlag = serializedObject.FindProperty("modifiedFromInspector"); - } - - static SerializedProperty FindPropertyByName(SerializedObject obj, string name) - { - var sb = new StringBuilder(name.Length + 1); - var lower = sb.Append(char.ToLowerInvariant(name[0])).Append(name[1..]).ToString(); - var property = obj.FindProperty(lower); - if (property != null) - return property; - - sb.Clear(); - property = obj.FindProperty(sb.Append('_').Append(lower).ToString()); - if (property != null) - return property; - - throw new ArgumentException($"Can't automatically find serialized name for property {name} in {obj.targetObject.GetType()}"); - } - - public void Draw(params GUILayoutOption[] options) - { - using (var scope = new EditorGUI.ChangeCheckScope()) - { - EditorGUILayout.PropertyField(serializedProperty, options); - - if (!scope.changed) - return; - - if (dirtyFlag != null) - dirtyFlag.boolValue = true; - - serializedObject.ApplyModifiedProperties(); - - if (serializedProperty.propertyType != SerializedPropertyType.Generic) // Not needed for now - { - var propertyValue = GetPropertyValue(); - CallSetters(propertyValue); - } - - // In case the setter changes any serialized data - serializedObject.Update(); - } - } - - public void CallSetters(object value) - { - foreach (var target in serializedObject.targetObjects) - propertySetter.Invoke(target, new[] { value }); - } - - object GetPropertyValue() - { - switch (serializedProperty.propertyType) - { - case SerializedPropertyType.ObjectReference: - return serializedProperty.objectReferenceValue; - case SerializedPropertyType.Float: - return serializedProperty.floatValue; - case SerializedPropertyType.Integer: - return serializedProperty.intValue; - case SerializedPropertyType.Rect: - return serializedProperty.rectValue; - case SerializedPropertyType.Enum: - return serializedProperty.enumValueIndex; - case SerializedPropertyType.Boolean: - return serializedProperty.boolValue; - case SerializedPropertyType.Color: - return serializedProperty.colorValue; - case SerializedPropertyType.Vector2: - return serializedProperty.vector2Value; - default: throw new NotImplementedException($"Type {serializedProperty.propertyType} is not implemented"); - } - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs deleted file mode 100644 index 4388e801d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEditor.Build; - -namespace LeTai.Common.Editor -{ -public static class EditorUtils -{ - public static List GetDefines(BuildTarget buildTarget = BuildTarget.NoTarget) - { - if (buildTarget == BuildTarget.NoTarget) - buildTarget = EditorUserBuildSettings.activeBuildTarget; - - var currentGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); - string definesStr; -#if UNITY_2021_2_OR_NEWER - var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(currentGroup); - definesStr = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget); -#else - definesStr = PlayerSettings.GetScriptingDefineSymbolsForGroup(currentGroup); -#endif - return definesStr.Split(';').ToList(); - } - - public static void SetDefines(IEnumerable defines, BuildTarget buildTarget = BuildTarget.NoTarget) - { - if (buildTarget == BuildTarget.NoTarget) - buildTarget = EditorUserBuildSettings.activeBuildTarget; - - var newDefinesStr = string.Join(";", defines); - - var currentGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); -#if UNITY_2021_2_OR_NEWER - var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(currentGroup); - PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, newDefinesStr); -#else - PlayerSettings.SetScriptingDefineSymbolsForGroup(currentGroup, newDefinesStr); -#endif - } - - public static void AddDefines(HashSet toAdd, BuildTarget buildTarget = BuildTarget.NoTarget) - { - if (buildTarget == BuildTarget.NoTarget) - buildTarget = EditorUserBuildSettings.activeBuildTarget; - - var defines = GetDefines(buildTarget); - var missing = toAdd.Except(defines).ToList(); - defines.AddRange(missing); - if (missing.Count > 0) - SetDefines(defines, buildTarget); - } - - public static void RemoveDefines(HashSet toRemove, BuildTarget buildTarget = BuildTarget.NoTarget) - { - if (buildTarget == BuildTarget.NoTarget) - buildTarget = EditorUserBuildSettings.activeBuildTarget; - - var defines = GetDefines(buildTarget); - var removed = defines.Except(toRemove).ToList(); - if (removed.Count < defines.Count) - SetDefines(removed, buildTarget); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs.meta deleted file mode 100644 index 89cb94a9f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorUtils.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: cead91eb2ca046498697087e0c426513 -timeCreated: 1751099123 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/EditorUtils.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs deleted file mode 100644 index 5c133b5b3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs +++ /dev/null @@ -1,114 +0,0 @@ -using UnityEditor; -using UnityEngine; -using EGU = UnityEditor.EditorGUIUtility; - -namespace LeTai.Common.Editor -{ -public static class EditorGUICustom -{ - static readonly Texture2D KNOB_BG_TEXTURE = Assets.Find("Knob_BG"); - static readonly Texture2D KNOB_FG_TEXTURE = Assets.Find("Knob_FG"); - - static readonly Color KNOB_BG_COLOR; - static readonly Color KNOB_FG_COLOR; - static readonly Color KNOB_FG_COLOR_ACTIVE; - - static EditorGUICustom() - { - if (EGU.isProSkin) - { - KNOB_BG_COLOR = new Color(.164f, .164f, .164f); - KNOB_FG_COLOR = new Color(.701f, .701f, .701f); - KNOB_FG_COLOR_ACTIVE = new Color(.49f, .67f, .94f); - } - else - { - KNOB_BG_COLOR = new Color(.941f, .941f, .941f); - KNOB_FG_COLOR = new Color(.239f, .239f, .239f); - KNOB_FG_COLOR_ACTIVE = new Color(.054f, .274f, .549f); - } - } - - - public static float KnobField(GUIContent label, float angle, Vector2 zeroVector, float height = 0) - { - if (height <= 0) - height = EGU.singleLineHeight * 1.3f; - float knobSize = height + EGU.standardVerticalSpacing * (4 - 1); - float knobYOffset = (height - knobSize) / 2; - - Rect rect = EditorGUILayout.GetControlRect(true, height); - - var labelRect = new Rect(rect) { - y = rect.y + (height - EGU.singleLineHeight) / 2, - height = EGU.singleLineHeight - }; - - var oldLabelWidth = EGU.labelWidth; - EGU.labelWidth -= height; - - int fieldId = GUIUtility.GetControlID(FocusType.Keyboard, labelRect); - var fieldRect = EditorGUI.PrefixLabel(labelRect, fieldId, label); - labelRect.xMax = fieldRect.x; - fieldRect.x += height; - fieldRect.width -= height; - - Rect knobRect = new Rect(rect.x + EGU.labelWidth + knobYOffset, - rect.y + knobYOffset, - knobSize, knobSize); - - angle = Knob(knobRect, angle, zeroVector); - angle = EditorInternal.DoFloatFieldInternal(fieldRect, labelRect, fieldId, angle); - - EGU.labelWidth = oldLabelWidth; - - return angle; - } - - public static float Knob(Rect position, float angle, Vector2 zeroVector) - { - int controlID = GUIUtility.GetControlID(FocusType.Passive, position); - - if (Event.current != null) - { - if (Event.current.type == EventType.MouseDown && position.Contains(Event.current.mousePosition)) - { - GUIUtility.hotControl = controlID; - - var dir = (Event.current.mousePosition - position.center).normalized; - angle = MathCustom.VecToAngle360(zeroVector, dir); - - GUI.changed = true; - } - else if (Event.current.type == EventType.MouseUp && GUIUtility.hotControl == controlID) - { - GUIUtility.hotControl = 0; - } - else if (Event.current.type == EventType.MouseDrag && GUIUtility.hotControl == controlID) - { - var dir = (Event.current.mousePosition - position.center).normalized; - angle = MathCustom.VecToAngle360(zeroVector, dir); - - GUI.changed = true; - } - else if (Event.current.type == EventType.Repaint) - { - var notRotated = GUI.matrix; - var oldColor = GUI.color; - var highlighted = GUIUtility.hotControl == controlID; - - GUIUtility.RotateAroundPivot(angle, position.center); - GUI.color = KNOB_BG_COLOR; - GUI.DrawTexture(position, KNOB_BG_TEXTURE, ScaleMode.ScaleToFit, true, 1); - GUI.color = highlighted ? KNOB_FG_COLOR_ACTIVE : KNOB_FG_COLOR; - GUI.DrawTexture(position, KNOB_FG_TEXTURE, ScaleMode.ScaleToFit, true, 1); - - GUI.matrix = notRotated; - GUI.color = oldColor; - } - } - - return angle; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef deleted file mode 100644 index ec86eb2f5..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "LeTai.Common.Editor", - "rootNamespace": "LeTai.Common.Editor", - "references": ["GUID:07cd4d3e8f0583542ab74e7b8b032f7e"], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef.meta deleted file mode 100644 index 2b8613822..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 6329229812871a6488deb623f659955b -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/LeTai.Common.Editor.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs deleted file mode 100644 index 345b8ef35..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs +++ /dev/null @@ -1,24 +0,0 @@ -using UnityEngine; - -namespace LeTai.Common.Editor -{ -public static class MathCustom -{ - public static float VecToAngle360(Vector2 from, Vector2 to) - { - float angle = Vector2.SignedAngle(from, to); - return angle < 0 ? 360 + angle : angle; - } - - public static Vector2 Angle360ToVec(float angle, Vector2 zeroVector) - { - float sin = Mathf.Sin(angle * Mathf.Deg2Rad); - float cos = Mathf.Cos(angle * Mathf.Deg2Rad); - - return new Vector2( - zeroVector.x * cos - zeroVector.y * sin, - zeroVector.x * sin + zeroVector.y * cos - ); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs.meta deleted file mode 100644 index eb3d59bd6..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/MathCustom.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: cd2f496da54e4254ac9c1b0ca2e76fb1 -timeCreated: 1695714616 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/MathCustom.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs deleted file mode 100644 index 4cc7e5127..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using UnityEditor; -using UnityEngine; - -namespace LeTai.Common.Editor -{ -[CustomPropertyDrawer(typeof(TinyTween.Spring))] -public class SpringDrawer : PropertyDrawer -{ - public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - { - return EditorGUIUtility.singleLineHeight * 2 + EditorGUIUtility.standardVerticalSpacing; - } - - public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) - { - EditorGUI.BeginProperty(position, label, property); - - SerializedProperty approxDurationProp = property.FindPropertyRelative(nameof(TinyTween.Spring.approxDuration)); - SerializedProperty overshootProp = property.FindPropertyRelative(nameof(TinyTween.Spring.overshoot)); - SerializedProperty stiffnessProp = property.FindPropertyRelative(nameof(TinyTween.Spring.stiffness)); - SerializedProperty dampingProp = property.FindPropertyRelative(nameof(TinyTween.Spring.damping)); - - position = EditorGUI.PrefixLabel(position, label); - - using var _ = new EditorCustom.LabelWidthScope(64f); - using var changes = new EditorGUI.ChangeCheckScope(); - - float lineHeight = EditorGUIUtility.singleLineHeight; - Rect durationRect = new Rect(position.x, position.y, - position.width, lineHeight); - Rect overshootRect = new Rect(position.x, position.y + lineHeight + EditorGUIUtility.standardVerticalSpacing, - position.width, lineHeight); - - float approxDuration = EditorGUI.FloatField(durationRect, "Duration", approxDurationProp.floatValue); - float overshoot = EditorGUI.Slider(overshootRect, "Overshoot", overshootProp.floatValue, 0, .5f); - - if (changes.changed) - { - TinyTween.Spring s = TinyTween.Spring.DurationOvershoot(approxDuration, overshoot); - - approxDurationProp.floatValue = s.approxDuration; - overshootProp.floatValue = s.overshoot; - stiffnessProp.floatValue = s.stiffness; - dampingProp.floatValue = s.damping; - } - - EditorGUI.EndProperty(); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs.meta deleted file mode 100644 index f8ef2b161..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 03b5046c644a48e8a2078a44033e85d0 -timeCreated: 1754471011 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/SpringPropertyDrawer.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef deleted file mode 100644 index e22da012d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "LeTai.Common", - "rootNamespace": "LeTai.Common", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef.meta deleted file mode 100644 index a9f373cad..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 07cd4d3e8f0583542ab74e7b8b032f7e -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/LeTai.Common.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs deleted file mode 100644 index 50b71a8d0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System.Runtime.CompilerServices; -using UnityEngine; - -namespace LeTai.Common -{ -public static class MaterialUtils -{ - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void SetKeyword(Material mat, string keyword, bool isOn) - { - if (isOn) - mat.EnableKeyword(keyword); - else - mat.DisableKeyword(keyword); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyKeyword(Material src, Material dst, string keyword) - { - SetKeyword(dst, keyword, src.IsKeywordEnabled(keyword)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyFloat(Material src, Material dst, int id) - { - dst.SetFloat(id, src.GetFloat(id)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void CopyVector(Material src, Material dst, int id) - { - dst.SetVector(id, src.GetVector(id)); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs.meta deleted file mode 100644 index f70a6109b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/MaterialUtils.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 7a120429bba141f3be27a147bcf46023 -timeCreated: 1752050295 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/MaterialUtils.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs deleted file mode 100644 index 911ab97d3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using System.Runtime.CompilerServices; -using UnityEngine; - -namespace LeTai.Common -{ -public static class Packing -{ - /// - /// Packs floats into a single float, using up to 30 bits. - /// The mapping guarantees the resulting float is not NaN, Inf, or subnormal. - /// - public readonly struct FloatPacker - { - private readonly int _bitsPerFloat; - - private readonly uint _payload; - private readonly int _nBitsUsed; - - private FloatPacker(uint payload, int nBitsUsed, int bitsPerFloat) - { - _payload = payload; - _nBitsUsed = nBitsUsed; - _bitsPerFloat = bitsPerFloat; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static FloatPacker Varying() => new FloatPacker(0u, 0, 0); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static FloatPacker Uniform(int bitsPerFloat) => new FloatPacker(0u, 0, bitsPerFloat); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public FloatPacker Enqueue(float value, float min, float max, int nBits) - { - if (nBits == 0) - throw new ArgumentException($"Use {nameof(Uniform)} or specify {nameof(nBits)}"); - - uint q = Quantize(value, min, max, nBits); - return new FloatPacker((q << _nBitsUsed) | _payload, _nBitsUsed + nBits, _bitsPerFloat); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public FloatPacker Enqueue(float value, float min, float max) => Enqueue(value, min, max, _bitsPerFloat); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public FloatPacker Enqueue(float value, float max) => Enqueue(value, 0, max, _bitsPerFloat); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public float Finish() - { - if (_nBitsUsed > 30) - throw new ArgumentOutOfRangeException(nameof(_nBitsUsed), $"Must use <= 30 bits. Requesting {_nBitsUsed} bits"); - - uint bits = EnsureNormalFloatExponent(_payload); - return UintToFloatBits(bits); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static implicit operator float(FloatPacker packer) => packer.Finish(); - } - - - /// - /// Packs floats into a single float, using up to 30 bits. - /// The mapping guarantees the resulting float is not NaN, Inf, or subnormal. - /// - public static float PackFloatsSafe( - float a, float minA, float maxA, int nBitsA, - float b, float minB, float maxB, int nBitsB - ) - { - if (nBitsA + nBitsB > 30) - throw new ArgumentOutOfRangeException(nameof(nBitsA), $"{nameof(nBitsA)} + {nameof(nBitsB)} must be <= 30"); - - uint aQuantized = Quantize(a, minA, maxA, nBitsA); - uint bQuantized = Quantize(b, minB, maxB, nBitsB); - - uint payload = (aQuantized << nBitsB) | bQuantized; // [0, (1u << 30) - 1] - uint bits = EnsureNormalFloatExponent(payload); - - return UintToFloatBits(bits); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static uint Quantize(float x, float min, float max, int nBits) - { - // Not checking positive range for speed. - float normalized = Mathf.Clamp((x - min) / (max - min), 0f, 1f); - uint maxQuantized = (1u << nBits) - 1u; - return (uint)(normalized * maxQuantized + 0.5f); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static uint EnsureNormalFloatExponent(uint bits) - { - uint exponent = (bits >> 23) + 1; - uint mantissa = bits & 0x7FFFFFu; - return (exponent << 23) | mantissa; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static float UintToFloatBits(uint bits) - { - byte[] bytes = BitConverter.GetBytes(bits); - return BitConverter.ToSingle(bytes, 0); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs.meta deleted file mode 100644 index 7ede779f1..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/Packing.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 0f7cb69b8d944a1b9553e8795472f6e1 -timeCreated: 1750649405 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/Packing.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs deleted file mode 100644 index ade407954..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using UnityEngine; - -namespace LeTai.Common -{ -public static class RectTransformUtilityPatch -{ - public static Ray ScreenPointToRay(Camera cam, Vector2 screenPos) - { - if (cam != null) - return cam.ScreenPointToRay(screenPos); - - Vector3 pos = screenPos; - pos.z -= 1e4f; // Larger offset to account for rotation - return new Ray(pos, Vector3.forward); - } - - public static bool ScreenPointToWorldPointInRectangle(RectTransform rect, Vector2 screenPoint, Camera cam, out Vector3 worldPoint) - { - worldPoint = Vector2.zero; - Ray ray = ScreenPointToRay(cam, screenPoint); - var plane = new Plane(rect.rotation * Vector3.back, rect.position); - - // Remove unnecessary parallel check - if (!plane.Raycast(ray, out var dist)) - return false; - - worldPoint = ray.GetPoint(dist); - return true; - } - - public static bool ScreenPointToLocalPointInRectangle(RectTransform rect, Vector2 screenPoint, Camera cam, out Vector2 localPoint) - { - localPoint = Vector2.zero; - if (ScreenPointToWorldPointInRectangle(rect, screenPoint, cam, out Vector3 worldPoint)) - { - localPoint = rect.InverseTransformPoint(worldPoint); - return true; - } - return false; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs.meta deleted file mode 100644 index 12b01d0b3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f995fa15a6db4214a82ce742668df43c -timeCreated: 1752649074 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/RectTransformUtility.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs deleted file mode 100644 index 9298d2298..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using UnityEngine; - -namespace LeTai.Common -{ -public static class SpanUtils -{ - public static Vector4 ToVector4(ReadOnlySpan span) - { - return new Vector4(span[0], span[1], span[2], span[3]); - } - - public static SpanWriter WriterFor(Span span) => new(span); -} - -public ref struct SpanWriter -{ - readonly Span _span; - int _nextIndex; - - public SpanWriter(Span span) - { - _span = span; - _nextIndex = 0; - } - - public void Reset() => _nextIndex = 0; - - public void Write(T value) - { - _span[_nextIndex++] = value; - } - - public void FillRest(T value = default) - { - if (_nextIndex == _span.Length) - return; - - _span[_nextIndex..].Fill(value); - _nextIndex = _span.Length; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs.meta deleted file mode 100644 index 58a4f8eb5..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/SpanUtils.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f5ce123a774b475b90b9794e77ef7e20 -timeCreated: 1758619324 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/SpanUtils.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs deleted file mode 100644 index a16482539..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs +++ /dev/null @@ -1,245 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using System.Collections.Generic; -using UnityEngine; - -namespace LeTai.Common -{ -public class TinyTween : MonoBehaviour -{ - [Serializable] - public struct Spring - { - public float stiffness; - public float damping; - public float approxDuration; - public float overshoot; - - public static readonly Spring DEFAULT = DurationOvershoot(.5f, .1f); - - private Spring(float stiffness, float damping, float approxDuration, float overshoot) - { - this.stiffness = stiffness; - this.damping = damping; - this.approxDuration = approxDuration; - this.overshoot = overshoot; - } - - public static Spring DurationOvershoot(float approxDuration, float overshoot) - { - approxDuration = Mathf.Max(0.001f, approxDuration); - overshoot = Mathf.Clamp(overshoot, 0f, 0.999f); - - float z; - if (overshoot < 1e-3f) - { - z = 1f; - } - else - { - float lnOvershoot = Mathf.Log(overshoot); - z = -lnOvershoot / Mathf.Sqrt(Mathf.PI * Mathf.PI + lnOvershoot * lnOvershoot); - } - - float wn = 2f * Mathf.PI / approxDuration; - wn = -Mathf.Log(2e-3f) / (z * approxDuration); - - float k = wn * wn; - float c = 2f * z * wn; - - return new Spring(k, c, approxDuration, overshoot); - } - } - - private static class Ops - { - public static readonly Func ADD; - public static readonly Func SUB; - public static readonly Func MUL; - public static readonly Func IS_NEAR_ZERO; - - static Ops() - { - const float threshold = 2e-3f; - - Ops.ADD = (a, b) => a + b; - Ops.SUB = (a, b) => a - b; - Ops.MUL = (a, s) => a * s; - Ops.IS_NEAR_ZERO = v => Mathf.Abs(v) < threshold; - - Ops.ADD = (a, b) => a + b; - Ops.SUB = (a, b) => a - b; - Ops.MUL = (a, s) => a * s; - Ops.IS_NEAR_ZERO = v => v.sqrMagnitude < (threshold * threshold); - - Ops.ADD = (a, b) => a + b; - Ops.SUB = (a, b) => a - b; - Ops.MUL = (a, s) => a * s; - Ops.IS_NEAR_ZERO = v => v.sqrMagnitude < (threshold * threshold); - - Ops.ADD = (a, b) => a + b; - Ops.SUB = (a, b) => a - b; - Ops.MUL = (a, s) => a * s; - Ops.IS_NEAR_ZERO = c => (c.r * c.r + c.g * c.g + c.b * c.b + c.a * c.a) < (threshold * threshold); - } - } - - private static class Ops - { - public static T Add(T a, T b) => Ops.ADD(a, b); - public static T Sub(T a, T b) => Ops.SUB(a, b); - public static T Mul(T a, float s) => Ops.MUL(a, s); - public static bool IsNearZero(T v) => Ops.IS_NEAR_ZERO(v); - } - - private abstract class Tween - { - protected Spring spring; - - public abstract bool MaybeRetarget(object newContext, Delegate newOnUpdate, object newTarget); - public abstract bool Tick(float dt); - public abstract void Reset(); - } - - private static readonly Dictionary> TWEEN_POOLS = new(16); - private static TinyTween instance; - - private readonly List _activeTweens = new(); - - private class Tween : Tween where TCtx : class - { - private TCtx _context; - private Action _onUpdate; - private TVal _target; - private TVal _current; - private TVal _velocity; - - public void Setup(TCtx ctx, TVal from, TVal to, Spring spring, Action update) - { - _context = ctx; - _onUpdate = update; - _target = to; - _current = from; - _velocity = default; - - this.spring = spring; - } - - public override bool MaybeRetarget(object newContext, Delegate newOnUpdate, object newTarget) - { - if (newTarget is TVal val - && ReferenceEquals(_context, newContext) - && ReferenceEquals(_onUpdate, newOnUpdate)) - { - _target = val; - return true; - } - return false; - } - - public override bool Tick(float dt) - { - if (_context is UnityEngine.Object uc && !uc) - return true; - if (_context == null) - return true; - - TVal force = Ops.Mul(Ops.Sub(_target, _current), spring.stiffness); - TVal dampingForce = Ops.Mul(_velocity, spring.damping); - TVal acceleration = Ops.Sub(force, dampingForce); - _velocity = Ops.Add(_velocity, Ops.Mul(acceleration, dt)); - _current = Ops.Add(_current, Ops.Mul(_velocity, dt)); - - var shouldStop = Ops.IsNearZero(Ops.Sub(_target, _current)) - && Ops.IsNearZero(_velocity); - - if (shouldStop) - _current = _target; - - try - { - _onUpdate?.Invoke(_context, _current); - } - catch (Exception e) - { - Debug.LogException(e); - return true; - } - - return shouldStop; - } - - public override void Reset() - { - _context = null; - _onUpdate = null; - } - } - - public static void Animate(TCtx context, TVal from, TVal to, Action onUpdate, Spring? spring = null) where TCtx : class - { - if (!instance) - { - // ReSharper disable once Unity.PerformanceCriticalCodeInvocation - instance = new GameObject("[TinyTween]").AddComponent(); - DontDestroyOnLoad(instance.gameObject); - } - - for (int i = 0; i < instance._activeTweens.Count; i++) - { - // ReSharper disable once Unity.PerformanceCriticalCodeInvocation - if (instance._activeTweens[i].MaybeRetarget(context, onUpdate, to)) - return; - } - - Tween newTween = null; - Type tweenType = typeof(Tween); - if (TWEEN_POOLS.TryGetValue(tweenType, out var pool) && pool.Count > 0) - { - newTween = (Tween)pool.Pop(); - } - - newTween ??= new Tween(); - newTween.Setup(context, from, to, spring ?? Spring.DEFAULT, onUpdate); - instance._activeTweens.Add(newTween); - } - - private void Update() - { - if (_activeTweens.Count == 0) return; - - for (int i = _activeTweens.Count - 1; i >= 0; i--) - { - var tween = _activeTweens[i]; - if (tween.Tick(Time.deltaTime)) - { - SwapAndPop(_activeTweens, i); - tween.Reset(); - - Type tweenType = tween.GetType(); - if (!TWEEN_POOLS.TryGetValue(tweenType, out var pool)) - { - pool = new Stack(); - TWEEN_POOLS[tweenType] = pool; - } - pool.Push(tween); - } - } - } - - static void SwapAndPop(List list, int index) - { - int last = list.Count - 1; - list[index] = list[last]; - list.RemoveAt(last); - } - - public static void Move(RectTransform rt, Vector2 to, Spring? spring = null) - { - Animate(rt, rt.anchoredPosition, to, MOVE, spring); - } - - static readonly Action MOVE = static (rt, pos) => rt.anchoredPosition = pos; -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs.meta deleted file mode 100644 index 8867d851e..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime/TinyTween.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: ab81ce18ae98496393c4e9021cd90940 -timeCreated: 1752827241 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Runtime/TinyTween.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage.meta deleted file mode 100644 index 09b769a9a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f7d17cc01badd084cb6b9f7806e16fc6 -folderAsset: yes -timeCreated: 1474981563 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt deleted file mode 100644 index be8d8d974..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt +++ /dev/null @@ -1,346 +0,0 @@ -Changelog: - -v6.5.0: - - Add selector to swap between multiple Sources on the same Camera - - Fix multiple sources not working in URP - - Fix editor error when using Source without Config - - Improve URP compatibility in certain configurations - - Fix demo looking incorrect - -v6.4.1: - - Fix compilation error in URP - - Fix brightness control not working correctly in gamma space - -v6.4.0: - - Finer brightness control at low brightness. You may need to adjust your brightness value to compensate. - - Fix dithering artifacts at high blur level - - Fix dithering being too visible at low brightness - - Fix blur Strength overwriting settings in Advanced mode when not interacted with - -v6.3.0: - - Add a shortcut to edit blur strength from Translucent Image - - Small bug fixes - -v6.2.2: - - Fix True Shadow integration - -v6.2.1: - - Fix culling not taking Ring Thickness into account - -v6.2.0: - - Paraform: Ring Thickness feature lets you create ring-shaped UIs. - -v6.1.0: - - Smoother blur - - New blur Modes: - - Performance mode costs the same as before while being a little bit smoother. - - Balanced mode is extra smooth and costs a bit more. - - Balanced is the new default. If you're targeting low-end hardware, consider setting it back to Performance. - - Fix blur quality being unstable at different resolution - - Fix blur strength not staying constant at different screen density and aspects. - This behavior is now configurable, but should not need to be configured in most cases - - Fix heap allocation when using Render Graph - - Fix minor editor issues - -v6.0.0: -!! This is a major release indicating breaking changes !! - - The minimum supported Unity version is now 2021.3 - - New Colorful Background Mode that maintains both background colors and foreground contrasts - - Move appearance properties out of material, improving scripting ergonomic, performance, and batching efficiency - - Fix dark background being slightly brighter than expected - - Improve URP performance. No longer requires CameraColorTexture - - No longer dispatch an empty render pass if no Translucent Images are visible - - Other minors under the hood fixes and improvements - *Migration* - - Use Tools > Translucent Image > Migrate to 6.0 to migrate all material settings in the opened scene - to the corresponding component. Make sure to have a backup. - - Optional: refactor spriteBlending -> foregroundOpacity - - Optional: try the new Colorful Background Mode. Appearance properties will need to be adjusted. - - -v5.5.0: - - Display Source's strength in Translucent Image's inspector Source picker to easier distinguish multiple Sources on the same Camera - - Fix some inspector values not updating immediately when changing blur config - - Fix nullref when destroying Translucent Images at runtime - - Fix Skip Culling not working in certain situations - - Fix background not working in certain situations - -v5.4.1: - - Fix Translucent Images temporarily stop working after undoing material settings - - Fix erroneous error logging - -v5.4.0: - - Fix demo scene colors - -v5.3.0: - - Fix vertex color, such as from mesh effect shadow and outline, not being applied correctly - -v5.2.0: - - Reduce banding - - Improve default settings - - Improve documentation - -v5.1.0: - - Increase the minimum supported Unity version to 2020.3 or BiRP and 2021.3 for URP - - New Cull Padding setting to account for UI movement while using limited Update Rate - - Culling now take into account the Camera's viewport - - Support Rect Mask Softness - - Support Canvas feature: Vertex Color Always In Gamma Color Space - - Fix artifact with certain sprites on hdr background - -v5.0.2: - - Fix exception in certain cases - -v5.0.1: - - Fix exception in certain cases - -v5.0.0: -!! This is a major release indicating breaking changes !! - - Culling system minimize GPU usage by only blur part of the screen covered by Translucent Images - - Significant improvement to CPU usage for scenes with a large number of Translucent Images - - Fix Flatten property not working correctly on dark Images - - Update the demo scenes for the Builtin Render Pipeline to be the same as URP - - Simpler API for controlling blur strength - - Improve compatibility with Unity 6 - - Other minor fixes and improvements -Breaking changes: - - Appearance properties on Translucent Image is deprecated. Instead, set these values on the material directly - - TranslucentImageSource.Request() is replaced by (Un)RegisterActivePointsProvider() . This is only needed if - you access the blurred texture directly. - - Extensions methods are moved into helper classes to avoid name collision - -v4.4.2: - - Fix blank background in the first frame - -v4.4.1: - - Improve compatibility with 2D renderer in Unity 2022 - - Improve compatibility with Unity 6 - - Improve editor performance when using URP - -v4.4.0: - - More stable blur Strength calculation - - Fix compilation error in very old 2021.3 patch releases - - Fix error when using extremely large blur - - Remove Max Depth property - - Under the hood changes to prepare for 2023.3 URP - -v4.3.0: -This is a re-release of the 4.1.0 release with hopefully less bugs. - - Preparation to support Unity 2023.3 URP - - Bug fixes - -v4.2.0: -- Temporarily rollback 4.1.0 due to bugs - -v4.1.0: - - Preparation to support Unity 2023.3 URP - - Fix spurious warning - -v4.0.1: - - Fix issue in build - -v4.0.0: -This is a major version bump signifying breaking changes. -Make sure you have your project committed to version control before upgrading - - - Automatically pause blurring when there are no Translucent Images active - - Allow filling the black void when using VR Passthrough and Underlay with a custom color - - Improves prefab support - - Other under-the-hood improvements - -v3.18.0: - - Improve support for newer versions of 2D Renderer - - Add workaround for buggy URP versions - - Blit mode selection is now completely automatic - -v3.17.0: - - Restore support for the URP 2D Renderer in newer Unity versions - -v3.16.2: - - Fix incorrect warning when used with True Shadow - -v3.16.1: - - Improve compatibility with Unity 2023 - -v3.16.0: - - Fix incorrect rendering when using non default viewport in URP. - As a result of this change, Blur Region is now relative to the actual viewport, instead of the one show in the Camera inspector. You may need to re-tune your Blur Region. - -v3.15.0: - - Fix color space mixed up. Your UIs appearance may change after this update. - -v3.14.6: - - Fix compatibility with 2021.3.13 URP - -v3.14.5: - - Fix editor script being included in build - - Reorder create asset menu - -v3.14.4: - - Fix phantom windows again - -v3.14.3: - - Fix phantom windows in some Unity versions - -v3.14.2: - - Warn if Renderer Feature is missing in URP project - -v3.14.1: - - Fix some gizmo icons not showing in newer Unity versions - -v3.14.0: - - Improve compatibility with URP 13 - -v3.13.0: - - Drop support for URP's 2D Renderer. It is too locked down and buggy at the moment - -v3.12.0: - - Improve compatibility with URP 12.1.7 - -v3.11.0: - - Allow rendering before post-processing to work-around URP 2D renderer issue. - -v3.10.3: - - Fix shader compilation on GLES 2.0 - -v3.10.2: - - Fix sprite blending property not applied correctly - -v3.10.1: - - Improve allocation behaviour - -v3.10.0: - - Fix Single Pass Instanced Stereo rendering - -v3.9.0: - - Improve error logging to be more relevant - - Assigning Source property on Translucent Image is now easier with automatic suggestions - - Fix compatibility with webgl in less capable browsers - - Improve compatibility with URP 12.1.2 - -v3.8.3: - - Workflow improvements on URP 12 - -v3.8.2: - - Fix some bugs on URP 12 - -v3.8.1: - - Fix some bugs on URP 12 - -v3.8.0: - - Support URP 12 - - Fix prefab mode warning - -v3.7.0: - - Support latest True Shadow release - - Fix spurious error messages - - Improve PlayStation compatibility - -v3.6.0: - - Support Single Pass Instanced Stereo Render Mode - - Reduce log level - -v3.5.1: - - Reduce error logging. - - Improve compatibility with Addressable. - -v3.5.0: - - Changing Sprite Blending from script is now applied immediately. - TranslucentImage.spriteBlending is now a property instead of a field. - - You can now move the asset to a different path - -v3.4.2: - - Fix blur config not saved - - Fix prefab instance not marked dirty - -v3.4.1: - - Improve documentation - -v3.4.0: - URP: - - Remove slow workaround for Unity bugs #1196219. Please update your URP package to 7.2.0 or newer. - - Downsampling and Blur Region now work with URP. - - - Various fixes and optimizations. - -v3.3.1: - - True Shadow integration: Fix shadow color not react correctly to Translucent Image color - -v3.3.0: - Breaking changes: - - Upgraded to Unity 2019.4 - - Remove deprecated LWRP package. URP continue to be supported. - - - Translucent Image is now compatible with True Shadow. - -v3.2.4: - - Fix memory leak when Translucent Image Source are destroyed. - -v3.2.3: - - Example scene for blurring UI in URP - -v3.2.2: - - Fix preview features sometime not work in URP - - Fix persistent black UI when not in play mode - - Hide some harmless errors in demo scene - - Fix RegisterSource() throw exception - - Some other small changes - -v3.2.1: - - Convert Image to Translucent Image with context menu item - - Some small fixes and enhancements - -v3.2.0: - Breaking changes: existing projects with Editor/Runtime version lower than these should not install this update. - - Upgraded to Unity 2018.4 to follow new Asset Store requirements - - Upgraded to .NET 4.x Equivalent Runtime, as .NET 3.5 is deprecated in Unity 2018 - - - Blur Region now can be controlled using on-screen GUI in the Game View when in Preview mode - - Help button on components now open appropriated documentation page - - Fix an issue with non fullscreen Camera Viewport Rect - - Fix missing namespace in some demo scripts - -v3.1.1: - - Fix issue with URP Post Processing - -v3.1.0: - *** Breaking change for LWRP project *** - - If you're using the asset in an existing LWRP project, please delete its folder first and import it again to avoid issue. - - If you're using the "Demo Forward Renderer" and "Demo LightweightRenderPipelineAsset", you'll have to replace them with the new one located in "Universal RP/'Configs" folder. I recommend creating your own, specific to your project. - *** - - - Added Universal RP support. LWRP support package is included for compatibility with older Unity version, but will not be updated anymore. - - Fix some small bugs. - -v3.0.5: - - Added demo and documentation for setting up Translucent Images in world space. - - Disable scene gizmos. - -v3.0.4: - - Better default file name when creating Blur Config from Translucent Image Source. - - Some improvement to error messages - -v3.0.3: - - Fixed some bugs in demo scene - -v3.0.2: - - Fixed some bugs on LWRP - - Added new demo for LWRP - -v3.0.1: - - Fix compatibility issue with Post Processing Stack on LWRP - -v3.0: -!!!Warning!!! Breaking changes: - - Blur Config now stored as asset file, allows for sharing of configuration between different Cameras/Scenes/Projects. You will need to re-config your all of your Translucent Image Sources. Settings on Translucent Images will be fine. - - Blur Size now called Radius to align with other software. - -Added: - - Initial LWRP support. Please visit the documentation for setup guide. - - Bug fixes and performance improvements. - - A lot of ground work for additional blur algorithms (none added yet). - - Probably bugs. 😩 - -Changed: - - Minimum supported Unity version is now 2017.4 - - Clearer preview box. diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt.meta deleted file mode 100644 index c50cea7c3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/CHANGELOG.txt.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: c5a3f80713b8e364e883263b67113edf -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/CHANGELOG.txt - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef deleted file mode 100644 index 000542062..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "LeTai.Asset.TranslucentImage", - "rootNamespace": "", - "references": [ - "GUID:7ab3663edede26740845931880bf22af", - "GUID:e0cd26848372d4e5c891c569017e11f1", - "GUID:2665a8d13d1b3f18800f46e256720795", - "GUID:07cd4d3e8f0583542ab74e7b8b032f7e", - "GUID:c131f8808d09e154c956e66d97dd723c", - "GUID:f063c9eabb2dec74ca53a0523cc14584" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef.meta deleted file mode 100644 index 8174369ac..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: ff218ee40fe2b8648ab3234d56415557 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/LeTai.TranslucentImage.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat deleted file mode 100644 index 8d7367854..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat +++ /dev/null @@ -1,125 +0,0 @@ -%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: Default-Translucent - m_Shader: {fileID: 4800000, guid: b1115addd36579a429d5e6b4ffae668d, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _BACKGROUND_MODE_COLORFUL - m_InvalidKeywords: - - _EMISSION - - _FOREGROUND_MODE_COLORFUL - - _REFRACTION_MODE_ON - m_LightmapFlags: 1 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BlurTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BACKGROUND_MODE: 1 - - _Brightness: 0.8 - - _BumpScale: 1 - - _ChromaticDispersion: 0.5 - - _ColorMask: 15 - - _Constrast: 0.1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EDGE_LIGHT_MODE: 0 - - _EdgeGlint1Strength: 0.25 - - _EdgeGlint2Strength: 0.1 - - _EdgeGlintSharpness: 512 - - _EdgeGlintWrap: 1 - - _EdgeLight1Strength: 0.65 - - _EdgeLight2Strength: 0.25 - - _FOREGROUND_MODE: 1 - - _Flatten: 0 - - _ForegroundOpacity: 0.5 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Lightness: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _REFRACTION_MODE: 1 - - _RefractiveIndex: 1.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _USE_EDGE_GLINT: 0 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Vibrancy: 1.25 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EdgeGlintDirections: {r: -0.258819, g: 0.9659259, b: 0.2588191, a: -0.9659258} - - _EdgeLightDirections: {r: -1, g: 1, b: 1, a: -1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _RefractiveIndexRatios: {r: 0.666666, g: 0.666666, b: 0.666666, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat.meta deleted file mode 100644 index 91d3c44a3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat.meta +++ /dev/null @@ -1,17 +0,0 @@ -fileFormatVersion: 2 -guid: 96c5704d0681e35408630c488fc0c234 -labels: -- TranslucentImageResource -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Material/Default-Translucent.mat - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf deleted file mode 100644 index 642b7a2c3..000000000 Binary files a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf and /dev/null differ diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf.meta deleted file mode 100644 index b3cb03e7c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 92a39630ef232a9459d20d55dd312799 -timeCreated: 1541066439 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Offline Documentation.pdf - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt deleted file mode 100644 index b3023b876..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt +++ /dev/null @@ -1 +0,0 @@ -https://leloctai.com/asset/translucentimage/docs/ \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt.meta deleted file mode 100644 index 103724a87..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 54274fce3b51a88468a41e332f5de0a5 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Online Documentation (recommended).txt - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources.meta deleted file mode 100644 index e63c56cd2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3c261078fb1a4da458b96776e33f88b1 -folderAsset: yes -timeCreated: 1474981572 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl deleted file mode 100644 index 13c3665d2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -#include "./common.hlsl" -#include "./fullscreen.hlsl" - -float2 _Offset; -float2 _TargetSize; -float4 _CropRegion; -half3 _BackgroundColor; - -int _IsLast; -// int _IsUp; - -#define BlurVertexInput FullScreenVertexInput - -struct BlurVertexOutput -{ - float4 position : SV_POSITION; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_OUTPUT_STEREO -}; - -BlurVertexOutput VertBlur(BlurVertexInput v) -{ - BlurVertexOutput o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - - float4 posCS; - float2 screenUV; - GetFullScreenVertexData(v, posCS, screenUV); - - o.position = half4(posCS.xy, 0.0, 1.0); - - o.texcoord = UnCropUV(screenUV, _CropRegion); - - return o; -} - -half4 FragBlur(BlurVertexOutput i) : SV_Target -{ - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i); - - half2 dirs[] = { - half2(-1, -1), - half2(1, -1), - half2(1, 1), - half2(-1, 1), - }; - #if !USE_EXTRA_SAMPLE - half weight0 = 1.0h / 4.0h; - #else - half weight1 = 1.0h / 5.0h; - half weight0 = (1.0h - weight1) / 4.0h; - #endif - - half4 o = 0; - for (int j = 0; j < 4; ++j) - o += SAMPLE_SCREEN_TEX(_MainTex, i.texcoord + dirs[j] * _Offset) * weight0; - - #if USE_EXTRA_SAMPLE - o += SAMPLE_SCREEN_TEX(_MainTex, i.texcoord) * weight1; - #endif - - #if BACKGROUND_FILL_COLOR - o.rgb = lerp(_BackgroundColor, o.rgb, o.a); - o.a = 1.0h; - #endif - - // dithering every pass is more correct, but combined with the low sample rate and cheap pattern introduces too much error - if (_IsLast) - o = dither(o, i.texcoord * _TargetSize); - - return o; -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl.meta deleted file mode 100644 index 3af1a5b0d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 9ba876e9f43e4360a9d4ee63c412ce07 -timeCreated: 1729669244 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader deleted file mode 100644 index 0d2afa057..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -Shader "Hidden/EfficientBlur" -{ - SubShader - { - Cull Off ZWrite Off ZTest Always Blend Off - - Pass - { - CGPROGRAM - // #pragma enable_d3d11_debug_symbols - #pragma vertex VertBlur - #pragma fragment FragBlur - #pragma multi_compile_local BACKGROUND_FILL_NONE BACKGROUND_FILL_COLOR - #pragma multi_compile_local _ USE_EXTRA_SAMPLE - - #include "interop_birp.cginc" - - UNITY_DECLARE_SCREENSPACE_TEXTURE(_MainTex); - - #include "EfficientBlur.hlsl" - ENDCG - } - } - - FallBack Off -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader.meta deleted file mode 100644 index fa611adcf..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: 12e87e7c7fde8e74db9f75172456c5c3 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/EfficientBlur.shader - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader deleted file mode 100644 index 4cced848c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -Shader "Hidden/FillCrop" -{ - Properties - { - _MainTex ("Texture", 2D) = "white" {} - } - - SubShader - { - // No culling or depth - Cull Off ZWrite Off ZTest Always - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "interop_birp.cginc" - #include "common.hlsl" - - struct VertexInput - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - - struct VertexOutput - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - UNITY_VERTEX_OUTPUT_STEREO - }; - - VertexOutput vert(VertexInput v) - { - VertexOutput o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = v.uv; - return o; - } - - UNITY_DECLARE_SCREENSPACE_TEXTURE(_MainTex); - float4 _CropRegion; - - half4 frag(VertexOutput i) : SV_Target - { - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i) - float2 uv = CropUV(i.uv, _CropRegion); - return all(uv == saturate(uv)) ? SAMPLE_SCREEN_TEX(_MainTex, uv) : half4(0, 0, 0, 1); - } - ENDCG - } - } -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader.meta deleted file mode 100644 index 88c25b358..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: d996ab4381100014d99e25e68e9aac84 -timeCreated: 1540802700 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/FillCrop.shader - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl deleted file mode 100644 index 3cebb0c9b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl +++ /dev/null @@ -1,199 +0,0 @@ -#pragma once - -#include "UnityUI.cginc" -// UI shaders still use birp texture convention -#include "interop_birp.cginc" -#include "common.hlsl" -#include "packing.hlsl" -#include "blending.hlsl" - -uniform sampler2D _MainTex; -uniform fixed4 _TextureSampleAdd; -uniform float4 _ClipRect; -uniform float4 _MainTex_ST; -uniform float _UIMaskSoftnessX; -uniform float _UIMaskSoftnessY; -uniform int _UIVertexColorAlwaysGammaSpace; -UNITY_DECLARE_SCREENSPACE_TEXTURE(_BlurTex); - -uniform float4 _CropRegion; //xMin, yMin, xMax, yMax - -uniform half4 _Debug; - -struct VertexInput -{ - float4 vertex : POSITION; - half4 color : COLOR; - float2 texcoord : TEXCOORD0; - float4 packedData1 : TEXCOORD1; - #ifdef _USE_PARAFORM - float4 packedData2 : TEXCOORD2; - float4 packedData3 : TEXCOORD3; - #endif - UNITY_VERTEX_INPUT_INSTANCE_ID -}; - -struct VertexOutput -{ - float4 vertex : SV_POSITION; - half4 color : COLOR; - float4 mask : TEXCOORD0; - float2 texcoord : TEXCOORD1; - float4 worldPosition : TEXCOORD2; - float4 screenPos : TEXCOORD3; - float4 transfer1 : TEXCOORD4; - #ifdef _USE_PARAFORM - float4 transfer2 : TEXCOORD5; // need float for hq derivative on some opengl driver - half4 transfer3 : TEXCOORD6; - half4 transfer4 : TEXCOORD7; - half transfer5 : TEXCOORD8; - #endif - UNITY_VERTEX_OUTPUT_STEREO -}; - -struct Appearance -{ - half foregroundOpacity; - half vibrancy; - half brightness; - half flatten; -}; - -void unpackVertexData(VertexInput i, inout VertexOutput o) -{ - FloatUnpacker upk0 = CreateUnpacker(i.packedData1[0], 8); - FloatUnpacker upk1 = CreateUnpacker(i.packedData1[1], 10); - o.transfer1 = float4( - DequeueNonNegative(upk0, 1), - Dequeue(upk1, -1, 2), - Dequeue(upk1, -1, 1), - DequeueNonNegative(upk0, 1) - ); -} - -Appearance createAppearance(float4 transfer1) -{ - Appearance appearance; - appearance.foregroundOpacity = transfer1[0]; - appearance.vibrancy = transfer1[1]; - appearance.brightness = transfer1[2]; - appearance.flatten = transfer1[3]; - return appearance; -} - -VertexOutput vert(VertexInput IN) -{ - VertexOutput OUT = (VertexOutput)0; - - UNITY_SETUP_INSTANCE_ID(IN); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); - - OUT.worldPosition = IN.vertex; - - float4 clipPos = UnityObjectToClipPos(IN.vertex); - OUT.vertex = clipPos; - - float2 pixelSize = clipPos.w; - pixelSize /= float2(1, 1) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy)); - float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); - OUT.mask = float4(IN.vertex.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); - - if (_UIVertexColorAlwaysGammaSpace && !IsGammaSpace()) - { - IN.color.rgb = UIGammaToLinearShim(IN.color.rgb); - } - OUT.color = IN.color; - - OUT.texcoord = IN.texcoord; - - OUT.screenPos = ComputeNonStereoScreenPos(OUT.vertex); - #if UNITY_VERSION >= 202120 && UNITY_UV_STARTS_AT_TOP - if (_ProjectionParams.x > 0 && unity_MatrixVP[1][1] < 0) - OUT.screenPos.y = OUT.screenPos.w - OUT.screenPos.y; - #endif - - unpackVertexData(IN, OUT); - - return OUT; -} - -void fragSetup(inout VertexOutput IN, out half2 screenPos, out half4 foregroundColor, out Appearance appearance) -{ - //Round up the alpha color coming from the interpolator (to 1.0/256.0 steps) - //The incoming alpha could have numerical instability, which makes it very sensible to - //HDR color transparency blend, when it blends with the world's texture. - const half alphaPrecision = half(0xff); - const half invAlphaPrecision = half(1.0 / alphaPrecision); - IN.color.a = round(IN.color.a * alphaPrecision) * invAlphaPrecision; - - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(IN); - - screenPos = IN.screenPos.xy / IN.screenPos.w; - foregroundColor = tex2D(_MainTex, IN.texcoord.xy) + _TextureSampleAdd; - foregroundColor *= IN.color; - - appearance = createAppearance(IN.transfer1); -} - -void fragFinish(VertexOutput IN, half2 screenPos, inout half4 color) -{ - // TODO: fix Shadow and Outline tinting somehow - // Multiplying last so glints work - // color *= IN.color; - - #ifdef UNITY_UI_CLIP_RECT - half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw); - color.a *= m.x * m.y; - #endif - - - #ifdef UNITY_UI_ALPHACLIP - clip(color.a - 0.001); - #endif - - color.rgb *= color.a; - color = dither(color, (screenPos.xy + 0) * _ScreenParams.xy); -} - -half3 sampleBackground(float2 screenPos) -{ - half2 blurTexcoord = CropUV(screenPos, _CropRegion); - half3 backgroundColor = SAMPLE_SCREEN_TEX(_BlurTex, blurTexcoord).rgb; - return backgroundColor; -} - -half4 blendBackground(half4 foregroundColor, half3 backgroundColor, Appearance appearance) -{ - half4 color; - color.a = foregroundColor.a; - - #if _BACKGROUND_MODE_NORMAL - - backgroundColor = saturate(backgroundColor + (.5 - backgroundColor) * appearance.flatten); - backgroundColor = saturate(lerp(LinearRgbToLuminance(backgroundColor), backgroundColor, appearance.vibrancy)); - half brightness = isGammaShim() - ? appearance.brightness - : appearance.brightness * appearance.brightness * sign(appearance.brightness); - backgroundColor = saturate(backgroundColor + brightness); - - color.rgb = lerp(backgroundColor, foregroundColor.rgb, appearance.foregroundOpacity); - - #else //#elif _BACKGROUND_MODE_COLORFUL - - half targetL = appearance.brightness / 2. + .5; - if (!isGammaShim()) - targetL = targetL * targetL; - - backgroundColor = /*saturate*/(lerp(LinearRgbToLuminance(backgroundColor), backgroundColor, appearance.vibrancy)); - backgroundColor = /*saturate*/(backgroundColor + (targetL - backgroundColor) * appearance.flatten); - backgroundColor = lerp( - backgroundColor, - setL(backgroundColor, LinearRgbToLuminance(backgroundColor), targetL), - appearance.foregroundOpacity - ); - color.rgb = gamutClip(backgroundColor * foregroundColor.rgb); - - #endif - - return color; -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl.meta deleted file mode 100644 index fe858e859..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b01fb1ca47c849279f7a0d19d1f20e7a -timeCreated: 1752043759 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader deleted file mode 100644 index ecfaf29af..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -Shader "UI/TranslucentImage" -{ - Properties - { - [PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {} - - [Header(Appearance)][Space] - [KeywordEnum(Normal, Colorful)] _BACKGROUND_MODE("Background Mode", int) = 0 - - [Header(Refraction)][Space] - [KeywordEnum(Off,On,Chromatic)] _REFRACTION_MODE("Refraction Mode", int) = 1 - // Singularity prevent reconstructions of control properties from _RefractiveIndexRatios - // so they need to be stored in the material - [PowerSlider(20)] _RefractiveIndex("Refractive Index", Range(1, 4.5)) = 1.5 - [PowerSlider(2)] _ChromaticDispersion("Chromatic Dispersion", Range(0, 2)) = 0.5 - _RefractiveIndexRatios("Refractive Index Ratio", Vector) = (0.666666, 0.666666, 0.666666, 0) - - [Header(Edge Glint)][Space] - [Toggle(_USE_EDGE_GLINT)] _USE_EDGE_GLINT("Enable Edge Glint", Float) = 0 - _EdgeGlintDirections("Edge Glint Directions", Vector) = (-0.258819, 0.9659259, 0.2588191, -0.9659258) - _EdgeGlint1Strength("Edge Glint 1 Strength", Range(0, 1)) = .25 - _EdgeGlint2Strength("Edge Glint 2 Strength", Range(0, 1)) = .1 - _EdgeGlintWrap("Edge Glint Wrap", Float) = 1 - _EdgeGlintSharpness("Edge Glint Sharpness", Float) = 512 - - //_Debug("Debug", Vector) = (0,0,0,0) - - [Header(Other)][Space] - _StencilComp("Stencil Comparison", Float) = 8 - _Stencil("Stencil ID", Float) = 0 - _StencilOp("Stencil Operation", Float) = 0 - _StencilWriteMask("Stencil Write Mask", Float) = 255 - _StencilReadMask("Stencil Read Mask", Float) = 255 - - _ColorMask("Color Mask", Float) = 15 - [HideInInspector]_Color ("Dummy Color", Color) = (1,1,1,1) - - [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0 - } - - SubShader - { - Tags - { - "Queue"= "Transparent" - "IgnoreProjector"= "True" - "RenderType"= "Transparent" - "PreviewType"= "Plane" - "CanUseSpriteAtlas"= "True" - } - - Stencil - { - Ref[_Stencil] - Comp[_StencilComp] - Pass[_StencilOp] - ReadMask[_StencilReadMask] - WriteMask[_StencilWriteMask] - } - - Cull Off - Lighting Off - ZWrite Off - ZTest[unity_GUIZTestMode] - Blend One OneMinusSrcAlpha - ColorMask[_ColorMask] - - Pass - { - CGPROGRAM - // #pragma enable_d3d11_debug_symbols - #pragma target 3.0 - #pragma exclude_renderers d3d11_9x gles - - #pragma vertex vert - #pragma fragment frag - - #include "TranslucentImage.hlsl" - - #pragma multi_compile_local _ UNITY_UI_CLIP_RECT - #pragma multi_compile_local _ UNITY_UI_ALPHACLIP - - #pragma shader_feature_local_fragment _BACKGROUND_MODE_NORMAL _BACKGROUND_MODE_COLORFUL - - half4 frag(VertexOutput IN) : SV_Target - { - half2 screenPos; - half4 foregroundColor; - Appearance appearance; - fragSetup(IN, screenPos, foregroundColor, appearance); - - half3 backgroundColor = sampleBackground(screenPos); - half4 color = blendBackground(foregroundColor, backgroundColor, appearance); - - fragFinish(IN, screenPos, color); - - return color; - } - ENDCG - } - } - - CustomEditor "LeTai.Asset.TranslucentImage.Editor.TranslucentImageShaderGUI" -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader.meta deleted file mode 100644 index 18b32b27e..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: b1115addd36579a429d5e6b4ffae668d -timeCreated: 1539852404 -licenseType: Store -ShaderImporter: - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/TranslucentImage.shader - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl deleted file mode 100644 index e80dc94da..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -#include - -half3 blendOverlay(half3 a, half3 b) -{ - return a < .5 ? 2 * a * b : 1 - 2 * (1 - a) * (1 - b); -} - -half3 blendScreen(half3 a, half3 b) -{ - return 1 - (1 - a) * (1 - b); -} - -half3 setL(half3 a, half lumA, half lumB) -{ - return a + (lumB - lumA); -} - -half3 gamutClip(half3 color) -{ - half L = LinearRgbToLuminance(color); - half minComp = min(min(color.r, color.g), color.b); - half maxComp = max(max(color.r, color.g), color.b); - - // branches are never entered when the denom is 0 - - // if (minComp < 0) - // // color = L + (color - L) * L / (L - minComp); - // result = L * (result - minComp) / (L - minComp); - // if (maxComp > 1) - // result = L + (result - L) * (1 - L) / (maxComp - L); - - - // Assumption: under blurring, branches are more likely to be coherence than not - - // fully scalar - half scale = 1; - if (minComp < 0) - scale = L / (L - minComp); - if (maxComp > 1) - scale = min(scale, (1 - L) / (maxComp - L)); - - // skipping the vector path should be worth the branch - // if (scale < 1) - if (scale < 1) - color = L + (color - L) * scale; - - return color; -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl.meta deleted file mode 100644 index fc84fae77..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 15df69990d05474f9845874424d84acf -timeCreated: 1750414240 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/blending.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl deleted file mode 100644 index bb9b4d86f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -#ifndef _TRANSLUCENTIMAGE_COMMON -#define _TRANSLUCENTIMAGE_COMMON - -float2 UnCropUV(float2 uvRelativeToCropped, float4 cropRegion) -{ - return lerp(cropRegion.xy, cropRegion.zw, uvRelativeToCropped); -} - -float2 CropUV(float2 uvRelativeToUnCropped, float4 cropRegion) -{ - return (uvRelativeToUnCropped - cropRegion.xy) / (cropRegion.zw - cropRegion.xy); -} - -// https://github.com/michaldrobot/ShaderFastLibs/blob/master/ShaderFastMathLib.h -float sqrtApprox01(float inX) -{ - int x = asint(inX); - x = 0x1FBD1DF5 + (x >> 1); - return asfloat(x); -} - -// https://github.com/michaldrobot/ShaderFastLibs/blob/master/ShaderFastMathLib.h -float rsqrtApprox01(float inX) -{ - int x = asint(inX); - x = 0x5F341A43 - (x >> 1); - return asfloat(x); -} - -// https://en.wikibooks.org/wiki/Algorithms/Distance_approximations -float lengthApproxOctagon(float2 v) -{ - float ax = abs(v.x); - float ay = abs(v.y); - float l = max(ax, ay); - float s = min(ax, ay); - - return .41 * s + .941246 * l; -} - -// https://extremelearning.com.au/unreasonable-effectiveness-of-quasirandom-sequences/ -inline float ggr21(float2 n) -{ - static const float g = 1.32471795724474602596; - static const float a1 = 1.0 / g; - static const float a2 = 1.0 / (g * g); - return frac(a1 * n.x + a2 * n.y); -} - -// https://www.shadertoy.com/view/4djSRW -float hash12(float2 p) -{ - float3 p3 = frac(float3(p.xyx) * .1031); - p3 += dot(p3, p3.yzx + 33.33); - return frac((p3.x + p3.y) * p3.z); -} - -half3 sdfViz(float d) -{ - half3 col = (d > 0.0) ? half3(0.9, 0.6, 0.3) : half3(0.65, 0.85, 1.0); - col *= 1.0 - exp(-12.0 * abs(d)); - col *= 0.8 + 0.2 * cos(150.0 * d); - return lerp(col, 1.0, 1.0 - smoothstep(0.0, 0.01, abs(d))); -} - -bool isGammaShim() -{ - #ifdef UNITY_COLORSPACE_GAMMA - return true; - #else - return false; - #endif -} - -half3 toPerceptual(half3 color) -{ - return isGammaShim() ? color : sqrt(color); -} - -half3 fromPerceptual(half3 color) -{ - return isGammaShim() ? color : color * color; -} - -half4 dither(half4 color, float2 coord) -{ - half noise = ggr21(coord) * 1. / 255. - .5 / 255.; - half4 result = color; - - result.rgb = toPerceptual(result); - result += noise; - result.rgb = fromPerceptual(result); - - return result; -} - -#endif diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl.meta deleted file mode 100644 index 276fcfb79..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: a0f93ce7a1dcd4341947566d67947b0d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/common.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl deleted file mode 100644 index 6e379c1c3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -struct FullScreenVertexInput -{ - #if !SHADER_API_GLES - uint vertexID : SV_VertexID; - #else - float4 position : POSITION; - #endif - UNITY_VERTEX_INPUT_INSTANCE_ID -}; - -struct FullScreenVertexOutput -{ - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - UNITY_VERTEX_OUTPUT_STEREO -}; - - -float2 VertexToUV(float2 vertex) -{ - float2 texcoord = (vertex + 1.0) * 0.5; // triangle vert to uv - #if UNITY_UV_STARTS_AT_TOP - texcoord = texcoord * float2(1.0, -1.0) + float2(0.0, 1.0); - #endif - return texcoord; -} - - -// BiRP do not have these methods, so copy here and namespaced to avoid collision in URP - -// Generates a triangle in homogeneous clip space, s.t. -// v0 = (-1, -1, 1), v1 = (3, -1, 1), v2 = (-1, 3, 1). -float2 tai_GetFullScreenTriangleTexCoord(uint vertexID) -{ - #if UNITY_UV_STARTS_AT_TOP - return float2((vertexID << 1) & 2, 1.0 - (vertexID & 2)); - #else - return float2((vertexID << 1) & 2, vertexID & 2); - #endif -} - -float4 tai_GetFullScreenTriangleVertexPosition(uint vertexID, float z) -{ - // note: the triangle vertex position coordinates are x2 so the returned UV coordinates are in range -1, 1 on the screen. - float2 uv = float2((vertexID << 1) & 2, vertexID & 2); - float4 pos = float4(uv * 2.0 - 1.0, z, 1.0); - return pos; -} - -void GetFullScreenVertexData(FullScreenVertexInput v, out float4 posCS, out float2 screenUV) -{ - #if !SHADER_API_GLES - posCS = tai_GetFullScreenTriangleVertexPosition(v.vertexID, UNITY_NEAR_CLIP_VALUE); - screenUV = tai_GetFullScreenTriangleTexCoord(v.vertexID); - #else - posCS = v.position; - screenUV = VertexToUV(v.position.xy); - #endif -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl.meta deleted file mode 100644 index c95a38725..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b1a79371c15c4beab2c91aa6e7f4c13e -timeCreated: 1729673279 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/fullscreen.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc deleted file mode 100644 index bb4280694..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -#include - -// This need to be a macro since the type of tex can change :( -#define SAMPLE_SCREEN_TEX(tex, uv) UNITY_SAMPLE_SCREENSPACE_TEXTURE(tex, UnityStereoTransformScreenSpaceTex(uv)) - -// This piecewise approximation has a precision better than 0.5 / 255 in gamma space over the [0..255] range -// i.e. abs(l2g_exact(g2l_approx(value)) - value) < 0.5 / 255 -// It is much more precise than GammaToLinearSpace but remains relatively cheap -half3 UIGammaToLinearShim(half3 value) -{ - half3 low = 0.0849710 * value - 0.000163029; - half3 high = value * (value * (value * 0.265885 + 0.736584) - 0.00980184) + 0.00319697; - - // We should be 0.5 away from any actual gamma value stored in an 8 bit channel - const half3 split = (half3)0.0725490; // Equals 18.5 / 255 - return (value < split) ? low : high; -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc.meta deleted file mode 100644 index 661865bdc..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: a8c68a14f2a58eb4eb95978229e5db5e -labels: -- TranslucentImageEditorResources -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/interop_birp.cginc - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl deleted file mode 100644 index 1ba2abf1a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -#ifndef LETAI_PACKING -#define LETAI_PACKING - -struct FloatUnpacker -{ - uint payload; - uint nBitsConsumed; - uint bitsPerFloat; -}; - -FloatUnpacker CreateUnpacker(float packed, int bitsPerFloat = 0) -{ - uint bits = asuint(packed); - uint exponent = (bits >> 23) & 0xFFu; - uint mantissa = bits & 0x7FFFFFu; - - FloatUnpacker u; - u.payload = ((exponent - 1u) << 23) | mantissa; - u.nBitsConsumed = 0; - u.bitsPerFloat = bitsPerFloat; - return u; -} - -float Dequeue(inout FloatUnpacker u, float minVal, float maxVal, uint nBits = 0) -{ - if (nBits == 0) nBits = u.bitsPerFloat; - - uint mask = (1u << nBits) - 1u; - uint value = (u.payload >> u.nBitsConsumed) & mask; - u.nBitsConsumed += nBits; - - float norm = value * (1.0 / mask); - return norm * (maxVal - minVal) + minVal; -} - -float DequeueNonNegative(inout FloatUnpacker u, float maxVal, uint nBits = 0) -{ - return Dequeue(u, 0, maxVal, nBits); -} - - -void UnpackTwoFloatsSafe( - float packed, - float minA, float maxA, uint nBitsA, - float minB, float maxB, uint nBitsB, - out float a, out float b) -{ - uint bits = asuint(packed); - - uint exponent = (bits >> 23) & 0xFFu; - uint mantissa = bits & 0x7FFFFFu; - - uint payload = ((exponent - 1u) << 23) | mantissa; - - uint maskB = (1u << nBitsB) - 1u; - float aQuantized = payload >> nBitsB; - float bQuantized = payload & maskB; - - float maxAQuantized = (1u << nBitsA) - 1u; - float maxBQuantized = maskB; - - float aNormalized = aQuantized * (1. / maxAQuantized); - float bNormalized = bQuantized * (1. / maxBQuantized); - - a = aNormalized * (maxA - minA) + minA; - b = bNormalized * (maxB - minB) + minB; -} - -#endif diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl.meta deleted file mode 100644 index dd773cf08..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 1513fde2dd7f474a803858cd7ae75356 -timeCreated: 1750650448 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Shaders/packing.hlsl - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset deleted file mode 100644 index c67a337c2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - 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: c98b4a46667547b294b1c048ab4fc355, type: 3} - m_Name: Translucent Image Default Resources - m_EditorClassIdentifier: - material: {fileID: 2100000, guid: 96c5704d0681e35408630c488fc0c234, type: 2} - paraformMaterial: {fileID: 2100000, guid: c2c99768271516e4b8f434b56fc1cea0, type: 2} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset.meta deleted file mode 100644 index 301b9534f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default Resources.asset.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: 06adab3c1d7cfaf4e8386d06623484fa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Resources/Translucent Image Default - Resources.asset - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP.meta deleted file mode 100644 index e613c20af..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf78a7acb2cf96c468f81fe121a3301f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader deleted file mode 100644 index 742c4a30c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader +++ /dev/null @@ -1,34 +0,0 @@ -Shader "Hidden/EfficientBlur_UniversalRP" -{ - SubShader - { - Cull Off ZWrite Off ZTest Always Blend Off - - Pass - { - HLSLPROGRAM - // #pragma enable_d3d11_debug_symbols - - #pragma target 3.0 - //HLSLcc is not used by default on gles - #pragma prefer_hlslcc gles - //SRP don't support dx9 - #pragma exclude_renderers d3d11_9x - - #pragma vertex VertBlur - #pragma fragment FragBlur - #pragma multi_compile_local BACKGROUND_FILL_NONE BACKGROUND_FILL_COLOR - #pragma multi_compile_local _ USE_EXTRA_SAMPLE - - #include "interop_urp.hlsl" - - TEXTURE2D_X(_MainTex); - SAMPLER(sampler_MainTex); - - #include "../Shaders/EfficientBlur.hlsl" - ENDHLSL - } - } - - FallBack Off -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader.meta deleted file mode 100644 index c0149a3d1..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/EfficientBlur_UniversalRP.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 4a1d960bb7429ed49a23391385e9ca1b -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader deleted file mode 100644 index 89cc2e9f4..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader +++ /dev/null @@ -1,58 +0,0 @@ -Shader "Hidden/FillCrop_UniversalRP" -{ - SubShader - { - // No culling or depth - Cull Off ZWrite Off ZTest Always - - Pass - { - HLSLPROGRAM - #pragma target 3.0 - //HLSLcc is not used by default on gles - #pragma prefer_hlslcc gles - //SRP don't support dx9 - #pragma exclude_renderers d3d11_9x - - #pragma vertex vert - #pragma fragment frag - - #include "./interop_urp.hlsl" - #include "../Shaders/fullscreen.hlsl" - #include "../Shaders/common.hlsl" - - struct v2f - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - UNITY_VERTEX_OUTPUT_STEREO - }; - - v2f vert(FullScreenVertexInput v) - { - v2f o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - - float4 posCS; - float2 screenUV; - GetFullScreenVertexData(v, posCS, screenUV); - - o.vertex = half4(posCS.xy, 0.0, 1.0); - o.uv = screenUV; - return o; - } - - TEXTURE2D_X(_MainTex); - float4 _CropRegion; - - half4 frag(v2f i) : SV_Target - { - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i) - float2 uv = CropUV(i.uv, _CropRegion); - return all(uv == saturate(uv)) ? SAMPLE_SCREEN_TEX(_MainTex, uv) : half4(0, 0, 0, 1); - } - ENDHLSL - } - } -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader.meta deleted file mode 100644 index c14e3f380..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/FillCrop_UniversalRP.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: be9460e8089353c42b6ec727f6fc3140 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl deleted file mode 100644 index 17a5a631b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" - -#if UNITY_VERSION < 600000 -SAMPLER(sampler_LinearClamp); -#endif -#define SAMPLE_SCREEN_TEX(tex, uv) SAMPLE_TEXTURE2D_X(tex, sampler_LinearClamp, UnityStereoTransformScreenSpaceTex(uv)) diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl.meta deleted file mode 100644 index 922ac03eb..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Resources/URP/interop_urp.hlsl.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 005bb204b9b54cb7868e1aa065f00838 -timeCreated: 1562251098 \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script.meta deleted file mode 100644 index 1f6cfda15..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f086af857f26faa4ea62ddf64d9f44ec -folderAsset: yes -timeCreated: 1474981551 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs deleted file mode 100644 index a7c065409..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs +++ /dev/null @@ -1,31 +0,0 @@ -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public readonly struct ActiveRegion -{ - public static readonly ActiveRegion INACTIVE = new ActiveRegion(Rect.zero, - Matrix4x4.zero, - VPMatrixCache.Index.INVALID); - - public readonly Rect rect; - public readonly Matrix4x4 localToWorld; - public readonly VPMatrixCache.Index vpMatrixCacheIndex; - public bool IsWorldSpace => vpMatrixCacheIndex.IsValid(); - - /// Use VPMatrixCache.Index.INVALID For Screen Space - Overlay Canvas. Otherwise, see - public ActiveRegion(Rect rect, Matrix4x4 localToWorld, VPMatrixCache.Index vpMatrixCacheIndex) - { - this.rect = rect; - this.localToWorld = localToWorld; - this.vpMatrixCacheIndex = vpMatrixCacheIndex; - } -} - -public interface IActiveRegionProvider -{ - bool HaveActiveRegion(); - // out params to avoid double allocation of the fat struct - void GetActiveRegion(VPMatrixCache vpMatrixCache, out ActiveRegion activeRegion); -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs.meta deleted file mode 100644 index c323f7b6d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 4adf6e4aab6f4d09ad8edf1d91e8fd9c -timeCreated: 1728639282 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ActiveRegion.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs deleted file mode 100644 index 0c758dfed..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs +++ /dev/null @@ -1,66 +0,0 @@ -using Unity.Burst; -using Unity.Collections; -using Unity.Jobs; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -[BurstCompile(FloatMode = FloatMode.Fast)] -unsafe struct ActiveRegionMergeJob : IJob -{ - [ReadOnly] - public NativeList activeRegions; - [ReadOnly] - public NativeList vpMatrices; - public Vector2 screenSize; - public Rect viewport; - - public NativeArray merged; - - public void Execute() - { - var xMin = 1f; - var yMin = 1f; - var xMax = 0f; - var yMax = 0f; - - var screenSizeInv = new Vector2(1f / screenSize.x, 1f / screenSize.y); - - for (int i = 0; i < activeRegions.Length; i++) - { - var quad = activeRegions[i]; - var rect = quad.rect; - var corners = stackalloc[] { - new Vector2(rect.x, rect.y), - new Vector2(rect.x, rect.yMax), - new Vector2(rect.xMax, rect.yMax), - new Vector2(rect.xMax, rect.y), - }; - for (int j = 0; j < 4; j++) - { - Vector3 pointWorld = quad.localToWorld.MultiplyPoint3x4(corners[j]); - Vector2 pointScreen; - if (quad.IsWorldSpace) - { - Vector4 pointWorldHomo = pointWorld; - pointWorldHomo.w = 1; - Vector4 pointClip = vpMatrices[quad.vpMatrixCacheIndex.index] * pointWorldHomo; - pointScreen = new Vector2(pointClip.x, pointClip.y) / pointClip.w * .5f + new Vector2(.5f, .5f); - } - else - { - pointScreen = pointWorld * screenSizeInv; - pointScreen = (pointScreen - viewport.min) / viewport.size; - } - - xMin = Mathf.Min(xMin, pointScreen.x); - yMin = Mathf.Min(yMin, pointScreen.y); - xMax = Mathf.Max(xMax, pointScreen.x); - yMax = Mathf.Max(yMax, pointScreen.y); - } - } - - merged[0] = new Rect(xMin, yMin, xMax - xMin, yMax - yMin); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs.meta deleted file mode 100644 index 3857f8a03..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 998034a9a75347a4ad7404daa830d415 -timeCreated: 1728556086 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ActiveRegionMergeJob.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs deleted file mode 100644 index 48a82e615..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LeTai.Asset.TranslucentImage.Editor")] -[assembly: InternalsVisibleTo("LeTai.Asset.TranslucentImage.Editor.Paraform")] diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs.meta deleted file mode 100644 index 760295885..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f5aa23395e6d4397a46bd5b2a1fb4f44 -timeCreated: 1694419168 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/AssemblyInfo.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm.meta deleted file mode 100644 index 24ff80a6a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: f164c4c349ef428f8c7537ba4218516d -timeCreated: 1560157255 \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs deleted file mode 100644 index 19ba28149..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ - public abstract class BlurConfig : ScriptableObject - { - public abstract float Strength { get; set; } - } -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs.meta deleted file mode 100644 index 40cf996a5..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 5a1c97a4c20d4c698acd8a00210f69fe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: c2fc80b7e20a4104db1297bcddfd83b5, type: 3} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/BlurConfig.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs deleted file mode 100644 index c62ac2129..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; - -namespace LeTai.Asset.TranslucentImage -{ -public enum BlurAlgorithmType -{ - ScalableBlur -} - -public enum BackgroundFillMode -{ - None, - Color -} - -[Serializable] -public class BackgroundFill -{ - public BackgroundFillMode mode = BackgroundFillMode.None; - public Color color = Color.white; -} - -public interface IBlurAlgorithm -{ - void Init(BlurConfig config, bool isBirp); - - void Blur( - CommandBuffer cmd, - RenderTargetIdentifier src, - Rect srcCropRegion, - Rect activeRegion, - BackgroundFill backgroundFill, - RenderTexture target - ); - - int GetScratchesCount(float targetWidth, float targetHeight); - - void GetNextScratchDescriptor(ref RenderTextureDescriptor prevDescriptor); - - void SetScratch(int index, RenderTargetIdentifier value); -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs.meta deleted file mode 100644 index 8107ed1c3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6cf12665875748ef9dd9416b900b5143 -timeCreated: 1558514104 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/IBlurAlgorithm.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs deleted file mode 100644 index 8b3bc5049..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs +++ /dev/null @@ -1,227 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Rendering; - -namespace LeTai.Asset.TranslucentImage -{ -public class ScalableBlur : IBlurAlgorithm -{ - readonly RenderTargetIdentifier[] scratches = new RenderTargetIdentifier[14]; - - bool isBirp; - Material material; - ScalableBlurConfig config; - MaterialPropertyBlock propertyBlock; - - LocalKeyword kwBackgroundFillNone; - LocalKeyword kwBackgroundFillColor; - LocalKeyword kwUseExtraSample; - - Material Material - { - get - { - if (material == null) - { - Material = new Material(Shader.Find(isBirp - ? "Hidden/EfficientBlur" - : "Hidden/EfficientBlur_UniversalRP")); - } - - return material; - } - set => material = value; - } - - public void Init(BlurConfig config, bool isBirp) - { - this.isBirp = isBirp; - this.config = (ScalableBlurConfig)config; - propertyBlock = propertyBlock ?? new MaterialPropertyBlock(); - } - - public void Blur( - CommandBuffer cmd, - RenderTargetIdentifier src, - Rect srcCropRegion, - Rect activeRegion, - BackgroundFill backgroundFill, - RenderTexture target - ) - { - (float strength, float radius, int iterations) = GetEffectiveConfig(target.width / srcCropRegion.width, - target.height / srcCropRegion.height); - var offsetDistanceDown = (radius / 2f) * Vector2.one; - var offsetDistanceUp = (radius / 2f /*- .5f*/) * Vector2.one; - - int stepCount = Mathf.Clamp(iterations * 2, 1, scratches.Length * 2 - 1); - float extent = strength; - - var activeRegionRelative = RectUtils.Intersect(activeRegion, srcCropRegion); - activeRegionRelative.x = (activeRegionRelative.x - srcCropRegion.x) / srcCropRegion.width; - activeRegionRelative.y = (activeRegionRelative.y - srcCropRegion.y) / srcCropRegion.height; - activeRegionRelative.width = activeRegionRelative.width / srcCropRegion.width; - activeRegionRelative.height = activeRegionRelative.height / srcCropRegion.height; - - if (activeRegionRelative.width == 0 || activeRegionRelative.height == 0) - return; - - ConfigMaterial(backgroundFill); - propertyBlock.Clear(); - propertyBlock.SetInteger("_IsLast", 0); - - if (stepCount > 1) - { - CropViewport(target.width >> 1, target.height >> 1, extent, out var viewportFirst, out var activeRegionFirst); - propertyBlock.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(RectUtils.Crop(srcCropRegion, activeRegionFirst))); - - var targetSize1 = new Vector2(target.width >> 1, target.height >> 1); - propertyBlock.SetVector(ShaderID.TARGET_SIZE, targetSize1); - propertyBlock.SetVector(ShaderID.OFFSET, offsetDistanceDown / targetSize1); - - Blitter.Blit(cmd, src, scratches[0], Material, 0, propertyBlock, viewportFirst); - } - - var maxDepth = Mathf.Min(iterations - 1, scratches.Length - 1); - for (var i = 1; i < stepCount - 1; i++) - { - var fromIdx = SimplePingPong(i - 1, maxDepth); - var toIdx = SimplePingPong(i, maxDepth); - var targetDepth = toIdx + 1; - - CropViewport(target.width >> targetDepth, target.height >> targetDepth, extent, out var viewportStep, out var activeRegionStep); - propertyBlock.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(activeRegionStep)); - - var targetSizeStep = new Vector2(target.width >> targetDepth, target.height >> targetDepth); - propertyBlock.SetVector(ShaderID.TARGET_SIZE, targetSizeStep); - propertyBlock.SetVector(ShaderID.OFFSET, i < maxDepth - ? offsetDistanceDown / targetSizeStep - : offsetDistanceUp / targetSizeStep); - - Blitter.Blit(cmd, scratches[fromIdx], scratches[toIdx], Material, 0, propertyBlock, viewportStep); - } - - CropViewport(target.width, target.height, 0, out var viewportLast, out var activeRegionLast); - activeRegionLast = stepCount > 1 ? activeRegionLast : RectUtils.Crop(srcCropRegion, activeRegionLast); - propertyBlock.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(activeRegionLast)); - - var targetSizeFinal = new Vector2(target.width, target.height); - propertyBlock.SetVector(ShaderID.TARGET_SIZE, targetSizeFinal); - propertyBlock.SetVector(ShaderID.OFFSET, stepCount == 1 - ? offsetDistanceDown / targetSizeFinal - : offsetDistanceUp / targetSizeFinal); - propertyBlock.SetInteger(ShaderID.IS_LAST, 1); - - Blitter.Blit(cmd, - stepCount > 1 ? scratches[0] : src, - target, - Material, - 0, - propertyBlock, - viewportLast); - return; - - void CropViewport(int targetWidth, int targetHeight, float padding, out Rect viewport, out Rect activeRegionSnapped) - { - var x = activeRegionRelative.x * targetWidth; - var y = activeRegionRelative.y * targetHeight; - var xf = Mathf.Floor(x - padding); - var yf = Mathf.Floor(y - padding); - viewport = new Rect(xf, - yf, - Mathf.Ceil(x + activeRegionRelative.width * targetWidth + padding) - xf, - Mathf.Ceil(y + activeRegionRelative.height * targetHeight + padding) - yf); - - viewport.x = Mathf.Max(viewport.x, 0); - viewport.y = Mathf.Max(viewport.y, 0); - viewport.width = Mathf.Min(viewport.width, targetWidth); - viewport.height = Mathf.Min(viewport.height, targetHeight); - - activeRegionSnapped = new Rect( - viewport.x / targetWidth, - viewport.y / targetHeight, - viewport.width / targetWidth, - viewport.height / targetHeight - ); - } - } - - public int GetScratchesCount(float targetWidth, float targetHeight) - { - var (_, _, iterations) = GetEffectiveConfig(targetWidth, targetHeight); - return Mathf.Min(iterations, scratches.Length); - } - - public void GetNextScratchDescriptor(ref RenderTextureDescriptor prevDescriptor) - { - prevDescriptor.width >>= 1; - prevDescriptor.height >>= 1; - if (prevDescriptor.width <= 0) prevDescriptor.width = 1; - if (prevDescriptor.height <= 0) prevDescriptor.height = 1; - } - - public void SetScratch(int index, RenderTargetIdentifier value) - { - scratches[index] = value; - } - - protected void ConfigMaterial(BackgroundFill backgroundFill) - { - var mat = Material; - - if (kwUseExtraSample == default || !kwUseExtraSample.isValid) - InitKeywords(); - - switch (backgroundFill.mode) - { - case BackgroundFillMode.None: - mat.SetKeyword(kwBackgroundFillNone, true); - mat.SetKeyword(kwBackgroundFillNone, true); - mat.SetKeyword(kwBackgroundFillColor, false); - break; - case BackgroundFillMode.Color: - mat.SetKeyword(kwBackgroundFillColor, true); - mat.SetKeyword(kwBackgroundFillNone, false); - mat.SetColor(ShaderID.BACKGROUND_COLOR, backgroundFill.color); - break; - } - mat.SetKeyword(kwUseExtraSample, config.Mode == ScalableBlurConfig.BlurMode.Balanced); - } - - (float strength, float radius, int iteration) GetEffectiveConfig(float targetWidth, float targetHeight) - { - float scaleFactor = config.GetResolutionScaleFactor(targetWidth, targetHeight); - - float strength = config.Strength * scaleFactor; - float radius; - int iteration; - - if (!config.UseStrength) - { - radius = config.Radius * scaleFactor; - iteration = config.Iteration; - } - else - { - (radius, iteration) = ScalableBlurConfig.FromStrength(strength); - } - - return (strength, radius, iteration); - } - - static int SimplePingPong(int t, int max) - { - if (t > max) - return 2 * max - t; - return t; - } - - void InitKeywords() - { - var materialShader = Material.shader; - kwBackgroundFillNone = new LocalKeyword(materialShader, "BACKGROUND_FILL_NONE"); - kwBackgroundFillColor = new LocalKeyword(materialShader, "BACKGROUND_FILL_COLOR"); - kwUseExtraSample = new LocalKeyword(materialShader, "USE_EXTRA_SAMPLE"); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs.meta deleted file mode 100644 index db0445f4a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 4406fc9923f04f9caf40ac4f57cb0eba -timeCreated: 1558514023 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlur.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs deleted file mode 100644 index fd4a1009d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs +++ /dev/null @@ -1,143 +0,0 @@ -using UnityEngine; -using UnityEngine.Serialization; - -namespace LeTai.Asset.TranslucentImage -{ -[CreateAssetMenu(fileName = "New Scalable Blur Config", - menuName = "Translucent Image/ Scalable Blur Config", - order = 100)] -public class ScalableBlurConfig : BlurConfig -{ - public enum BlurMode - { - Performance, - Balanced, - } - - [SerializeField] - [Tooltip("Use Balanced for light to medium blur or detailed background," + - " Performance for strong blur, smooth background or very low end hardware")] - BlurMode mode = BlurMode.Balanced; - - [SerializeField] - [Tooltip("Blurriness. Does NOT affect performance")] - float radius = 4; - [SerializeField] - [Tooltip("The number of times to run the algorithm to increase the smoothness of the effect. Can affect performance when increase")] - [Range(0, 8)] - int iteration = 4; - [SerializeField] - [Tooltip("How strong the blur is")] - float strength; - - [SerializeField] - [Tooltip("Resolution the blur strength is designed for. If the camera resolution is larger, the blur will be stronger, and if it's smaller, the blur will be weaker.")] - Vector2 referenceResolution = new(1920, 1080); - - [SerializeField] - [Tooltip("0 = Match width, 1 = Match height, choose depend on how your camera viewport change with resolution. By default, vertical viewport is constant so we should match width")] - [Range(0, 1)] - float matchWidthOrHeight = 0; - - [SerializeField] - bool useStrength = true; - - - public BlurMode Mode - { - get => mode; - set => mode = value; - } - - /// - /// Distance between the base texel and the texel to be sampled. - /// - public float Radius - { - get => radius; - set - { - UseStrength = false; - radius = Mathf.Max(0, value); - } - } - - /// - /// Half the number of time to process the image. It is half because the real number of iteration must alway be even. Using half also make calculation simpler - /// - /// - /// Must be non-negative - /// - public int Iteration - { - get => iteration; - set - { - UseStrength = false; - iteration = Mathf.Max(0, value); - } - } - - /// - /// User friendly property to control the amount of blur - /// - /// - /// Must be non-negative - /// - public override float Strength - { - get => strength; // = Radius * Mathf.Pow(2, Iteration); - set - { - UseStrength = true; - strength = Mathf.Clamp(value, 0, (1 << 14) * (1 << 14)); - (Radius, Iteration) = FromStrength(strength); - } - } - - public bool UseStrength - { - get => useStrength; - set => useStrength = value; - } - - public Vector2 ReferenceResolution - { - get => referenceResolution; - set => referenceResolution = value; - } - - public float MatchWidthOrHeight - { - get => matchWidthOrHeight; - set => matchWidthOrHeight = value; - } - - internal float GetResolutionScaleFactor(float width, float height) - { - if (referenceResolution.x == 0 || referenceResolution.y == 0) - return 1; - - float meanLog = Mathf.Lerp( - Mathf.Log(width / referenceResolution.x, 2), - Mathf.Log(height / referenceResolution.y, 2), - matchWidthOrHeight - ); - return Mathf.Pow(2, meanLog); - } - - internal static (float calcRadius, int calcIteration) FromStrength(float targetStrength) - { - var maxIterContribution = Mathf.Pow(targetStrength, .6f); // Make configurable? - - // Bit fiddling would be faster, but need unsafe or .NET Core 3.0+ - // for BitOperations, and BitConverter that doesn't creates garbages :( - var calcIteration = 0; - while ((1 << calcIteration) < maxIterContribution) - calcIteration++; - var calcRadius = targetStrength / (1 << calcIteration); - - return (calcRadius, calcIteration); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs.meta deleted file mode 100644 index 740f8012b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 510c61cdec524e86b647525bb5947f82 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: c2fc80b7e20a4104db1297bcddfd83b5, type: 3} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/BlurAlgorithm/ScalableBlurConfig.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs deleted file mode 100644 index 42ce9ba76..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs +++ /dev/null @@ -1,40 +0,0 @@ -using UnityEngine; -using Object = UnityEngine.Object; - -namespace LeTai.Asset.TranslucentImage -{ -[CreateAssetMenu(menuName = "Translucent Image/Default Resources")] -public class DefaultResources : ScriptableObject -{ - static DefaultResources instance; - - public static DefaultResources Instance - { - get - { - if (!instance) - { - var source = Resources.Load("Translucent Image Default Resources"); - instance = MakeTempCopy(source); - instance.material = MakeTempCopy(instance.material); - instance.paraformMaterial = MakeTempCopy(instance.paraformMaterial); - } - return instance; - } - } - - public Material material; - public Material paraformMaterial; - - static T MakeTempCopy(T obj) where T : Object - { - if (!obj) - return null; - - T copy = Instantiate(obj); - copy.name = obj.name; - copy.hideFlags = HideFlags.HideAndDontSave; - return copy; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs.meta deleted file mode 100644 index df6142a82..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c98b4a46667547b294b1c048ab4fc355 -timeCreated: 1730360238 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/DefaultResources.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor.meta deleted file mode 100644 index ed819e6e2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1ffad624d21be844dbf9ce8159d864d1 -folderAsset: yes -timeCreated: 1475503998 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs deleted file mode 100644 index 22fcebc80..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("LeTai.Asset.TranslucentImage.Editor.Paraform")] diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs.meta deleted file mode 100644 index 426f76568..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6d493deb8f174b23b6f7db38e3082aea -timeCreated: 1751021755 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/AssemblyInfo.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef deleted file mode 100644 index aa66f5e11..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "LeTai.Asset.TranslucentImage.Editor", - "rootNamespace": "LeTai.Asset.TranslucentImage.Editor", - "references": [ - "GUID:6329229812871a6488deb623f659955b", - "GUID:ff218ee40fe2b8648ab3234d56415557", - "GUID:f063c9eabb2dec74ca53a0523cc14584", - "GUID:dbd67092ee33ae344825e5cf39a350f3" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "com.unity.render-pipelines.universal", - "expression": "12", - "define": "URP12_OR_NEWER" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef.meta deleted file mode 100644 index afe4195ef..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 4cd721a6e0b119447afc3819b9015b13 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/LeTai.Asset.TranslucentImage.Editor.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs deleted file mode 100644 index 2e82ad46b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -public static class MaterialEditorGUI -{ - internal static float Slider(string label, float value, float left, float right) - { - var labelWidth = EditorGUIUtility.labelWidth; - EditorGUIUtility.labelWidth = 0; - var newValue = EditorGUILayout.Slider(label, value, left, right); - EditorGUIUtility.labelWidth = labelWidth; - return newValue; - } - - public class PropertyScope : GUI.Scope - { - public bool Changed => _changeScope.changed; - - private readonly EditorGUI.ChangeCheckScope _changeScope; - - public PropertyScope(MaterialProperty prop) - { - _changeScope = new EditorGUI.ChangeCheckScope(); - EditorGUI.showMixedValue = prop.hasMixedValue; - } - - protected override void CloseScope() - { - EditorGUI.showMixedValue = false; - _changeScope.Dispose(); - } - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs.meta deleted file mode 100644 index 5ae8e90cf..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e036d3c54ac14463b116012c8f2119d7 -timeCreated: 1750924605 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/MaterialEditorGUI.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs deleted file mode 100644 index bd73d8b80..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs +++ /dev/null @@ -1,176 +0,0 @@ -using UnityEditor; -using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.UI; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -public class MenuIntegration : MonoBehaviour -{ - [MenuItem("GameObject/UI/Translucent Image", false, 3)] - static void CreateTranslucentImage(MenuCommand menuCommand) - { - // Create a custom game object - GameObject go = new GameObject("Translucent Image"); - go.AddComponent(); - PlaceUIElementRoot(go, menuCommand); - go.GetComponent().sizeDelta = new Vector2(200, 200); - } - - [MenuItem("CONTEXT/Image/Convert to Translucent Image", false, 3)] - static void ConvertToTranslucentImage(MenuCommand menuCommand) - { - var image = (Image) menuCommand.context; - - var go = image.gameObject; - Undo.DestroyObjectImmediate(image); - - var ti = Undo.AddComponent(go); - ti.sprite = image.sprite; - var color = image.color; - ti.color = new Color(color.r, color.g, color.b, - 1); // foreground opacity should be used instead of alpha most of the time - ti.raycastTarget = image.raycastTarget; - ti.type = image.type; - ti.useSpriteMesh = image.useSpriteMesh; - ti.preserveAspect = image.preserveAspect; - ti.fillCenter = image.fillCenter; - ti.fillMethod = image.fillMethod; - ti.fillOrigin = image.fillOrigin; - ti.fillAmount = image.fillAmount; - ti.fillClockwise = image.fillClockwise; - } - - -#region PlaceUIElementRoot - - static void PlaceUIElementRoot(GameObject element, MenuCommand menuCommand) - { - GameObject parent = menuCommand.context as GameObject; - if (parent == null || parent.GetComponentInParent() == null) - { - parent = GetOrCreateCanvasGameObject(); - } - - string uniqueName = GameObjectUtility.GetUniqueNameForSibling(parent.transform, element.name); - element.name = uniqueName; - Undo.RegisterCreatedObjectUndo(element, "Create " + element.name); - Undo.SetTransformParent(element.transform, parent.transform, "Parent " + element.name); - GameObjectUtility.SetParentAndAlign(element, parent); - if (parent != menuCommand.context) // not a context click, so center in sceneview - SetPositionVisibleinSceneView( - parent.GetComponent(), - element.GetComponent()); - - Selection.activeGameObject = element; - } - - // Helper function that returns a Canvas GameObject; preferably a parent of the selection, or other existing Canvas. - public static GameObject GetOrCreateCanvasGameObject() - { - GameObject selectedGo = Selection.activeGameObject; - - // Try to find a gameobject that is the selected GO or one if its parents. - Canvas canvas = (selectedGo != null) ? selectedGo.GetComponentInParent() : null; - if (canvas != null && canvas.gameObject.activeInHierarchy) - return canvas.gameObject; - - // No canvas in selection or its parents? Then use just any canvas.. - canvas = Shims.FindObjectOfType(); - if (canvas != null && canvas.gameObject.activeInHierarchy) - return canvas.gameObject; - - // No canvas in the scene at all? Then create a new one. - return CreateNewUI(); - } - - public static GameObject CreateNewUI() - { - // Root for the UI - var root = new GameObject("Canvas") {layer = LayerMask.NameToLayer("UI")}; - Canvas canvas = root.AddComponent(); - canvas.renderMode = RenderMode.ScreenSpaceOverlay; - root.AddComponent(); - root.AddComponent(); - Undo.RegisterCreatedObjectUndo(root, "Create " + root.name); - - // if there is no event system add one... - CreateEventSystem(false); - return root; - } - - static void CreateEventSystem(bool select, GameObject parent = null) - { - var esys = Shims.FindObjectOfType(); - if (esys == null) - { - var eventSystem = new GameObject("EventSystem"); - GameObjectUtility.SetParentAndAlign(eventSystem, parent); - esys = eventSystem.AddComponent(); - eventSystem.AddComponent(); - - Undo.RegisterCreatedObjectUndo(eventSystem, "Create " + eventSystem.name); - } - - if (select && esys != null) - { - Selection.activeGameObject = esys.gameObject; - } - } - - static void SetPositionVisibleinSceneView(RectTransform canvasRTransform, RectTransform itemTransform) - { - // Find the best scene view - SceneView sceneView = SceneView.lastActiveSceneView; - if (sceneView == null && SceneView.sceneViews.Count > 0) - sceneView = SceneView.sceneViews[0] as SceneView; - - // Couldn't find a SceneView. Don't set position. - if (sceneView == null || sceneView.camera == null) - return; - - // Create world space Plane from canvas position. - Vector2 localPlanePosition; - Camera camera = sceneView.camera; - Vector3 position = Vector3.zero; - if (RectTransformUtility.ScreenPointToLocalPointInRectangle( - canvasRTransform, - new Vector2(camera.pixelWidth / 2, camera.pixelHeight / 2), - camera, - out localPlanePosition)) - { - // Adjust for canvas pivot - localPlanePosition.x = localPlanePosition.x + canvasRTransform.sizeDelta.x * canvasRTransform.pivot.x; - localPlanePosition.y = localPlanePosition.y + canvasRTransform.sizeDelta.y * canvasRTransform.pivot.y; - - localPlanePosition.x = Mathf.Clamp(localPlanePosition.x, 0, canvasRTransform.sizeDelta.x); - localPlanePosition.y = Mathf.Clamp(localPlanePosition.y, 0, canvasRTransform.sizeDelta.y); - - // Adjust for anchoring - position.x = localPlanePosition.x - canvasRTransform.sizeDelta.x * itemTransform.anchorMin.x; - position.y = localPlanePosition.y - canvasRTransform.sizeDelta.y * itemTransform.anchorMin.y; - - Vector3 minLocalPosition; - minLocalPosition.x = canvasRTransform.sizeDelta.x * (0 - canvasRTransform.pivot.x) + - itemTransform.sizeDelta.x * itemTransform.pivot.x; - minLocalPosition.y = canvasRTransform.sizeDelta.y * (0 - canvasRTransform.pivot.y) + - itemTransform.sizeDelta.y * itemTransform.pivot.y; - - Vector3 maxLocalPosition; - maxLocalPosition.x = canvasRTransform.sizeDelta.x * (1 - canvasRTransform.pivot.x) - - itemTransform.sizeDelta.x * itemTransform.pivot.x; - maxLocalPosition.y = canvasRTransform.sizeDelta.y * (1 - canvasRTransform.pivot.y) - - itemTransform.sizeDelta.y * itemTransform.pivot.y; - - position.x = Mathf.Clamp(position.x, minLocalPosition.x, maxLocalPosition.x); - position.y = Mathf.Clamp(position.y, minLocalPosition.y, maxLocalPosition.y); - } - - itemTransform.anchoredPosition = position; - itemTransform.localRotation = Quaternion.identity; - itemTransform.localScale = Vector3.one; - } - -#endregion -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs.meta deleted file mode 100644 index d74dc565e..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: 99feb6419b119464aa5a3ad6549ea73c -timeCreated: 1539852386 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/MenuIntegration.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs deleted file mode 100644 index dea8b25e6..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.SceneManagement; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -public static class Migration -{ - [MenuItem("Tools/Translucent Image/Migrate to 6.0", false, 10000)] - [SuppressMessage("ReSharper", "Unity.PreferAddressByIdToGraphicsParams")] - static void MigrateTo60() - { - var tiArr = Shims.FindObjectsOfType(); - foreach (var ti in tiArr) - { - Undo.RecordObject(ti, "Migrate to 6.0"); - - var mat = ti.material; - var matSo = new SerializedObject(mat); - - // var shader = mat.shader; - // mat.SetKeyword(new LocalKeyword(shader, "_BACKGROUND_MODE_NORMAL"), mat.IsKeywordEnabled("_FOREGROUND_MODE_CONSISTENT")); - // mat.SetKeyword(new LocalKeyword(shader, "_BACKGROUND_MODE_COLORFUL"), mat.IsKeywordEnabled("_FOREGROUND_MODE_COLORFUL")); - // if (shader.name == "UI/TranslucentImage-Paraform") - // mat.SetKeyword(new LocalKeyword(shader, "_BACKGROUND_MODE_OPAQUE"), mat.IsKeywordEnabled("_FOREGROUND_MODE_ONLY")); - // mat.SetFloat("_BACKGROUND_MODE", (int)mat.GetFloat("_FOREGROUND_MODE")); - - - var savedProps = matSo.FindProperty("m_SavedProperties"); - if (TryFindOrphanMaterialProperty(savedProps, "_Vibrancy", out float vibrancy)) - ti.vibrancy = vibrancy; - if (TryFindOrphanMaterialProperty(savedProps, "_Brightness", out float brightness)) - ti.brightness = brightness; - if (TryFindOrphanMaterialProperty(savedProps, "_Flatten", out float flatten)) - ti.flatten = flatten; - if (TryFindOrphanMaterialProperty(savedProps, "_ForegroundOpacity", out float foregroundOpacity)) - ti.foregroundOpacity = foregroundOpacity; - - EditorUtility.SetDirty(mat); - EditorUtility.SetDirty(ti); - Debug.Log("Migrated " + ti.name); - } - var scene = SceneManager.GetActiveScene(); - EditorSceneManager.MarkSceneDirty(scene); - Debug.Log("Migrated scene " + scene.name); - } - - static bool TryFindOrphanMaterialProperty(SerializedProperty savedProps, string propertyName, out T value) - { - value = default; - - var arrayName = typeof(T) == typeof(float) ? "m_Floats" - : typeof(T) == typeof(Color) ? "m_Colors" - : typeof(T) == typeof(Texture) ? "m_Texs" - : null; - - if (arrayName == null) return false; - - var array = savedProps.FindPropertyRelative(arrayName); - for (var i = 0; i < array.arraySize; i++) - { - var matProp = array.GetArrayElementAtIndex(i); - if (matProp.FindPropertyRelative("first").stringValue == propertyName) - { - var valProp = matProp.FindPropertyRelative("second"); - value = typeof(T) == typeof(float) ? (T)(object)valProp.floatValue - : typeof(T) == typeof(Color) ? (T)(object)valProp.colorValue - : (T)(object)valProp.objectReferenceValue; - return true; - } - } - - return false; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs.meta deleted file mode 100644 index 91f02a28c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 69cb9068e80c2e44db80afedac9e414c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Migration.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources.meta deleted file mode 100644 index 3b81954ab..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ace044fc6a6bf3649a39e77c7a77f6c6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png deleted file mode 100644 index cdff700b1..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22c0eb951a2951144f62d92776c13537893984d6ec2d8decfcf2f937523df48e -size 6133 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png.meta deleted file mode 100644 index ac7b4b602..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig Icon.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: c2fc80b7e20a4104db1297bcddfd83b5 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurConfig - Icon.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png deleted file mode 100644 index 6f9482f82..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:258db1e79d5850cadb97720924e019e9755e1641364d9097660a02818757355b -size 4866 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png.meta deleted file mode 100644 index a3efa10c2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource Icon.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: 4bc9a290ca74e434499699e3db41c3f9 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/BlurSource - Icon.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png deleted file mode 100644 index d7e722595..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2af97d0062e643b80af65b837e907cd00c987c170294804101a9ce8ca5fb1053 -size 1090 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png.meta deleted file mode 100644 index d93cf3615..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: 1cd4d3c69546e04408d9b94e5b4b11ab -labels: -- TranslucentImageEditorResources -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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_BG.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png deleted file mode 100644 index d9ae8628c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8eb30ee5ad0b86891a6567e7190a5b8116ce94be8cfe4fe32a933d17e9cffa88 -size 1235 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png.meta deleted file mode 100644 index ac8656def..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: fdf18819c7c4cfd48b44182ec0a87e15 -labels: -- TranslucentImageEditorResources -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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/Knob_FG.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png deleted file mode 100644 index 99436bff0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d31ee189079a800d3b1135186b5288ef4cf7f33f1792a8f9f3ed1bacac6baacd -size 2749 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png.meta deleted file mode 100644 index 6c9b6583f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage Icon.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: 0764cd30e065b7340891d9f7f680a12f -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/TranslucentImage - Icon.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png deleted file mode 100644 index 8602530fa..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a64491a706b6dfb8f4f1f7d62074aa7934ba83ba04fc248d87c950e9cc05ac9 -size 329 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png.meta deleted file mode 100644 index e27990c62..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: a00d4db4afc81cb48bd1f0deb7c6aba7 -labels: -- TranslucentImageEditorResources -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 1 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_bl.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png deleted file mode 100644 index 6ebf80024..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:580a715ae32ef6838979a94aab2b4bd68d0c6b127e1201492f135dbae414a834 -size 318 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png.meta deleted file mode 100644 index 293ca4f88..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: e984439ef57f3a64399fa255d7c4ba16 -labels: -- TranslucentImageEditorResources -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 1 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_br.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png deleted file mode 100644 index b5513df48..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0895294835ab186323d9806131b44f68dafb94e99df6ca3b47f95478d6ecdbf2 -size 343 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png.meta deleted file mode 100644 index c391c3a5e..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: 0bdf2adb70adf36449bbc431fc921bbc -labels: -- TranslucentImageEditorResources -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 1 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tl.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png deleted file mode 100644 index eb7f38842..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dca30636af7f45ab8ab8e86c285e21878efe2af40e08e3901b031521b488aba -size 344 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png.meta deleted file mode 100644 index 151e600ef..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: 28ffad455fa2c244c85c5d788e285cfc -labels: -- TranslucentImageEditorResources -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 1 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 1 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 2 - 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: 2048 - 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: 2048 - 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: 2048 - 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: 2048 - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/Resources/round_corner_tr.png - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs deleted file mode 100644 index 6ab69bf10..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System; -using LeTai.Common.Editor; -using UnityEditor; -using UnityEditor.AnimatedValues; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -[CustomEditor(typeof(ScalableBlurConfig))] -[CanEditMultipleObjects] -public class ScalableBlurConfigEditor : UnityEditor.Editor -{ - static readonly EditorPrefValue SHOW_RESOLUTION_MATCHING = new("TranslucentImage_ShowResolutionMatching", false); - - readonly AnimBool useAdvancedControl = new AnimBool(false); - - int tab, previousTab; - - EditorProperty radius; - EditorProperty iteration; - EditorProperty strength; - EditorProperty mode; - EditorProperty referenceResolution; - EditorProperty matchWidthOrHeight; - SerializedProperty useStrength; - - public void Awake() - { - LoadTabSelection(); - useAdvancedControl.value = tab > 0; - } - - public void OnEnable() - { - radius = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.Radius)); - iteration = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.Iteration)); - strength = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.Strength)); - mode = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.Mode)); - referenceResolution = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.ReferenceResolution)); - matchWidthOrHeight = new EditorProperty(serializedObject, nameof(ScalableBlurConfig.MatchWidthOrHeight)); - useStrength = serializedObject.FindProperty("useStrength"); - - // Without this the editor will not Repaint automatically when animating - useAdvancedControl.valueChanged.AddListener(Repaint); - } - - public override void OnInspectorGUI() - { - Draw(); - } - - public void Draw() - { - using var changes = new EditorGUI.ChangeCheckScope(); - using var _ = new EditorGUILayout.VerticalScope(); - - mode.Draw(); - - EditorGUILayout.Space(); - - DrawTabBar(); - serializedObject.Update(); - DrawTabsContent(); - - EditorGUILayout.Space(); - - SHOW_RESOLUTION_MATCHING.Value = EditorGUILayout.BeginFoldoutHeaderGroup(SHOW_RESOLUTION_MATCHING, - "Resolution matching", - EditorStyles.foldout); - if (SHOW_RESOLUTION_MATCHING) - { - referenceResolution.Draw(); - matchWidthOrHeight.Draw(); - } - EditorGUILayout.EndFoldoutHeaderGroup(); - - if (changes.changed) - serializedObject.ApplyModifiedProperties(); - } - - void DrawTabBar() - { - using (var h = new EditorGUILayout.HorizontalScope()) - { - GUILayout.FlexibleSpace(); - - tab = GUILayout.Toolbar( - tab, - new[] { "Simple", "Advanced" }, - GUILayout.MinWidth(0), - GUILayout.MaxWidth(EditorGUIUtility.pixelsPerPoint * 192) - ); - - GUILayout.FlexibleSpace(); - } - - if (tab != previousTab) - { - GUI.FocusControl(""); // Defocus - SaveTabSelection(); - previousTab = tab; - } - - useAdvancedControl.target = tab == 1; - } - - void DrawTabsContent() - { - if (EditorGUILayout.BeginFadeGroup(1 - useAdvancedControl.faded)) - { - // EditorProperty dooesn't invoke getter. Not needed anywhere else. - _ = ((ScalableBlurConfig)target).Strength; - using var changes = new EditorGUI.ChangeCheckScope(); - strength.Draw(); - if (changes.changed) - useStrength.boolValue = true; - } - EditorGUILayout.EndFadeGroup(); - - if (EditorGUILayout.BeginFadeGroup(useAdvancedControl.faded)) - { - using var changes = new EditorGUI.ChangeCheckScope(); - radius.Draw(); - iteration.Draw(); - if (changes.changed) - useStrength.boolValue = false; - } - EditorGUILayout.EndFadeGroup(); - } - - //Persist selected tab between sessions and instances - void SaveTabSelection() - { - EditorPrefs.SetInt("LETAI_TRANSLUCENTIMAGE_TIS_TAB", tab); - } - - void LoadTabSelection() - { - if (EditorPrefs.HasKey("LETAI_TRANSLUCENTIMAGE_TIS_TAB")) - tab = EditorPrefs.GetInt("LETAI_TRANSLUCENTIMAGE_TIS_TAB"); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs.meta deleted file mode 100644 index 64c0b4910..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 771a13bc1eb042bc9d4ad186dd99dda5 -timeCreated: 1560160054 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/ScalableBlurConfigEditor.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs deleted file mode 100644 index 03a02c9c6..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Linq; -using System.Reflection; -using UnityEditor; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -class ScenceGizmoAutoDisable : AssetPostprocessor -{ - static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths) - { - if (!importedAssets.Any(p => p.Contains("TranslucentImage"))) - return; - - var structAnnotation = Type.GetType("UnityEditor.Annotation, UnityEditor"); - if (structAnnotation == null) return; - - var fieldClassId = structAnnotation.GetField("classID"); - var fieldScriptClass = structAnnotation.GetField("scriptClass"); - var fieldFlags = structAnnotation.GetField("flags"); - var fieldIconEnabled = structAnnotation.GetField("iconEnabled"); - - Type classAnnotationUtility = Type.GetType("UnityEditor.AnnotationUtility, UnityEditor"); - if (classAnnotationUtility == null) return; - - var methodGetAnnotations = classAnnotationUtility.GetMethod("GetAnnotations", BindingFlags.NonPublic | BindingFlags.Static); - if (methodGetAnnotations == null) return; - var methodSetIconEnabled = classAnnotationUtility.GetMethod("SetIconEnabled", BindingFlags.NonPublic | BindingFlags.Static); - if (methodSetIconEnabled == null) return; - - Array annotations = (Array)methodGetAnnotations.Invoke(null, null); - foreach (var a in annotations) - { - string scriptClass = (string)fieldScriptClass.GetValue(a); - - // built in types - if (string.IsNullOrEmpty(scriptClass)) continue; - - int classId = (int)fieldClassId.GetValue(a); - int flags = (int)fieldFlags.GetValue(a); - int iconEnabled = (int)fieldIconEnabled.GetValue(a); - - const int maskHasIcon = 1; - bool hasIconFlag = (flags & maskHasIcon) == maskHasIcon; - - if (hasIconFlag - && iconEnabled != 0 - && scriptClass.Contains("TranslucentImage")) - { - methodSetIconEnabled.Invoke(null, new object[] { classId, scriptClass, 0 }); - } - } - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs.meta deleted file mode 100644 index 03a172658..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d3c5df780c45454e820502d48a07db97 -timeCreated: 1575814101 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/ScenceGizmoAutoDisable.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs deleted file mode 100644 index d43b14c26..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs +++ /dev/null @@ -1,427 +0,0 @@ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; -using LeTai.Common.Editor; -using LeTai.Paraform.Scaffold.Editor; -using UnityEditor; -using UnityEditor.AnimatedValues; -using UnityEditor.UI; -using UnityEngine; -using Debug = System.Diagnostics.Debug; -using Image = UnityEngine.UI.Image; -using Object = UnityEngine.Object; - -#pragma warning disable CS0162 // Unreachable code detected - -namespace LeTai.Asset.TranslucentImage.Editor -{ -[CustomEditor(typeof(TranslucentImage))] -[CanEditMultipleObjects] -public class TranslucentImageEditor : ImageEditor -{ - SerializedProperty type; - SerializedProperty sprite; - SerializedProperty preserveAspect; - SerializedProperty useSpriteMesh; - - EditorProperty source; - EditorProperty foregroundOpacity; - EditorProperty _vibrancy; - EditorProperty _brightness; - EditorProperty _flatten; - - GUIStyle styleBtnSource; - - static readonly EditorPrefValue SHOW_PARAFORM_SHAPE_CONTROLS = new("TranslucentImage_ShowParaformShapeControls", HAVE_PARAFORM); - static readonly EditorPrefValue SHOW_MATERIAL_PROPERTIES = new("TranslucentImage_ShowMaterialProperties", true); - - AnimBool showTypeAnim; - - List tiList; - UnityEditor.Editor materialEditor; - - ParaformEditor paraformEditor; - - bool needValidateSource; - bool needValidateMaterial; - bool materialUsedInDifferentSource; - bool usingIncorrectShader; - int smallFontSize; - - const bool HAVE_PARAFORM = -#if LETAI_PARAFORM - true; -#else - false; -#endif - - protected override void OnEnable() - { - base.OnEnable(); - - typeof(ImageEditor).GetField("m_SpriteContent", BindingFlags.Instance | BindingFlags.NonPublic) - .SetValue(this, new GUIContent("Sprite")); - - sprite = serializedObject.FindProperty("m_Sprite"); - type = serializedObject.FindProperty("m_Type"); - preserveAspect = serializedObject.FindProperty("m_PreserveAspect"); - useSpriteMesh = serializedObject.FindProperty("m_UseSpriteMesh"); - - source = new EditorProperty(serializedObject, nameof(TranslucentImage.source), "_source"); - foregroundOpacity = new EditorProperty(serializedObject, nameof(TranslucentImage.foregroundOpacity)); - _vibrancy = new EditorProperty(serializedObject, nameof(TranslucentImage.vibrancy)); - _brightness = new EditorProperty(serializedObject, nameof(TranslucentImage.brightness)); - _flatten = new EditorProperty(serializedObject, nameof(TranslucentImage.flatten)); - paraformEditor = new ParaformEditor(serializedObject.FindProperty("paraformConfig")); - - showTypeAnim = new AnimBool(sprite.objectReferenceValue); - showTypeAnim.valueChanged.AddListener(Repaint); - - tiList = targets.Cast().ToList(); - if (tiList.Count > 0) - { - CheckMaterialUsedInDifferentSource(); - CheckCorrectShader(); - } - } - - void InitStyle() - { - if (styleBtnSource != null) - return; - - styleBtnSource = new GUIStyle(GUI.skin.button) { - alignment = TextAnchor.MiddleLeft, - richText = true, - }; - - smallFontSize = Mathf.RoundToInt(styleBtnSource.fontSize * .8f); - } - - public override void OnInspectorGUI() - { - InitStyle(); - - serializedObject.Update(); - - tiList = targets.Cast().ToList(); - Debug.Assert(tiList.Count > 0, "Translucent Image Editor serializedObject target is null"); - - DrawSourceControls(); - - DrawShapeControls(); - - EditorGUILayout.Space(); - - EditorGUILayout.LabelField("Appearance", EditorStyles.boldLabel); - - DrawSpriteControls(); - EditorGUILayout.PropertyField(m_Color); - foregroundOpacity.Draw(); - _vibrancy.Draw(); - _brightness.Draw(); - _flatten.Draw(); - EditorGUILayout.Space(); - DrawMaterialControls(); - DrawMaterialProperties(); - - EditorGUILayout.Space(); - EditorGUILayout.LabelField("Interaction", EditorStyles.boldLabel); - RaycastControlsGUI(); - MaskableControlsGUI(); - - serializedObject.ApplyModifiedProperties(); - - if (needValidateSource) ValidateSource(); - if (needValidateMaterial) ValidateMaterial(); - } - - void DrawSourceControls() - { - using (var changes = new EditorGUI.ChangeCheckScope()) - { - source.Draw(); - if (changes.changed) - needValidateSource = true; - } - - if (!source.serializedProperty.objectReferenceValue) - { - var existingSources = Shims.FindObjectsOfType(); - if (existingSources.Length > 0) - { - using (new EditorGUI.IndentLevelScope()) - { - using var h = new EditorGUILayout.HorizontalScope(); - - EditorGUILayout.PrefixLabel("From current Scene"); - using var v = new EditorGUILayout.VerticalScope(); - foreach (var s in existingSources) - { - SetSourceBtn($"{s.gameObject.name}\t{GetSourceDescriptionLabel(s)}", s); - } - } - - EditorGUILayout.Space(); - } - else - { - EditorGUILayout.HelpBox("No Translucent Image Source(s) found in current scene", MessageType.Warning); - } - } - else - { - using var _ = new EditorGUI.IndentLevelScope(1); - - var sourceObj = (TranslucentImageSource)source.serializedProperty.objectReferenceValue; - var config = sourceObj.BlurConfig; - - if (config) - { - var oldStrength = config.Strength; - var newStrength = EditorGUILayout.FloatField("Blur Strength", oldStrength); - - if (!Mathf.Approximately(newStrength, oldStrength)) - { - Undo.RecordObject(config, "Change blur config"); - config.Strength = newStrength; - EditorUtility.SetDirty(config); - } - } - else - { - using var h = new EditorGUILayout.HorizontalScope(); - EditorGUILayout.LabelField(" ", "No Blur Config"); - } - - var sameCameraSources = sourceObj.GetComponents(); - if (sameCameraSources.Length > 1) - { - using var h = new EditorGUILayout.HorizontalScope(); - EditorGUILayout.PrefixLabel("Other Sources"); - foreach (var s in sameCameraSources) - { - if (s == sourceObj) - continue; - - SetSourceBtn(GetSourceDescriptionLabel(s), s); - } - } - } - } - - string GetSourceDescriptionLabel(TranslucentImageSource s) - { - if (s.BlurConfig) - return $"STR: {s.BlurConfig.Strength:0.#}"; - - return $"No Blur Config"; - } - - void SetSourceBtn(string label, TranslucentImageSource newSource) - { - if (GUILayout.Button(label, styleBtnSource, GUILayout.ExpandWidth(false))) - { - Undo.RecordObject(target, $"Set source to {newSource.gameObject.name}"); - source.serializedProperty.objectReferenceValue = newSource; - source.CallSetters(newSource); - needValidateSource = true; - needValidateMaterial = true; - } - } - - [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")] - [SuppressMessage("ReSharper", "HeuristicUnreachableCode")] - void DrawShapeControls() - { - var useParaform = tiList.Any(ti => ti.material && ti.material.shader.name.EndsWith("-Paraform")); - - using (new EditorGUILayout.HorizontalScope()) - { - var label = "Paraform"; - if (!HAVE_PARAFORM) - label += " (not installed)"; - else if (!useParaform) - label += " (Not supported by material)"; - SHOW_PARAFORM_SHAPE_CONTROLS.Value = EditorGUILayout.BeginFoldoutHeaderGroup(SHOW_PARAFORM_SHAPE_CONTROLS, label); - - if (HAVE_PARAFORM && !useParaform) - { - if (GUILayout.Button("Use Paraform Shader")) - { - foreach (var ti in tiList) - { - var mat = ti.material; - Undo.RecordObject(mat, "Use Paraform Shader"); - mat.shader = Shader.Find("UI/TranslucentImage-Paraform"); - } - } - } - } - - using var disabledGroupScope = new EditorGUI.DisabledGroupScope(!HAVE_PARAFORM || !useParaform); - - if (SHOW_PARAFORM_SHAPE_CONTROLS) - { - using var changes = new EditorGUI.ChangeCheckScope(); - - paraformEditor?.DrawShapeControls(); - - if (changes.changed) - { - serializedObject.ApplyModifiedProperties(); - foreach (var ti in tiList) ti.paraformConfig.NotifyChanged(); - } - - ParaformEditor.MaybeGetParaformLinkBtn(); - } - EditorGUILayout.EndFoldoutHeaderGroup(); - } - - void DrawSpriteControls() - { - SpriteGUI(); - showTypeAnim.target = sprite.objectReferenceValue != null; - if (EditorGUILayout.BeginFadeGroup(showTypeAnim.faded)) - TypeGUI(); - EditorGUILayout.EndFadeGroup(); - - Image.Type type = (Image.Type)this.type.enumValueIndex; - bool showNativeSize = (type == Image.Type.Simple || type == Image.Type.Filled) - && sprite.objectReferenceValue != null; - SetShowNativeSize(showNativeSize, false); - - if (EditorGUILayout.BeginFadeGroup(m_ShowNativeSize.faded)) - { - EditorGUI.indentLevel++; - - if ((Image.Type)this.type.enumValueIndex == Image.Type.Simple) - EditorGUILayout.PropertyField(useSpriteMesh); - - EditorGUILayout.PropertyField(preserveAspect); - EditorGUI.indentLevel--; - } - EditorGUILayout.EndFadeGroup(); - NativeSizeButtonGUI(); - } - - void DrawMaterialControls() - { - using var changes = new EditorGUI.ChangeCheckScope(); - EditorGUILayout.PropertyField(m_Material); - if (changes.changed) - needValidateMaterial = true; - - if (usingIncorrectShader) - { - EditorGUILayout.HelpBox("Material is using unsupported shader", MessageType.Warning); - } - if (materialUsedInDifferentSource) - { - EditorGUILayout.HelpBox("Translucent Images with different Sources" + - " should also use different Materials", - MessageType.Error); - } - } - - void DrawMaterialProperties() - { - using var change = new EditorGUI.ChangeCheckScope(); - var targetMaterials = tiList.Select(t => t.material).Cast().ToArray(); - - using (_ = new EditorGUI.IndentLevelScope()) - { - SHOW_MATERIAL_PROPERTIES.Value = EditorGUILayout.BeginFoldoutHeaderGroup(SHOW_MATERIAL_PROPERTIES, "Material settings"); - if (SHOW_MATERIAL_PROPERTIES) - { - bool prevGuiEnabled = GUI.enabled; - if (targetMaterials.Any(m => m.hideFlags == HideFlags.HideAndDontSave)) - { - using (new EditorGUILayout.HorizontalScope()) - { - EditorGUILayout.HelpBox("Create a new Material to edit", MessageType.Info); - if (GUILayout.Button("Create Material", GUILayout.ExpandHeight(true))) - { - var path = EditorUtility.SaveFilePanelInProject("Save New Material", "Translucent Image Material", "mat", ""); - if (!string.IsNullOrEmpty(path)) - { - var material = Instantiate(HAVE_PARAFORM - ? DefaultResources.Instance.paraformMaterial - : DefaultResources.Instance.material); - m_Material.objectReferenceValue = material; - AssetDatabase.CreateAsset(material, path); - } - } - } - GUI.enabled = false; - } - - CreateCachedEditor(targetMaterials, typeof(MaterialEditor), ref materialEditor); - var materialProperties = MaterialEditor.GetMaterialProperties(targetMaterials); - TranslucentImageShaderGUI.DrawProperties((MaterialEditor)materialEditor, materialProperties, true); - - GUI.enabled = prevGuiEnabled; - } - EditorGUILayout.EndFoldoutHeaderGroup(); - } - - - if (change.changed) - { - foreach (var ti in tiList) - { - if (ti.materialForRendering != ti.material) - { - Undo.RecordObject(ti.materialForRendering, $"Modify material {ti.material.name}"); - TranslucentImage.CopyMaterialPropertiesTo(ti.material, ti.materialForRendering); - } - } - } - } - - void ValidateSource() - { - CheckMaterialUsedInDifferentSource(); - needValidateSource = false; - } - - void ValidateMaterial() - { - CheckMaterialUsedInDifferentSource(); - CheckCorrectShader(); - needValidateMaterial = false; - } - - private void CheckCorrectShader() - { - usingIncorrectShader = tiList.Any(ti => !ti.material.shader.name.Contains("TranslucentImage")); - } - - private void CheckMaterialUsedInDifferentSource() - { - if (!tiList[0].source - || tiList[0].material.IsKeywordEnabled(ShaderID.KW_BACKGROUND_MODE_OPAQUE)) - { - materialUsedInDifferentSource = false; - return; - } - - var diffSource = Shims.FindObjectsOfType() - .Where(ti => ti.source != tiList[0].source) - .ToList(); - - if (!diffSource.Any()) - { - materialUsedInDifferentSource = false; - return; - } - - var sameMat = diffSource.GroupBy(ti => ti.material).ToList(); - - materialUsedInDifferentSource = sameMat.Any(group => group.Key == tiList[0].material); - - needValidateMaterial = false; - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs.meta deleted file mode 100644 index a5cb9c42d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: 9a6952d1e37a4f0458848a0e61378de5 -timeCreated: 1539852386 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageEditor.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs deleted file mode 100644 index 29f8a9bf4..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs +++ /dev/null @@ -1,244 +0,0 @@ -using System; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using LeTai.Common.Editor; -using LeTai.Paraform.Scaffold; -using LeTai.Paraform.Scaffold.Editor; -using UnityEditor; -using UnityEngine; -using EGU = UnityEditor.EditorGUIUtility; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -public class TranslucentImageShaderGUI : ShaderGUI -{ - static readonly EditorPrefValue SHOW_PARAFORM_MATERIAL_CONTROLS = new("TranslucentImage_ShowParaformMaterialControls", true); - - public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties) - { - DrawProperties(materialEditor, properties, false); - } - - [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")] - public static void DrawProperties(MaterialEditor materialEditor, MaterialProperty[] properties, bool skipUnimportants) - { - float oldLabelWidth = EGU.labelWidth; - float oldFieldWidth = EGU.fieldWidth; - materialEditor.SetDefaultGUIWidths(); - - // ReSharper disable once ConvertToConstant.Local - bool haveParaform = false; -#if LETAI_PARAFORM - haveParaform = true; -#endif - - var useParaform = ((Material)materialEditor.target).shader.name == "UI/TranslucentImage-Paraform"; - - using var propIter = properties.AsEnumerable().GetEnumerator(); - - var reflectionModeProp = DrawDefaultUntil("_REFRACTION_MODE"); - - EditorGUILayout.Space(); - - var paraformLabel = "Paraform"; - if (!haveParaform) - paraformLabel += " (not installed)"; - SHOW_PARAFORM_MATERIAL_CONTROLS.Value = EditorGUILayout.Foldout( - SHOW_PARAFORM_MATERIAL_CONTROLS, paraformLabel, true, EditorStyles.foldoutHeader); - if (!SHOW_PARAFORM_MATERIAL_CONTROLS) - { - while (propIter.Current.name != "_StencilComp") - propIter.MoveNext(); - } - else - { - using (new EditorGUI.DisabledGroupScope(!haveParaform)) - { - if (haveParaform && !useParaform) - EditorGUILayout.HelpBox("Change the material's shader to UI/TranslucentImage-Paraform to enable", MessageType.Info); - - using (new EditorGUI.DisabledGroupScope(!useParaform)) - { - var refractiveIndexProp = ConsumeProp(); - var chromaticDispersionProp = ConsumeProp(); - var refractiveIndexRatiosProp = ConsumeProp(); - using (var changes = new EditorGUI.ChangeCheckScope()) - { - DrawDefault(reflectionModeProp); - var refractionMode = (RefractionMode)(int)reflectionModeProp.floatValue; - - using (new EditorGUI.DisabledScope(refractionMode == RefractionMode.Off)) - DrawDefault(refractiveIndexProp); - - using (new EditorGUI.DisabledScope(refractionMode != RefractionMode.Chromatic)) - DrawDefault(chromaticDispersionProp); - - if (changes.changed) - refractiveIndexRatiosProp.vectorValue = ParaformMaterial - .GetRefractiveIndexRatios( - refractiveIndexProp.floatValue, - refractionMode == RefractionMode.Chromatic ? chromaticDispersionProp.floatValue : 0 - ); - } - - - var useEdgeGlintProp = ConsumeProp(); - DrawDefault(useEdgeGlintProp); - using (new EditorGUI.DisabledScope(useEdgeGlintProp.floatValue == 0)) - { - var edgeGlintDirectionsProp = ConsumePropName("_EdgeGlintDirections"); - DrawEdgeGlintDirections(edgeGlintDirectionsProp); - - var edgeGlintWrapProp = DrawDefaultUntil("_EdgeGlintWrap"); - DrawEdgeGlintWrap(edgeGlintWrapProp); - - var edgeGlintSharpnessProp = ConsumePropName("_EdgeGlintSharpness"); - DrawEdgeGlintSharpness(edgeGlintSharpnessProp); - } - } - - if (!haveParaform) - ParaformEditor.MaybeGetParaformLinkBtn(); - - ConsumeProp(); - } - } - - if (!skipUnimportants) - { - do - { - DrawDefault(propIter.Current); - } while (propIter.MoveNext()); - } - - EditorGUILayout.Space(); - - if (!skipUnimportants) - { - EditorGUILayout.Space(); - if (UnityEngine.Rendering.SupportedRenderingFeatures.active.editableMaterialRenderQueue) - materialEditor.RenderQueueField(); - materialEditor.EnableInstancingField(); - materialEditor.DoubleSidedGIField(); - } - - EGU.labelWidth = oldLabelWidth; - EGU.fieldWidth = oldFieldWidth; - - return; - - MaterialProperty ConsumeProp() - { - return propIter.MoveNext() ? propIter.Current : null; - } - - MaterialProperty ConsumePropName(string name) - { - var next = ConsumeProp(); - if (next.name != name) - throw new ArgumentException($"Expect {name} but got {next.name}"); - return next; - } - - MaterialProperty DrawDefaultUntil(string name) - { - while (propIter.MoveNext() && propIter.Current.name != name) - DrawDefault(propIter.Current); - - return propIter.Current; - } - - void DrawDefault(MaterialProperty prop) - { - if ((prop.propertyFlags & UnityEngine.Rendering.ShaderPropertyFlags.HideInInspector) != 0) - return; - - if (skipUnimportants && (prop.propertyFlags & UnityEngine.Rendering.ShaderPropertyFlags.PerRendererData) != 0) - return; - - float h = materialEditor.GetPropertyHeight(prop, prop.displayName); - Rect r = EditorGUILayout.GetControlRect(true, h); - materialEditor.ShaderProperty(r, prop, GetPropGUIContent(prop)); - } - } - - static void DrawEdgeGlintDirections(MaterialProperty prop) - { - Vector4 value = prop.vectorValue; - - var angle1 = MathCustom.VecToAngle360(Vector2.right, new Vector2(value.x, -value.y)); - var angle2 = MathCustom.VecToAngle360(Vector2.right, new Vector2(value.z, -value.w)); - - EditorGUI.showMixedValue = prop.hasMixedValue; - using var changeScope = new EditorGUI.ChangeCheckScope(); - - LABEL.text = "Edge Glint 1 Direction"; - angle1 = EditorGUICustom.KnobField(LABEL, angle1, Vector2.right); - LABEL.text = "Edge Glint 2 Direction"; - angle2 = EditorGUICustom.KnobField(LABEL, angle2, Vector2.right); - - EditorGUI.showMixedValue = false; - if (changeScope.changed) - { - var dir1 = MathCustom.Angle360ToVec(angle1, Vector2.right); - var dir2 = MathCustom.Angle360ToVec(angle2, Vector2.right); - prop.vectorValue = new Vector4(dir1.x, -dir1.y, dir2.x, -dir2.y); - } - } - - static void DrawEdgeGlintWrap(MaterialProperty prop) - { - using var scope = new MaterialEditorGUI.PropertyScope(prop); - - var normalized = ParaformMaterial.EdgeGlintWrapFromRaw(prop.floatValue); - normalized = MaterialEditorGUI.Slider("Edge Glint Wrap", normalized, 0, 1); - - if (scope.Changed) - prop.floatValue = ParaformMaterial.EdgeGlintWrapToRaw(normalized); - } - - static void DrawEdgeGlintSharpness(MaterialProperty prop) - { - using var scope = new MaterialEditorGUI.PropertyScope(prop); - - var normalized = ParaformMaterial.EdgeGlintSharpnessFromRaw(prop.floatValue); - normalized = MaterialEditorGUI.Slider("Edge Glint Sharpness", normalized, 0.05f, .8f); - - if (scope.Changed) - prop.floatValue = ParaformMaterial.EdgeGlintSharpnessToRaw(normalized); - } - - static readonly GUIContent LABEL = new GUIContent(); - - static GUIContent GetPropGUIContent(MaterialProperty prop) - { - switch (prop.name) - { - case "_Vibrancy": - LABEL.tooltip = "(De)Saturate the image, 1 is normal, 0 is black and white, below zero make the image negative"; - break; - case "_Brightness": - LABEL.tooltip = "Brighten/darken the image"; - break; - case "_Flatten": - LABEL.tooltip = "Flatten the color behind to help keep contrast on varying background"; - break; - default: - LABEL.tooltip = ""; - break; - } - - LABEL.text = prop.displayName; - - return LABEL; - } - - enum RefractionMode - { - Off, - On, - Chromatic - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs.meta deleted file mode 100644 index b48bc649b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 193075a2a61d481290894aded6229d9e -timeCreated: 1729245462 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageShaderGUI.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs deleted file mode 100644 index e2a2b7fc3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Linq; -using LeTai.Common.Editor; -using UnityEditor; -using UnityEngine; -using UnityEngine.SceneManagement; - -namespace LeTai.Asset.TranslucentImage.Editor -{ -[CustomEditor(typeof(TranslucentImageSource))] -[CanEditMultipleObjects] -public class TranslucentImageSourceEditor : UnityEditor.Editor -{ - ScalableBlurConfigEditor configEditor; - - EditorProperty blurConfig; - EditorProperty downsample; - EditorProperty blurRegion; - EditorProperty maxUpdateRate; - EditorProperty cullPadding; - EditorProperty backgroundFill; - EditorProperty preview; - EditorProperty skipCulling; - - void OnEnable() - { - blurConfig = new EditorProperty(serializedObject, nameof(TranslucentImageSource.BlurConfig)); - downsample = new EditorProperty(serializedObject, nameof(TranslucentImageSource.Downsample)); - blurRegion = new EditorProperty(serializedObject, nameof(TranslucentImageSource.BlurRegion)); - maxUpdateRate = new EditorProperty(serializedObject, nameof(TranslucentImageSource.MaxUpdateRate)); - cullPadding = new EditorProperty(serializedObject, nameof(TranslucentImageSource.CullPadding)); - backgroundFill = new EditorProperty(serializedObject, nameof(TranslucentImageSource.BackgroundFill)); - preview = new EditorProperty(serializedObject, nameof(TranslucentImageSource.Preview)); - skipCulling = new EditorProperty(serializedObject, nameof(TranslucentImageSource.SkipCulling)); - } - - void OnDisable() - { - if (configEditor) - DestroyImmediate(configEditor); - } - - public override void OnInspectorGUI() - { - EditorGUILayout.Space(); - - using (var configChange = new EditorGUI.ChangeCheckScope()) - { - blurConfig.Draw(); - - var curConfig = (ScalableBlurConfig)blurConfig.serializedProperty.objectReferenceValue; - if (!curConfig) - { - EditorGUILayout.HelpBox("Missing Blur Config", MessageType.Warning); - if (GUILayout.Button("New Blur Config File")) - { - ScalableBlurConfig newConfig = CreateInstance(); - - var path = AssetDatabase.GenerateUniqueAssetPath( - $"Assets/{SceneManager.GetActiveScene().name} {serializedObject.targetObject.name} Blur Config.asset"); - AssetDatabase.CreateAsset(newConfig, path); - AssetDatabase.SaveAssets(); - AssetDatabase.Refresh(); - EditorGUIUtility.PingObject(newConfig); - blurConfig.serializedProperty.objectReferenceValue = newConfig; - } - } - else - { - if (!configEditor || configChange.changed) - configEditor = (ScalableBlurConfigEditor)CreateEditor(curConfig); - - configEditor.Draw(); - } - } - - EditorGUILayout.Space(); - - downsample.Draw(); - using (var blurRegionChange = new EditorGUI.ChangeCheckScope()) - { - blurRegion.Draw(); - if (blurRegionChange.changed) - { - foreach (var source in targets.Cast()) - { - source.OnBlurRegionChanged(); - } - } - } - maxUpdateRate.Draw(); - if (maxUpdateRate.serializedProperty.floatValue < float.PositiveInfinity - && skipCulling.serializedProperty.boolValue == false) - { - cullPadding.Draw(); - if (cullPadding.serializedProperty.floatValue <= 0) - EditorGUILayout.HelpBox("When using a limited Max Update Rate with Culling enabled," + - " add some padding to prevent culled area being shown during UI movement.", MessageType.Warning); - } - backgroundFill.Draw(); - preview.Draw(); - skipCulling.Draw(); - - if (GUI.changed) serializedObject.ApplyModifiedProperties(); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs.meta deleted file mode 100644 index 32817c931..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: ec905d5b1e2c40f40b5cdd580f727f3e -timeCreated: 1539852387 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Editor/TranslucentImageSourceEditor.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold.meta deleted file mode 100644 index d8b5ec61c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a6b360fd65c8a7498e21776f5e921f7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor.meta deleted file mode 100644 index 92a7f4511..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fe939aeffd5b448fb6031672e72a89c5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef deleted file mode 100644 index 2b6f4fdd5..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "LeTai.Paraform.Scaffold.Editor", - "rootNamespace": "LeTai.Paraform.Scaffold.Editor", - "references": [ - "GUID:6329229812871a6488deb623f659955b", - "GUID:c131f8808d09e154c956e66d97dd723c", - "GUID:f063c9eabb2dec74ca53a0523cc14584" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef.meta deleted file mode 100644 index 6c46e29bf..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: dbd67092ee33ae344825e5cf39a350f3 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/LeTai.Paraform.Scaffold.Editor.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs deleted file mode 100644 index 638d91c20..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs +++ /dev/null @@ -1,197 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using LeTai.Common.Editor; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Paraform.Scaffold.Editor -{ -public class ParaformEditor -{ - readonly SerializedProperty cornerRadii; - readonly SerializedProperty isCornersLinked; - readonly SerializedProperty cornerCurvature; - readonly SerializedProperty filletCurvature; - readonly SerializedProperty bevelWidth; - readonly SerializedProperty ringThickness; - readonly SerializedProperty elevation; - - readonly GUIContent labelCornerRadii; - readonly GUIContent labelTR; - readonly GUIContent labelBR; - readonly GUIContent labelTL; - readonly GUIContent labelBL; - readonly GUIContent labelBtnLink; - - GUIStyle styleBtnLink; - GUIStyle styleCornerLabelTop; - GUIStyle styleCornerLabelBot; - - public ParaformEditor(SerializedProperty property) - { - cornerRadii = property.FindPropertyRelative(nameof(ParaformConfig.cornerRadii)); - isCornersLinked = property.FindPropertyRelative(nameof(ParaformConfig.isCornersLinked)); - cornerCurvature = property.FindPropertyRelative(nameof(ParaformConfig.cornerCurvature)); - filletCurvature = property.FindPropertyRelative(nameof(ParaformConfig.filletCurvature)); - bevelWidth = property.FindPropertyRelative(nameof(ParaformConfig.bevelWidth)); - ringThickness = property.FindPropertyRelative(nameof(ParaformConfig.ringThickness)); - elevation = property.FindPropertyRelative(nameof(ParaformConfig.elevation)); - - labelCornerRadii = new GUIContent(cornerRadii.displayName); - labelTR = new GUIContent(Assets.Find("round_corner_tr")); - labelBR = new GUIContent(Assets.Find("round_corner_br")); - labelTL = new GUIContent(Assets.Find("round_corner_tl")); - labelBL = new GUIContent(Assets.Find("round_corner_bl")); - labelBtnLink = new GUIContent(EditorGUIUtility.IconContent("Linked")); - } - - void InitStyles() - { - if (styleBtnLink != null) - return; - - styleBtnLink = new GUIStyle(EditorStyles.miniButton) { - fixedHeight = 0, - margin = new RectOffset(0, 0, 0, 0), - padding = new RectOffset(0, 0, -8, -8), - contentOffset = new Vector2(0, -1 * EditorGUIUtility.pixelsPerPoint), - }; - styleCornerLabelTop = new GUIStyle(EditorStyles.label) { - contentOffset = new Vector2(0, -1f * EditorGUIUtility.pixelsPerPoint) - }; - styleCornerLabelBot = new GUIStyle(styleCornerLabelTop) { - contentOffset = new Vector2(0, .5f * EditorGUIUtility.pixelsPerPoint) - }; - } - - public void DrawShapeControls() - { - using var changeScope = new EditorGUI.ChangeCheckScope(); - - DrawCornerRadiiControls(); - - EditorGUILayout.Space(); - - EditorGUILayout.PropertyField(cornerCurvature); - EditorGUILayout.PropertyField(filletCurvature); - EditorGUILayout.PropertyField(bevelWidth); - // var radii = cornerRadii.vector4Value; - // var maxBevelWidth = Mathf.Min(radii.x, radii.y, radii.z, radii.w); - // EditorCustom.ComputedPropertyField( - // bevelWidth, - // p => - // { - // var width = p.floatValue; - // return width <= maxBevelWidth - // ? width.ToString("0.##") - // : $"{maxBevelWidth:0.##} (clamped by radii)"; - // }); - EditorGUILayout.PropertyField(ringThickness); - EditorGUILayout.PropertyField(elevation); - } - - public void DrawCornerRadiiControls() - { - InitStyles(); - - var spacing = EditorGUIUtility.standardVerticalSpacing; - var lineHeight = EditorGUIUtility.singleLineHeight; - var labelWidth = EditorGUIUtility.singleLineHeight * 1f; - var btnLinkWidth = lineHeight * 1.5f; - var btnLinkHeight = lineHeight * 1f; - var totalRect = EditorGUILayout.GetControlRect(true, lineHeight * 2 + spacing); - - using var prop = new EditorGUI.PropertyScope(totalRect, labelCornerRadii, cornerRadii); - - var controlRect = EditorGUI.PrefixLabel(totalRect, prop.content); - - var floatControlWidth = controlRect.width * .4f; - - var btnLinkSpace = controlRect.width - floatControlWidth * 2; - var btnLinkMarginX = (btnLinkSpace - btnLinkWidth) / 2; - var btnLinkMarginY = (controlRect.height - btnLinkHeight) / 2; - - var rectLink = new Rect(controlRect.x + floatControlWidth + btnLinkMarginX, - controlRect.y + btnLinkMarginY, - btnLinkWidth, - btnLinkHeight); - using (var changes = new EditorGUI.ChangeCheckScope()) - { - isCornersLinked.boolValue = GUI.Toggle(rectLink, isCornersLinked.boolValue, labelBtnLink, styleBtnLink); - if (changes.changed && isCornersLinked.boolValue) - { - var newValue = cornerRadii.vector4Value.z; - cornerRadii.vector4Value = new Vector4(newValue, newValue, newValue, newValue); - } - } - - - using var labelWidthScope = new EditorCustom.LabelWidthScope(labelWidth); - - var rectFloatLabel = new Rect(0, 0, labelWidth, lineHeight); - var rectFloatField = new Rect(0, 0, floatControlWidth - labelWidth, lineHeight); - var gridH = new[] { - controlRect.x, - controlRect.x + labelWidth, - controlRect.xMax - floatControlWidth, - controlRect.xMax - labelWidth, - }; - var gridV = new[] { - controlRect.y, - controlRect.yMax - lineHeight, - }; - var rectLbTL = new Rect(rectFloatLabel) { x = gridH[0], y = gridV[0] }; - var rectTL = new Rect(rectFloatField) { x = gridH[1], y = gridV[0] }; - var rectTR = new Rect(rectFloatField) { x = gridH[2], y = gridV[0] }; - var rectLbTR = new Rect(rectFloatLabel) { x = gridH[3], y = gridV[0] }; - var rectLbBL = new Rect(rectFloatLabel) { x = gridH[0], y = gridV[1] }; - var rectBL = new Rect(rectFloatField) { x = gridH[1], y = gridV[1] }; - var rectBR = new Rect(rectFloatField) { x = gridH[2], y = gridV[1] }; - var rectLbBR = new Rect(rectFloatLabel) { x = gridH[3], y = gridV[1] }; - - using var changeCheck = new EditorGUI.ChangeCheckScope(); - var value = cornerRadii.vector4Value; - - var tl = Mathf.Max(0, EditorCustom.LabelFloatField(rectTL, rectLbTL, labelTL, value.z, styleCornerLabelTop)); - var tr = Mathf.Max(0, EditorCustom.LabelFloatField(rectTR, rectLbTR, labelTR, value.x, styleCornerLabelTop)); - var bl = Mathf.Max(0, EditorCustom.LabelFloatField(rectBL, rectLbBL, labelBL, value.w, styleCornerLabelBot)); - var br = Mathf.Max(0, EditorCustom.LabelFloatField(rectBR, rectLbBR, labelBR, value.y, styleCornerLabelBot)); - - if (changeCheck.changed) - { - var newRadii = new Vector4(tr, br, tl, bl); - - if (isCornersLinked.boolValue) - { - int changedIndex = 0; - for (int i = 1; i < 4; i++) - { - if (!Mathf.Approximately(newRadii[i], value[i])) - { - changedIndex = i; - break; - } - } - for (int i = 0; i < 4; i++) - { - newRadii[i] = newRadii[changedIndex]; - } - } - - cornerRadii.vector4Value = newRadii; - } - } - - public static void MaybeGetParaformLinkBtn() - { -#if !LETAI_PARAFORM - // DisabledGroupScope and co don't work here !? - var wasEnabled = GUI.enabled; - GUI.enabled = true; - if (EditorCustom.LinkButton("Get Paraform ↗", GUILayout.ExpandWidth(true))) - Application.OpenURL("https://leloctai.com/paraform/"); - GUI.enabled = wasEnabled; -#endif - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs.meta deleted file mode 100644 index ff9bd97fb..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 1dcd952c59f576d40829f67b617c661b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Editor/ParaformEditor.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime.meta deleted file mode 100644 index 399d0884f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a9f3ce8eaf55a4a468c9ab96d21add88 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs deleted file mode 100644 index f1c10d130..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; -[assembly:InternalsVisibleTo("LeTai.Paraform.Scaffold")] -[assembly:InternalsVisibleTo("LeTai.Paraform.Scaffold.Editor")] diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs.meta deleted file mode 100644 index 975a2f8e8..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 702ec2ed45e2f634aa9cd2e630fe307a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/AssemblyInfo.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef deleted file mode 100644 index f35b2ff4f..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "LeTai.Paraform.Scaffold", - "rootNamespace": "LeTai.Paraform.Scaffold", - "references": [ - "GUID:07cd4d3e8f0583542ab74e7b8b032f7e" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef.meta deleted file mode 100644 index b260ed8de..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: f063c9eabb2dec74ca53a0523cc14584 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/LeTai.Paraform.Scaffold.asmdef - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs deleted file mode 100644 index f76eaf5a9..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System; -using UnityEngine; -using UnityEngine.Serialization; - -namespace LeTai.Paraform.Scaffold -{ -[Serializable] -public struct ParaformConfig -{ - public static readonly ParaformConfig DEFAULT = new ParaformConfig { - cornerCurvature = 1.5f, - filletCurvature = 2.5f, - bevelWidth = 64, - ringThickness = 0, - elevation = 100, - cornerRadii = new Vector4(64, 64, 64, 64), - }; - - public event Action changed; - - -#if UNITY_EDITOR - [SerializeField] - internal bool isCornersLinked; -#endif - - [SerializeField] - [Tooltip("Indiviual corner radii. You can drag the rounded corner symbols to fine tune each radius. Click the link button to keep all corners the same.")] - internal Vector4 cornerRadii; - - public Vector4 CornerRadii - { - get => cornerRadii; - set - { - if (cornerRadii != value) - { - cornerRadii = value; - NotifyChanged(); - } - } - } - - [SerializeField] - [Range(0, 6)] - [Tooltip("0 is a flat diagonal corner. 1 is the perfect circle. Value > 1 increase curvature continuity target: 2 for G2 continuity, 3 for G3, and so on. Note that curvature continuity requires increased transition length, and is not guaranteed if the corner radius is too large compared to side length.")] - internal float cornerCurvature; - - public float CornerCurvature - { - get => cornerCurvature; - set - { - if (!Mathf.Approximately(cornerCurvature, value)) - { - cornerCurvature = value; - NotifyChanged(); - } - } - } - - [SerializeField] - [Range(0, 6)] - [Tooltip("0 is a flat diagonal corner. 1 is the perfect circle. Value > 1 increase curvature continuity target: 2 for G2 continuity, 3 for G3, and so on")] - internal float filletCurvature; - - public float FilletCurvature - { - get => filletCurvature; - set - { - if (!Mathf.Approximately(filletCurvature, value)) - { - filletCurvature = value; - NotifyChanged(); - } - } - } - - [FormerlySerializedAs("edgeWidth")] - [SerializeField] - [Min(0)] - [Tooltip("Bevel width or thickness")] - internal float bevelWidth; - - public float BevelWidth - { - get => bevelWidth; - set - { - if (!Mathf.Approximately(bevelWidth, value)) - { - bevelWidth = value; - NotifyChanged(); - } - } - } - - [SerializeField] - [Min(0)] - [Tooltip("Thickness of the ring shape. 0 to disable")] - internal float ringThickness; - - public float RingThickness - { - get => ringThickness; - set - { - if (!Mathf.Approximately(ringThickness, value)) - { - ringThickness = value; - NotifyChanged(); - } - } - } - - [SerializeField] - [Range(0, 1000)] - [Tooltip("Distance to the below surface, affecting refraction")] - internal float elevation; - - public float Elevation - { - get => elevation; - set - { - if (!Mathf.Approximately(elevation, value)) - { - elevation = value; - NotifyChanged(); - } - } - } - - public void NotifyChanged() - { - changed?.Invoke(); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs.meta deleted file mode 100644 index 6e6149f05..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 28e4120e4fcac5c4287818023a1bcae4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformConfig.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs deleted file mode 100644 index 1a5a97fd7..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using UnityEngine; - -namespace LeTai.Paraform.Scaffold -{ -public static class ParaformMaterial -{ - public static class ShaderID - { - public static readonly int G_CANVAS_SCALE_FACTOR = Shader.PropertyToID("_LeTai_CanvasScaleFactor"); - - public const string REFRACTION_MODE_OFF = "_REFRACTION_MODE_OFF"; - public const string REFRACTION_MODE_ON = "_REFRACTION_MODE_ON"; - public const string REFRACTION_MODE_CHROMATIC = "_REFRACTION_MODE_CHROMATIC"; - public static readonly int REFRACTIVE_INDEX_DUMMY = Shader.PropertyToID("_RefractiveIndex"); - public static readonly int CHROMATIC_DISPERSION_DUMMY = Shader.PropertyToID("_ChromaticDispersion"); - public static readonly int REFRACTIVE_INDEX_RATIOS = Shader.PropertyToID("_RefractiveIndexRatios"); - - public const string USE_EDGE_GLINT = "_USE_EDGE_GLINT"; - public static readonly int EDGE_GLINT_DIRECTIONS = Shader.PropertyToID("_EdgeGlintDirections"); - public static readonly int EDGE_GLINT1_STRENGTH = Shader.PropertyToID("_EdgeGlint1Strength"); - public static readonly int EDGE_GLINT2_STRENGTH = Shader.PropertyToID("_EdgeGlint2Strength"); - public static readonly int EDGE_GLINT_WRAP_RAW = Shader.PropertyToID("_EdgeGlintWrap"); - public static readonly int EDGE_GLINT_SHARPNESS_RAW = Shader.PropertyToID("_EdgeGlintSharpness"); - } - - const float NA_D_LINE_UM = 0.5893f; - const float HED_LINE_UM = 0.58756f; - const float F_LINE_UM = 0.48613f; - const float C_LINE_UM = 0.65627f; - - static readonly Vector3 PRIMARIES_UM = new(.630f, .532f, .467f); - - static readonly float REF_COEFF = InvSq(NA_D_LINE_UM); - static readonly Vector3 PRIMARIES_COEFF = new(InvSq(PRIMARIES_UM[0]), - InvSq(PRIMARIES_UM[1]), - InvSq(PRIMARIES_UM[2])); - static readonly float DISPERSION_FC = InvSq(F_LINE_UM) - InvSq(C_LINE_UM); - static readonly float DISPERSION_HED_NA_D = InvSq(HED_LINE_UM) - REF_COEFF; - - public static Vector3 GetRefractiveIndexRatios(float iorAtNaDLine, float abbeRcp) - { - iorAtNaDLine = Mathf.Max(1, iorAtNaDLine); - abbeRcp = Mathf.Max(0, abbeRcp); - - if (abbeRcp == 0) - return new Vector3(1f / iorAtNaDLine, - 1f / iorAtNaDLine, - 1f / iorAtNaDLine); - - float cauchyB = (iorAtNaDLine - 1f) * abbeRcp / (DISPERSION_FC - abbeRcp * DISPERSION_HED_NA_D); - float cauchyA = iorAtNaDLine - cauchyB * REF_COEFF; - - var iors = new Vector3(cauchyA + cauchyB * PRIMARIES_COEFF[0], - cauchyA + cauchyB * PRIMARIES_COEFF[1], - cauchyA + cauchyB * PRIMARIES_COEFF[2]); - return new Vector3(1f / iors[0], - 1f / iors[1], - 1f / iors[2]); - } - - static float InvSq(float x) - { - return 1f / (x * x); - } - - public static void SetDispersion(Material material, float dispersion) - { - var ior = material.GetFloat(ShaderID.REFRACTIVE_INDEX_DUMMY); - material.SetFloat(ShaderID.CHROMATIC_DISPERSION_DUMMY, dispersion); - material.SetVector(ShaderID.REFRACTIVE_INDEX_RATIOS, GetRefractiveIndexRatios(ior, dispersion)); - } - - public static void SetRefractiveIndex(Material material, float refractiveIndex) - { - var dispersion = material.GetFloat(ShaderID.CHROMATIC_DISPERSION_DUMMY); - material.SetFloat(ShaderID.REFRACTIVE_INDEX_DUMMY, refractiveIndex); - material.SetVector(ShaderID.REFRACTIVE_INDEX_RATIOS, GetRefractiveIndexRatios(refractiveIndex, dispersion)); - } - - public static void SetRefractiveIndexRatios(Material material, float refractiveIndex, float chromaticDispersion) - { - material.SetFloat(ShaderID.REFRACTIVE_INDEX_DUMMY, refractiveIndex); - material.SetFloat(ShaderID.CHROMATIC_DISPERSION_DUMMY, chromaticDispersion); - material.SetVector(ShaderID.REFRACTIVE_INDEX_RATIOS, GetRefractiveIndexRatios(refractiveIndex, - chromaticDispersion)); - } - - const float EDGE_GLINT_WRAP_SCALE = 20; - const float EDGE_GLINT_WRAP_POWER = .25f; - - public static float EdgeGlintWrapToRaw(float edgeGlintWrap) - { - return (1 - Mathf.Pow(edgeGlintWrap, EDGE_GLINT_WRAP_POWER)) * EDGE_GLINT_WRAP_SCALE + 1; - } - - public static float EdgeGlintWrapFromRaw(float edgeGlintWrapRaw) - { - return Mathf.Pow((EDGE_GLINT_WRAP_SCALE - edgeGlintWrapRaw + 1) / EDGE_GLINT_WRAP_SCALE, - 1f / EDGE_GLINT_WRAP_POWER); - } - - public static float GetEdgeGlintWrap(Material material) - { - return EdgeGlintSharpnessFromRaw(material.GetFloat(ShaderID.EDGE_GLINT_WRAP_RAW)); - } - - public static void SetEdgeGlintWrap(Material material, float edgeGlintWrap) - { - material.SetFloat(ShaderID.EDGE_GLINT_WRAP_RAW, EdgeGlintSharpnessToRaw(edgeGlintWrap)); - } - - public static float EdgeGlintSharpnessToRaw(float edgeGlintSharpness) - { - return 2 / Mathf.Pow(1 - edgeGlintSharpness, 4); - } - - public static float EdgeGlintSharpnessFromRaw(float edgeGlintSharpnessRaw) - { - return 1 - Mathf.Pow(2 / edgeGlintSharpnessRaw, 1f / 4f); - } - - public static float GetEdgeGlintSharpness(Material material) - { - return EdgeGlintSharpnessFromRaw(material.GetFloat(ShaderID.EDGE_GLINT_SHARPNESS_RAW)); - } - - public static void SetEdgeGlintSharpness(Material material, float edgeGlintSharpness) - { - material.SetFloat(ShaderID.EDGE_GLINT_SHARPNESS_RAW, EdgeGlintSharpnessToRaw(edgeGlintSharpness)); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs.meta deleted file mode 100644 index a6618cf01..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 75d4dcd6d5674cd2b1b57cfb76944ee7 -timeCreated: 1752476266 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/ParaformScaffold/Runtime/ParaformMaterial.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs deleted file mode 100644 index bbdcf5bcf..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (c) Le Loc Tai . All rights reserved. Do not redistribute. - -using System.Diagnostics; -using LeTai.Common; -using LeTai.Paraform; -using LeTai.Paraform.Scaffold; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public partial class TranslucentImage -{ - public ParaformConfig paraformConfig = ParaformConfig.DEFAULT; - - float etaCache = 1 / 1.5f; - float previousScale = 0; - - private static float GetMaxRefractionOffset(float minDistance, float eta) - { - float k = 1.0f - eta * eta; - float offset = Mathf.Sqrt(k) * minDistance / eta; - return offset; - } - - [Conditional("LETAI_PARAFORM")] - private void PadRectForRefraction(ref Rect rect) - { - var offset = GetMaxRefractionOffset(paraformConfig.Elevation, etaCache); - float padX; - float padY; - - var minExtent = Mathf.Min(rect.width, rect.height) / 2f; - var ringThickness = Mathf.Max(0, Mathf.Min(paraformConfig.RingThickness, minExtent)); - if (ringThickness == 0 || ringThickness > minExtent) - { - padX = Mathf.Max(0, offset - rect.width); - padY = Mathf.Max(0, offset - rect.height); - } - else - { - padX = Mathf.Max(0, offset - ringThickness); - padY = Mathf.Max(0, offset - ringThickness); - } - - rect.x -= padX / 2; - rect.y -= padY / 2; - rect.width += padX; - rect.height += padY; - } - - [Conditional("LETAI_PARAFORM")] - private void CacheEta() - { - var etas = material.GetVector(ShaderID.REFRACTIVE_INDEX_RATIOS); - etaCache = Mathf.Min(etas.x, Mathf.Min(etas.y, etas.z)); - } - - [Conditional("LETAI_PARAFORM")] - void SetParaformShaderGlobal() - { - if (!canvas) // trigger on undo - return; - - Shader.SetGlobalFloat(ShaderID.G_CANVAS_SCALE_FACTOR, canvas.scaleFactor); - } - - [Conditional("LETAI_PARAFORM")] - void LateUpdate() - { - var localScale = rectTransform.localScale; - // var scale = (localScale.x + localScale.y) / 2f; - var scale = Mathf.Max(localScale.x, localScale.y); - if (Mathf.Abs(scale - previousScale) > 1e-5f) - { - SetVerticesDirty(); - previousScale = scale; - } - } - - [Conditional("LETAI_PARAFORM")] - public static void CopyParaformMaterialPropertiesTo(Material src, Material dst) - { - MaterialUtils.CopyKeyword(src, dst, ShaderID.REFRACTION_MODE_OFF); - MaterialUtils.CopyKeyword(src, dst, ShaderID.REFRACTION_MODE_ON); - MaterialUtils.CopyKeyword(src, dst, ShaderID.REFRACTION_MODE_CHROMATIC); - MaterialUtils.CopyKeyword(src, dst, ShaderID.USE_EDGE_GLINT); - - MaterialUtils.CopyFloat(src, dst, ShaderID.REFRACTIVE_INDEX_DUMMY); - MaterialUtils.CopyFloat(src, dst, ShaderID.CHROMATIC_DISPERSION_DUMMY); - MaterialUtils.CopyVector(src, dst, ShaderID.REFRACTIVE_INDEX_RATIOS); - - MaterialUtils.CopyVector(src, dst, ShaderID.EDGE_GLINT_DIRECTIONS); - MaterialUtils.CopyFloat(src, dst, ShaderID.EDGE_GLINT1_STRENGTH); - MaterialUtils.CopyFloat(src, dst, ShaderID.EDGE_GLINT2_STRENGTH); - MaterialUtils.CopyFloat(src, dst, ShaderID.EDGE_GLINT_WRAP_RAW); - MaterialUtils.CopyFloat(src, dst, ShaderID.EDGE_GLINT_SHARPNESS_RAW); - } - -#if LETAI_PARAFORM - public override bool IsRaycastLocationValid(Vector2 screenPoint, Camera eventCamera) - { - if (!RectTransformUtilityPatch.ScreenPointToLocalPointInRectangle(rectTransform, screenPoint, eventCamera, out var local)) - return false; - - Rect rect = GetPixelAdjustedRect(); - - var padding = raycastPadding; - rect.xMin += padding.x; - rect.yMin += padding.y; - rect.xMax -= padding.z; - rect.yMax -= padding.w; - - if (!ParaformUtils.IsRaycastLocationValid(paraformConfig, rect, local)) - return false; - - return base.IsRaycastLocationValid(screenPoint, eventCamera); - } - - protected override void OnDidApplyAnimationProperties() - { - SetVerticesDirty(); - base.OnDidApplyAnimationProperties(); - } - - /// - /// Convenience wrapper for . - /// For better performance, use that instead and manage the material yourself. - /// - public void SetDispersionSlow(float dispersion) - { - ParaformMaterial.SetDispersion(materialForRendering, dispersion); - } - - /// - /// Convenience wrapper for . - /// For better performance, use that instead and manage the material yourself. - /// - public void SetRefractiveIndexSlow(float refractiveIndex) - { - ParaformMaterial.SetRefractiveIndex(materialForRendering, refractiveIndex); - } - - /// - /// Convenience wrapper for . - /// For better performance, use that instead and manage the material yourself. - /// - public void SetRefractiveIndexRatiosSlow(float refractiveIndex, float chromaticDispersion) - { - ParaformMaterial.SetRefractiveIndexRatios(materialForRendering, refractiveIndex, chromaticDispersion); - } - - /// - /// Convenience wrapper for . - /// For better performance, use that instead and manage the material yourself. - /// - public void SetEdgeGlintWrap(float edgeGlintWrapNormalized) - { - ParaformMaterial.SetEdgeGlintWrap(materialForRendering, edgeGlintWrapNormalized); - } - - /// - /// Convenience wrapper for . - /// For better performance, use that instead and manage the material yourself. - /// - public void SetEdgeGlintSharpness(float edgeGlintSharpnessNormalized) - { - ParaformMaterial.SetEdgeGlintSharpness(materialForRendering, edgeGlintSharpnessNormalized); - } -#endif -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs.meta deleted file mode 100644 index 030a9ee86..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a3f6c5b69ce547e193b21d1ef62b0a7c -timeCreated: 1752477664 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.Paraform.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs deleted file mode 100644 index e2526ece2..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs +++ /dev/null @@ -1,32 +0,0 @@ -#if LETAI_TRUESHADOW - -using System; -using LeTai.TrueShadow.PluginInterfaces; - -namespace LeTai.Asset.TranslucentImage -{ -public partial class TranslucentImage : ITrueShadowCustomHashProviderV2 -{ - public event Action trueShadowCustomHashChanged; - - partial void UpdateTrueShadowHash() - { - trueShadowCustomHashChanged?.Invoke( - HashUtils.CombineHashCodes( - paraformConfig.CornerRadii.GetHashCode(), - (int)(paraformConfig.CornerCurvature * 100), - (int)(paraformConfig.RingThickness * 100) - ) - ); - } -} -} -#endif - -namespace LeTai.Asset.TranslucentImage -{ -public partial class TranslucentImage -{ - partial void UpdateTrueShadowHash(); -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs.meta deleted file mode 100644 index 087a4b24b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 11c1c8c5084246f884409330a477c153 -timeCreated: 1688045792 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.TrueShadow.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs deleted file mode 100644 index a6358d421..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs +++ /dev/null @@ -1,419 +0,0 @@ -using System; -using System.Diagnostics.CodeAnalysis; -using LeTai.Common; -using UnityEngine; -using UnityEngine.Pool; -using UnityEngine.Rendering; -using UnityEngine.Serialization; -using UnityEngine.UI; - -namespace LeTai.Asset.TranslucentImage -{ -/// -/// Dynamic blur-behind UI element -/// -[HelpURL("https://leloctai.com/asset/translucentimage/docs/articles/customize.html#translucent-image")] -[SuppressMessage("ReSharper", "InconsistentNaming")] -public partial class TranslucentImage : Image, IActiveRegionProvider, IMeshModifier -{ - /// - /// Source of the blurred background for this image - /// - public TranslucentImageSource source - { - get => _source; - set - { - _source = value; - - // We need a separated variable, as the backing field is set before the setter is called from EditorProperty - if (_source == _sourcePrev) - return; - - DisconnectSource(_sourcePrev); - ConnectSource(_source); - _sourcePrev = source; - } - } - - [Obsolete("Use foregroundOpacity instead")] - public float spriteBlending - { - get => foregroundOpacity; - set => foregroundOpacity = value; - } - - /// - /// How much Sprite and Color contribute to the Image. Use this instead of Color.alpha - /// - public float foregroundOpacity - { - get => _foregroundOpacity; - set - { - _foregroundOpacity = value; - SetVerticesDirty(); - } - } - - /// - /// (De)Saturate the image, 1 is normal, 0 is grey scale, below zero make the image negative - /// - public float vibrancy - { - get => _vibrancy; - set - { - _vibrancy = value; - SetVerticesDirty(); - } - } - - /// - /// In Normal Background Mode: Brighten/darken the background. In Colorful Background Mode: Set the background overall brightness. - /// - public float brightness - { - get => _brightness; - set - { - _brightness = value; - SetVerticesDirty(); - } - } - - /// - /// Flatten the color behind to maintain color contrast on varying backgrounds - /// - public float flatten - { - get => _flatten; - set - { - _flatten = value; - SetVerticesDirty(); - } - } - - public override Material material - { - get => base.material; - set - { - base.material = value; - OnDirtyMaterial(); - } - } - - public override Material defaultMaterial - { - get - { -#if LETAI_PARAFORM - return DefaultResources.Instance.paraformMaterial; -#else - return DefaultResources.Instance.material; -#endif - } - } - - [FormerlySerializedAs("source")] - [Tooltip("Source of the blurred background for this image")] - [SerializeField] TranslucentImageSource _source; - - [FormerlySerializedAs("spriteBlending")] - [FormerlySerializedAs("m_spriteBlending")] - [Tooltip("How much Sprite and Color contribute to the Image. Use this instead of Color.alpha")] - [SerializeField] [Range(0, 1)] float _foregroundOpacity = .5f; - [FormerlySerializedAs("vibrancy")] - [Tooltip("(De)Saturate the image, 1 is normal, 0 is grey scale, below zero make the image negative")] - [SerializeField] [Range(-1, 2)] float _vibrancy = 1; - [FormerlySerializedAs("brightness")] - [Tooltip("In Normal Background Mode: Brighten/darken the background. In Colorful Background Mode: Set the background overall brightness.")] - [SerializeField] [Range(-1, 1)] float _brightness = 0; - [FormerlySerializedAs("flatten")] - [Tooltip("Flatten the color behind to maintain color contrast on varying backgrounds")] - [SerializeField] [Range(0, 1)] float _flatten = 0; - - bool shouldRun; - bool isBirp; - TranslucentImageSource _sourcePrev; - - protected override void Start() - { - isBirp = !GraphicsSettings.currentRenderPipeline; - - AutoAcquireSource(); - - if (material && source) - { - material.SetTexture(ShaderID.BLUR_TEX, source.BlurredScreen); - } - - m_OnDirtyMaterialCallback += OnDirtyMaterial; - if (canvas) - canvas.additionalShaderChannels |= AdditionalCanvasShaderChannels.TexCoord1 - | AdditionalCanvasShaderChannels.TexCoord2 - | AdditionalCanvasShaderChannels.TexCoord3; - } - - protected override void OnEnable() - { - base.OnEnable(); - SetVerticesDirty(); - - ConnectSource(source); - _sourcePrev = source; - - paraformConfig.changed += ParaformConfigChanged; - Canvas.willRenderCanvases += OnWillRenderCanvases; - -#if UNITY_EDITOR - if (!UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode) - { - Start(); - } - - UnityEditor.Undo.undoRedoPerformed += OnUndoRedoPerformed; -#endif - } - - void ParaformConfigChanged() - { - SetVerticesDirty(); - UpdateTrueShadowHash(); - } - - protected override void OnDisable() - { - SetVerticesDirty(); - base.OnDisable(); - - paraformConfig.changed -= ParaformConfigChanged; - Canvas.willRenderCanvases -= OnWillRenderCanvases; - - DisconnectSource(source); -#if UNITY_EDITOR - UnityEditor.Undo.undoRedoPerformed -= OnUndoRedoPerformed; -#endif - } - - void OnWillRenderCanvases() - { - SetParaformShaderGlobal(); - } - -// void Update() -// { -// #if DEBUG -// if (Application.isPlaying && !IsInPrefabMode()) -// { -// if (!source) -// Debug.LogWarning("TranslucentImageSource is missing. " + -// "Please add the TranslucentImageSource component to your main camera, " + -// "then assign it to the Source field of the Translucent Image(s)"); -// } -// #endif -// } - - public bool HaveActiveRegion() - { - return (bool)this && IsActive() && canvas && canvas.enabled; - } - - public void GetActiveRegion(VPMatrixCache vpMatrixCache, out ActiveRegion activeRegion) - { - VPMatrixCache.Index vpMatrixIndex; - if (canvas.renderMode == RenderMode.ScreenSpaceOverlay) - { - vpMatrixIndex = VPMatrixCache.Index.INVALID; - } - else - { - var refCamera = canvas.worldCamera; - if (!refCamera) - { - if (Application.isPlaying) - { - Debug.LogError("Translucent Image need an Event Camera for World Space Canvas"); - } - vpMatrixIndex = VPMatrixCache.Index.INVALID; - } - else - { - vpMatrixIndex = vpMatrixCache.IndexOf(refCamera); - if (!vpMatrixIndex.IsValid()) - vpMatrixIndex = vpMatrixCache.Add(refCamera); - } - } - - var rect = rectTransform.rect; - PadRectForRefraction(ref rect); - - activeRegion = new ActiveRegion(rect, - rectTransform.localToWorldMatrix, - vpMatrixIndex); - } - - /// - /// Copy material keywords state and properties, except stencil properties - /// - public static void CopyMaterialPropertiesTo(Material src, Material dst) - { - MaterialUtils.CopyKeyword(src, dst, ShaderID.KW_BACKGROUND_MODE_COLORFUL); - MaterialUtils.CopyKeyword(src, dst, ShaderID.KW_BACKGROUND_MODE_NORMAL); - MaterialUtils.CopyKeyword(src, dst, ShaderID.KW_BACKGROUND_MODE_OPAQUE); - - CopyParaformMaterialPropertiesTo(src, dst); - } - - void ConnectSource(TranslucentImageSource source) - { - if (!source) return; - - source.RegisterActiveRegionProvider(this); - source.blurredScreenChanged += SetBlurTex; - source.blurRegionChanged += SetBlurRegion; - SetBlurTex(); - SetBlurRegion(); - } - - void DisconnectSource(TranslucentImageSource source) - { - if (!source) return; - - source.UnRegisterActiveRegionProvider(this); - source.blurredScreenChanged -= SetBlurTex; - source.blurRegionChanged -= SetBlurRegion; - } - - void SetBlurTex() - { - if (!source) - return; - - materialForRendering.SetTexture(ShaderID.BLUR_TEX, source.BlurredScreen); - } - - void SetBlurRegion() - { - if ( - !source - || !canvas - || !canvas.enabled - ) - return; - - if (isBirp || canvas.renderMode == RenderMode.ScreenSpaceOverlay) - { - var minMaxVector = RectUtils.ToMinMaxVector(source.BlurRegionNormalizedScreenSpace); - materialForRendering.SetVector(ShaderID.CROP_REGION, minMaxVector); - } - else - { - materialForRendering.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(source.BlurRegion)); - } - } - - void OnDirtyMaterial() - { - SetBlurTex(); - SetBlurRegion(); - - CacheEta(); - } - - bool IsInPrefabMode() - { -#if !UNITY_EDITOR - return false; -#else - var stage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage(); - return stage != null; -#endif - } - - bool sourceAcquiredOnStart = false; - - void AutoAcquireSource() - { - if (IsInPrefabMode()) return; - if (sourceAcquiredOnStart) return; - - source = source ? source : Shims.FindObjectOfType(); - sourceAcquiredOnStart = true; - } - - void OnUndoRedoPerformed() - { - source = _source; - OnDirtyMaterial(); - UpdateTrueShadowHash(); - } - - void WriteVertexData(ref SpanWriter writer) - { - writer.Write(Packing.FloatPacker.Uniform(8) - .Enqueue(foregroundOpacity, 1) - .Enqueue(flatten, 1) - ); - writer.Write(Packing.FloatPacker.Uniform(10) - .Enqueue(vibrancy, -1, 2) - .Enqueue(brightness, -1, 1) - ); - } - - public virtual void ModifyMesh(VertexHelper vh) - { - ListPool.Get(out var vertices); - vh.GetUIVertexStream(vertices); - - Span data = stackalloc float[4]; - var writer = SpanUtils.WriterFor(data); - -#if LETAI_PARAFORM - Span dataParaform = stackalloc float[4 * 2]; - var writerParaformCommon = SpanUtils.WriterFor(dataParaform[..^2]); - var writerParaformVertex = SpanUtils.WriterFor(dataParaform[^2..]); - var paraformEncoder = new Paraform.ParaformVertexDataEncoder(rectTransform, paraformConfig); -#endif - - WriteVertexData(ref writer); - // writer.FillRest(); - var uv1 = SpanUtils.ToVector4(data); - -#if LETAI_PARAFORM - paraformEncoder.WriteCommon(ref writerParaformCommon); - var uv2 = SpanUtils.ToVector4(dataParaform[..4]); -#endif - - for (var i = 0; i < vertices.Count; i++) - { - UIVertex vert = vertices[i]; - - vert.uv1 = uv1; - -#if LETAI_PARAFORM - vert.uv2 = uv2; - paraformEncoder.WritePerVertex(ref writerParaformVertex, vert.position); - vert.uv3 = SpanUtils.ToVector4(dataParaform[4..8]); - writerParaformVertex.Reset(); -#endif - - vertices[i] = vert; - } - - vh.Clear(); - vh.AddUIVertexTriangleStream(vertices); - // ParaformVertexDataEncoder.ModifyMesh(this, paraformConfig, vh); - } - - public virtual void ModifyMesh(Mesh mesh) - { - using var vh = new VertexHelper(mesh); - - ModifyMesh(vh); - vh.FillMesh(mesh); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs.meta deleted file mode 100644 index e538e719a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 196bb08d6c2d3c9499c04e1281fd4ad3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 0764cd30e065b7340891d9f7f680a12f, type: 3} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/TranslucentImage.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs deleted file mode 100644 index 5e687b6a0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs +++ /dev/null @@ -1,26 +0,0 @@ -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -[ExecuteAlways] -[AddComponentMenu("UI/Translucent Image", 2)] -public partial class TranslucentImage -{ - protected override void Reset() - { - base.Reset(); - color = Color.white; - source = source ? source : Shims.FindObjectOfType(); - } - - protected override void OnValidate() - { - base.OnValidate(); - - SetVerticesDirty(); - } -} -} -#endif diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs.meta deleted file mode 100644 index 5232fa0ed..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 828a3ac0ed3540dbb2883fb9b58158a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/TranslucentImageEditorEnhancement.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs deleted file mode 100644 index 4ae6f2756..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs +++ /dev/null @@ -1,633 +0,0 @@ -using System; -using System.Collections.Generic; -using Unity.Collections; -using Unity.Jobs; -using Unity.Profiling; -using UnityEngine; -using UnityEngine.Rendering; -#if ENABLE_VR -using UnityEngine.XR; -#endif - -namespace LeTai.Asset.TranslucentImage -{ -/// -/// Common source of blur for Translucent Images. -/// -[ExecuteAlways] -[RequireComponent(typeof(Camera))] -[AddComponentMenu("Image Effects/Tai Le Assets/Translucent Image Source")] -[HelpURL("https://leloctai.com/asset/translucentimage/docs/articles/customize.html#translucent-image-source")] -public partial class TranslucentImageSource : MonoBehaviour -{ -#region Private Field - [SerializeField] - BlurConfig blurConfig; - - [SerializeField] [Range(0, 3)] - [Tooltip("Reduce the size of the screen before processing. Increase will improve performance but create more artifact")] - int downsample; - - [SerializeField] - [Tooltip("Choose which part of the screen to blur. Smaller region is faster")] - Rect blurRegion = new Rect(0, 0, 1, 1); - - [SerializeField] - [Tooltip("How many time to blur per second. Reduce to increase performance and save battery for slow moving background")] - float maxUpdateRate = float.PositiveInfinity; - - [SerializeField] - [Tooltip("Expand the blurred area to avoid gap around moving UIs when using a low Max Update Rate." + - "\nUse higher value for lower Max Update Rate or faster UI movement. Use 0 for infinite Update Rate or static UIs." + - "\nFor the best culling effectiveness, set this at runtime while UIs are moving, and reset to 0 while they're static." + - "\nUnit: fraction of the screen's shorter side")] - [Range(0, 1)] - float cullPadding = 0; - - [SerializeField] - [Tooltip("Preview the effect fullscreen. Not recommended for runtime use")] - bool preview; - - [SerializeField] - [Tooltip("Fill the background where the frame buffer alpha is 0. Useful for VR Underlay and Passthrough, where these areas would otherwise be black")] - BackgroundFill backgroundFill = new BackgroundFill(); - - [SerializeField] - [Tooltip("Always blur the entire blur region to reduce cpu usage")] - bool skipCulling; - - int lastDownsample; - Rect lastBlurRegion = new Rect(0, 0, 1, 1); - Rect lastCamPixelRect = new Rect(0, 0, 1, 1); - Vector2Int lastCamPixelSize = Vector2Int.zero; - float lastUpdate; - - IBlurAlgorithm blurAlgorithm; - -#pragma warning disable 0108 - Camera camera; -#pragma warning restore 0108 - Material previewMaterial; - RenderTexture blurredScreen; - CommandBuffer cmd; -#pragma warning disable CS0169 - bool isForOverlayCanvas; -#pragma warning restore CS0169 - - bool needRegisterCanvasPreRenderCallback; - - readonly List activeRegionProviders = new List(); - VPMatrixCache vpMatrixCache; - NativeList activeRegions; - NativeArray activeRegionJobResult; - JobHandle findBoundsJobHandle; - - static readonly Rect FULLSCREEN_REGION = new Rect(0, 0, 1, 1); - - static ProfilerMarker profilerMarkerCull = new ProfilerMarker(nameof(TranslucentImageSource) + ".Culling"); -#endregion - - -#region Properties - public BlurConfig BlurConfig - { - get { return blurConfig; } - set - { - blurConfig = value; - InitializeBlurAlgorithm(); - } - } - - /// - /// The rendered image will be shrinked by a factor of 2^{{Downsample}} before bluring to reduce processing time - /// - /// - /// Must be non-negative. Default to 0 - /// - public int Downsample - { - get { return downsample; } - set { downsample = Mathf.Max(0, value); } - } - - /// - /// Define the rectangular area on screen that will be blurred. - /// - /// - /// Between 0 and 1 - /// - public Rect BlurRegion - { - get { return blurRegion; } - set - { - Vector2 min = new Vector2(1 / (float)Cam.pixelWidth, 1 / (float)Cam.pixelHeight); - blurRegion = value; - blurRegion.xMin = Mathf.Clamp(blurRegion.x, 0, 1 - min.x); - blurRegion.yMin = Mathf.Clamp(blurRegion.y, 0, 1 - min.y); - blurRegion.width = Mathf.Clamp(blurRegion.width, min.x, 1 - blurRegion.x); - blurRegion.height = Mathf.Clamp(blurRegion.height, min.y, 1 - blurRegion.y); - - OnBlurRegionChanged(); - } - } - - public Rect ActiveRegion { get; private set; } - - /// - /// Maximum number of times to update the blurred image each second - /// - public float MaxUpdateRate - { - get => maxUpdateRate; - set => maxUpdateRate = Mathf.Max(0, value); - } - - /// - /// Expand the blurred area to avoid gap around moving UIs when using a low Max Update Rate. - /// Use higher value for lower Max Update Rate or faster UI movement. Use 0 for infinite Update Rate or static UIs. - /// For the best culling effectiveness, set this at runtime while UIs are moving, and reset to 0 while they're static. - /// Unit: fraction of the screen's shorter side. - /// - public float CullPadding - { - get => cullPadding; - set => cullPadding = Mathf.Max(0, value); - } - - /// - /// Fill the background where the frame buffer alpha is 0. Useful for VR Underlay and Passthrough, where these areas would otherwise be black - /// - public BackgroundFill BackgroundFill - { - get => backgroundFill; - set => backgroundFill = value; - } - - /// - /// Render the blurred result to the render target - /// - public bool Preview - { - get => preview; - set => preview = value; - } - - /// - /// Always blur the entire blur region to reduce cpu usage - /// - public bool SkipCulling - { - get => skipCulling; - set => skipCulling = value; - } - - /// - /// Result of the image effect. Translucent Image use this as their content (read-only) - /// - public RenderTexture BlurredScreen - { - get { return blurredScreen; } - set { blurredScreen = value; } - } - - /// - /// Set in SRP to provide Cam.rect for overlay cameras - /// - public Rect CamRectOverride { get; set; } = Rect.zero; - - /// - /// Blur Region rect is relative to Cam.rect . This is relative to the full screen - /// - public Rect BlurRegionNormalizedScreenSpace - { - get => ViewportToScreen01Space(BlurRegion); - set => BlurRegion = Screen01ToViewportSpace(value); - } - - /// - /// The Camera attached to the same GameObject. Cached in field 'camera' - /// - internal Camera Cam - { - get { return camera ? camera : camera = GetComponent(); } - } - - /// - /// Minimum time in second to wait before refresh the blurred image. - /// If maxUpdateRate non-positive then just stop updating - /// - float MinUpdateCycle - { - get { return (MaxUpdateRate > 0) ? (1f / MaxUpdateRate) : float.PositiveInfinity; } - } - - bool ShouldCull - { - get - { - return !SkipCulling -#if ENABLE_VR - && !XRSettings.enabled -#endif - ; - } - } -#endregion - - public event Action blurredScreenChanged; - public event Action blurRegionChanged; - - public void OnBlurRegionChanged() - { - blurRegionChanged?.Invoke(); - } - - public void RegisterActiveRegionProvider(IActiveRegionProvider provider) - { - activeRegionProviders.Add(provider); - } - - public void UnRegisterActiveRegionProvider(IActiveRegionProvider provider) - { - activeRegionProviders.Remove(provider); - } - - void OnEnable() - { -#if UNITY_EDITOR - if (!UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode) - { - Init(); - } -#endif - - vpMatrixCache = new VPMatrixCache(); - activeRegions = new NativeList(4, Allocator.Persistent); - activeRegionJobResult = new NativeArray(1, Allocator.Persistent); - - needRegisterCanvasPreRenderCallback = true; - } - - void OnDisable() - { - needRegisterCanvasPreRenderCallback = false; - // Must unregister callback before collections disposal! - Canvas.willRenderCanvases -= OnWillRenderCanvases; - - CompleteCull(); - - vpMatrixCache.Dispose(); - activeRegions.Dispose(); - activeRegionJobResult.Dispose(); - } - - protected virtual void Start() - { - Init(); - } - -#if UNITY_EDITOR - /// - /// Attempt to filter out scene view calls. Not sure if this is robust enough - /// - bool isFirstOnWillRenderCanvas = false; -#endif - - void Update() - { - // Register this earlier would cause it to be called before the builtin Layout Groups - if (needRegisterCanvasPreRenderCallback) - { - Canvas.willRenderCanvases += OnWillRenderCanvases; - - needRegisterCanvasPreRenderCallback = false; - } -#if UNITY_EDITOR - isFirstOnWillRenderCanvas = true; -#endif - } - - void OnDestroy() - { - if (BlurredScreen) - BlurredScreen.Release(); - } - - private void OnRenderImage(RenderTexture source, RenderTexture destination) - { - if (cmd == null) - { - cmd = new CommandBuffer(); - cmd.name = "Translucent Image Source"; - } - - if (blurAlgorithm != null && BlurConfig != null) - { - if (ShouldUpdateBlur()) - { - cmd.Clear(); - - if (CompleteCull()) - { - ReallocateBlurTexIfNeeded(Cam.pixelRect); - blurAlgorithm.Init(BlurConfig, true); - var blurExecData = new BlurExecutor.BlurExecutionData(source, - this, - blurAlgorithm); - BlurExecutor.ExecuteBlurWithTempTextures(cmd, ref blurExecData); - - Graphics.ExecuteCommandBuffer(cmd); - } - } - - // Using custom Blit for this lead to warning: OnRenderImage() possibly didn't write anything to the destination texture - if (Preview) - { - previewMaterial.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(BlurRegion)); - Graphics.Blit(BlurredScreen, destination, previewMaterial); - } - else - { - Graphics.Blit(source, destination); - } - } - else - { - Graphics.Blit(source, destination); - } - } - - - void Init() - { - previewMaterial = new Material(Shader.Find("Hidden/FillCrop")); - - InitializeBlurAlgorithm(); - ReallocateBlurTexIfNeeded(Cam.pixelRect); - - lastDownsample = Downsample; - } - - void InitializeBlurAlgorithm() - { - switch (blurConfig) - { - case ScalableBlurConfig _: - blurAlgorithm = new ScalableBlur(); - break; - default: - blurAlgorithm = new ScalableBlur(); - break; - } - } - - void OnWillRenderCanvases() - { -#if UNITY_EDITOR - if (!isFirstOnWillRenderCanvas) - return; - isFirstOnWillRenderCanvas = false; -#endif - StartCull(); - } - - void StartCull() - { - profilerMarkerCull.Begin(); - - findBoundsJobHandle.Complete(); // No way to cancel job - vpMatrixCache.Clear(); - activeRegions.Clear(); - - bool haveAnyActiveRegion = false; - - for (var i = 0; i < activeRegionProviders.Count; i++) - { - var provider = activeRegionProviders[i]; - if (!provider.HaveActiveRegion()) - continue; - - haveAnyActiveRegion = true; - if (!ShouldCull) - break; - - provider.GetActiveRegion(vpMatrixCache, out var activeRegion); - activeRegions.Add(activeRegion); - } - - if (haveAnyActiveRegion) - { - if (ShouldCull) - { - findBoundsJobHandle = new ActiveRegionMergeJob { - vpMatrices = vpMatrixCache.VpMatrices, - activeRegions = activeRegions, - screenSize = new Vector2(Screen.width, Screen.height), - viewport = GetActiveCameraRect(), - merged = activeRegionJobResult - }.Schedule(); - } - else - { - activeRegionJobResult[0] = ActiveRegion = FULLSCREEN_REGION; - } - } - else - { - // If not haveAnyActiveRegion, should skip blurring in XR, so use SkipCulling instead of ShouldCull - activeRegionJobResult[0] = ActiveRegion = SkipCulling ? FULLSCREEN_REGION : Rect.zero; - } - - profilerMarkerCull.End(); - } - - /// - /// Merge active regions into one - /// - /// False if the merged region is empty - public bool CompleteCull() - { - if (!ShouldCull) - return true; - - profilerMarkerCull.Begin(); - - findBoundsJobHandle.Complete(); - ActiveRegion = activeRegionJobResult[0]; - - const float minSize = 1e-5f; - if (MaxUpdateRate < float.PositiveInfinity - && ActiveRegion.width > minSize - && ActiveRegion.height > minSize) - { - var padding = new Vector2(CullPadding, CullPadding); - var aspect = Screen.width / (float)Screen.height; - if (aspect > 1) - { - padding.x /= aspect; - } - else - { - padding.y *= aspect; - } - ActiveRegion = RectUtils.Expand(ActiveRegion, padding); - } - - profilerMarkerCull.End(); - - return ActiveRegion.width > minSize && ActiveRegion.height > minSize; - } - - void CreateNewBlurredScreen(Vector2Int camPixelSize) - { - if (BlurredScreen) - BlurredScreen.Release(); - -#if ENABLE_VR - if (XRSettings.enabled) - { - BlurredScreen = new RenderTexture(XRSettings.eyeTextureDesc); - BlurredScreen.width = Mathf.RoundToInt(BlurredScreen.width * BlurRegion.width) >> Downsample; - BlurredScreen.height = Mathf.RoundToInt(BlurredScreen.height * BlurRegion.height) >> Downsample; - BlurredScreen.depth = 0; - } - else -#endif - { - BlurredScreen = new RenderTexture(Mathf.RoundToInt(camPixelSize.x * BlurRegion.width) >> Downsample, - Mathf.RoundToInt(camPixelSize.y * BlurRegion.height) >> Downsample, 0); - } - - BlurredScreen.antiAliasing = 1; - BlurredScreen.name = $"{gameObject.name} Translucent Image Source"; - BlurredScreen.filterMode = FilterMode.Bilinear; - BlurredScreen.useMipMap = false; - BlurredScreen.autoGenerateMips = false; - -#if LETAI_PARAFORM - // TODO: Make this configurable - // Why do mipmaps cause edge artifact? May need to re-enable edge dimming if use mips - // Can this be optimized? - // BlurredScreen.useMipMap = true; - // BlurredScreen.autoGenerateMips = true; - // BlurredScreen.filterMode = FilterMode.Trilinear; -#endif - - -#if UNITY_EDITOR - // Avoid error logging when dragging related fields in the inspector - if (BlurredScreen.width > 0 && BlurredScreen.height > 0) -#endif - BlurredScreen.Create(); - - blurredScreenChanged?.Invoke(); - } - - TextureDimension lastEyeTexDim; - - public void ReallocateBlurTexIfNeeded(Rect camPixelRect) - { - if (camPixelRect != lastCamPixelRect) - { - blurRegionChanged?.Invoke(); - lastCamPixelRect = camPixelRect; - } - - var camPixelSize = Vector2Int.RoundToInt(camPixelRect.size); - if ( - BlurredScreen == null - || !BlurredScreen.IsCreated() - || Downsample != lastDownsample - || !RectUtils.ApproximateEqual01(BlurRegion, lastBlurRegion) - || camPixelSize != lastCamPixelSize -#if ENABLE_VR - || XRSettings.deviceEyeTextureDimension != lastEyeTexDim -#endif - ) - { - CreateNewBlurredScreen(camPixelSize); - lastDownsample = Downsample; - lastBlurRegion = BlurRegion; - lastCamPixelSize = camPixelSize; -#if ENABLE_VR - lastEyeTexDim = XRSettings.deviceEyeTextureDimension; -#endif - } - - - lastUpdate = GetTrueCurrentTime(); - } - - public bool ShouldUpdateBlur() - { - if (!enabled) - return false; - - if (Preview) - return true; - - float now = GetTrueCurrentTime(); - bool should = now - lastUpdate >= MinUpdateCycle; - - return should; - } - - private static float GetTrueCurrentTime() - { -#if UNITY_EDITOR - return (float)UnityEditor.EditorApplication.timeSinceStartup; -#else - return Time.unscaledTime; -#endif - } - - Rect GetActiveCameraRect() - { - var camRect = CamRectOverride.width == 0 ? Cam.rect : CamRectOverride; - camRect.min = Vector2.Max(Vector2.zero, camRect.min); - camRect.max = Vector2.Min(Vector2.one, camRect.max); - return camRect; - } - - Rect ViewportToScreen01Space(Rect rect) - { - var camRect = GetActiveCameraRect(); - - return new Rect(camRect.position + rect.position * camRect.size, - rect.size * camRect.size); - } - - Rect Screen01ToViewportSpace(Rect rect) - { - var camRect = GetActiveCameraRect(); - - return new Rect((rect.position - camRect.position) / camRect.size, - rect.size / camRect.size); - } - -#if UNITY_EDITOR - - protected virtual void OnGUI() - { - if (!Preview) return; - - var curBlurRegionNSS = BlurRegionNormalizedScreenSpace; - var newBlurRegionNSS = ResizableScreenRect.Draw(curBlurRegionNSS, true); - - GUI.color = Color.green; - ResizableScreenRect.Draw(RectUtils.Intersect(curBlurRegionNSS, ViewportToScreen01Space(ActiveRegion))); - - if (newBlurRegionNSS != curBlurRegionNSS) - { - UnityEditor.Undo.RecordObject(this, "Change Blur Region"); - BlurRegionNormalizedScreenSpace = newBlurRegionNSS; - } - - if (!UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode) - UnityEditor.EditorApplication.QueuePlayerLoopUpdate(); - } -#endif -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs.meta deleted file mode 100644 index dab31f090..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 4ee01e66702087b4798e633ca34c7956 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 4bc9a290ca74e434499699e3db41c3f9, type: 3} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/TranslucentImageSource.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP.meta deleted file mode 100644 index e27bbb38b..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5fa3650b00009764888b5f90e8ec5241 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor.meta deleted file mode 100644 index d22be6b2d..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bba7ceb326d957d49bbc675bdf0856c0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef deleted file mode 100644 index 0882e4502..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "LeTai.TranslucentImage.UniversalRP.Editor", - "references": [ - "GUID:e646286fd75dc0f44bb2f84ffb34408d", - "GUID:15fc0a57446b3144c949da3e2b9737a9" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs deleted file mode 100644 index 3fbeea7b0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Linq; -using System.Reflection; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -namespace LeTai.Asset.TranslucentImage.UniversalRP.Editor -{ -[InitializeOnLoad] -public class RendererFeatureChecker : EditorWindow -{ - static RendererFeatureChecker() - { - EditorApplication.update += DoCheck; - } - - static void DoCheck() - { - EditorApplication.update -= DoCheck; - - var pipelineAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset; - if (pipelineAsset == null) - return; - - var rendererData = (ScriptableRendererData) - typeof(UniversalRenderPipelineAsset) - .GetProperty("scriptableRendererData", BindingFlags.Instance | BindingFlags.NonPublic) - ?.GetValue(pipelineAsset); - - if (rendererData == null) - return; - - var haveFeature = rendererData.rendererFeatures.OfType().Any(); - - if (haveFeature) - return; - - const float width = 400f; - const float height = 200f; - var window = GetWindowWithRect( - new Rect( - (Screen.width - width) / 2f, - (Screen.height - height) / 2f, - width, height - ), - true, - "Translucent Image", - true - ); - - window.rendererData = rendererData; - } - - ScriptableRendererData rendererData; - - void OnGUI() - { - GUILayout.Label("Missing Renderer Feature", EditorStyles.largeLabel); - - EditorGUILayout.Space(); - - GUILayout.Label( - "Translucent Image needs a renderer feature added to the active Renderer Asset. Do you want to add it now?", - EditorStyles.wordWrappedLabel - ); - - if (GUILayout.Button("More info", EditorStyles.linkLabel)) - Application.OpenURL("https://leloctai.com/asset/translucentimage/docs/articles/universalrp.html"); - - GUILayout.FlexibleSpace(); - - if (GUILayout.Button("Select Current Renderer Asset")) - { - EditorGUIUtility.PingObject(rendererData); - Selection.activeObject = rendererData; - Close(); - } - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs.meta deleted file mode 100644 index f606557a0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/RendererFeatureChecker.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6d7c06f482aa58a4ea6d2e6f18f373b3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs deleted file mode 100644 index 531566f67..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Text.RegularExpressions; -using UnityEditor; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage.UniversalRP.Editor -{ -[CustomEditor(typeof(TranslucentImageBlurSource))] -public class TranslucentImageBlurSourceEditor : UnityEditor.Editor -{ - public override void OnInspectorGUI() - { - base.OnInspectorGUI(); - - var feature = (TranslucentImageBlurSource)target; - if (feature.rendererType == RendererType.Renderer2D) - { - var ver = Version.Parse(Regex.Replace(Application.unityVersion, @"[^\d.]", ".")); - if ( - ver >= new Version(2023, 1, 7) || - (ver.Major == 2022 && ver >= new Version(2022, 3, 7)) - ) - EditorGUILayout.HelpBox("The 2D Renderer is sometimes buggy with custom renderer features at the moment.\n\n" + - "If you're encountering problems, check if the built-in \"Full Screen Pass Renderer Feature\" is functioning correctly in the same setup. If it does not, Translucent Image is unlikely to be able to work either.\n\n" + - "Also, make sure you're on the latest Unity patch release for your minor version", MessageType.Warning, true); - else - EditorGUILayout.HelpBox("This version of the 2D Renderer includes a bug that prevents Translucent Image from working correctly in many cases. (UUM-14400)", MessageType.Error, true); - } - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs.meta deleted file mode 100644 index d923a55f6..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/TranslucentImageBlurSourceEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6df7a801a41d7224f9848526015f4dd5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef deleted file mode 100644 index 89946a889..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "LeTai.TranslucentImage.UniversalRP", - "rootNamespace": "", - "references": [ - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:ff218ee40fe2b8648ab3234d56415557" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [ - { - "name": "Unity", - "expression": "[2021.3,2021.3.13)", - "define": "UNITY_BUGGED_HAS_PASSES_AFTER_POSTPROCESS" - } - ], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass.meta deleted file mode 100644 index a567949fe..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 59db9d0cfd142494ab067fbfbb1f1b6a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs deleted file mode 100644 index c8ddbdf04..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs +++ /dev/null @@ -1,187 +0,0 @@ -#if UNITY_2022_3_OR_NEWER -#define HAS_DOUBLEBUFFER_BOTH -#endif - -#if UNITY_2023_3_OR_NEWER -#define HAS_RENDERGRAPH -#endif - -// ReSharper disable once RedundantUsingDirective -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Scripting.APIUpdating; - -namespace LeTai.Asset.TranslucentImage.UniversalRP -{ -enum RendererType -{ - Universal, - Renderer2D -} - -[MovedFrom("LeTai.Asset.TranslucentImage.LWRP")] -public partial class TranslucentImageBlurRenderPass : ScriptableRenderPass -{ - internal struct PassData - { - public IReadOnlyList blurSources; - public IBlurAlgorithm blurAlgorithm; - public Rect camPixelRect; - public uint shouldUpdateBlurMask; - public int previewIndex; - public Material previewMaterial; - } - - internal struct SRPassData - { -#if !HAS_DOUBLEBUFFER_BOTH - public RendererType rendererType; - public RenderTargetIdentifier cameraColorTarget; - public TranslucentImageBlurSource.RenderOrder renderOrder; -#endif - public bool canvasDisappearWorkaround; - } - - public readonly struct PreviewExecutionData - { - public readonly TranslucentImageSource blurSource; - public readonly RenderTargetIdentifier previewTarget; - public readonly Material previewMaterial; - - public PreviewExecutionData( - TranslucentImageSource blurSource, - RenderTargetIdentifier previewTarget, - Material previewMaterial - ) - { - this.blurSource = blurSource; - this.previewTarget = previewTarget; - this.previewMaterial = previewMaterial; - } - } - - private const string PROFILER_TAG = "Translucent Image Source"; - - readonly URPRendererInternal urpRendererInternal; - - PassData currentPassData; - SRPassData currentSRPassData; - - internal TranslucentImageBlurRenderPass(URPRendererInternal urpRendererInternal) - { - this.urpRendererInternal = urpRendererInternal; - - RenderGraphInit(); -#if UNITY_6000_0_OR_NEWER - requiresIntermediateTexture = true; -#endif - } - -#if !HAS_DOUBLEBUFFER_BOTH - RenderTargetIdentifier GetAfterPostColor() - { - return urpRendererInternal.GetAfterPostColor(); - } -#endif - - internal void SetupSRP(SRPassData srPassData) - { - currentSRPassData = srPassData; - } - - public void Dispose() - { - RenderGraphDispose(); - } - - internal void Setup(PassData passData) - { - currentPassData = passData; - -#if !UNITY_6000_0_OR_NEWER - // Doesn't seem necessary after pretty comprehensive testing. - // Leaving it out avoids significant cost. Keeping it here in case any problem arises. - // ConfigureInput(ScriptableRenderPassInput.Color); -#endif - } - -#if HAS_RENDERGRAPH - [Obsolete("This rendering path is for compatibility mode only (when Render Graph is disabled). Use Render Graph API instead.", false)] -#endif - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - var cmd = CommandBufferPool.Get(PROFILER_TAG); - RenderTargetIdentifier sourceTex; - -#if !HAS_DOUBLEBUFFER_BOTH - var isPostProcessEnabled = renderingData.cameraData.postProcessEnabled; - void SetSource2DRenderer() - { - bool useAfterPostTex = isPostProcessEnabled; - useAfterPostTex &= currentSRPassData.renderOrder == TranslucentImageBlurSource.RenderOrder.AfterPostProcessing; - sourceTex = useAfterPostTex - ? GetAfterPostColor() - : currentSRPassData.cameraColorTarget; - } -#endif - -#if HAS_DOUBLEBUFFER_BOTH - sourceTex = urpRendererInternal.GetBackBuffer(); -#else - if (currentSRPassData.rendererType == RendererType.Universal) - { - sourceTex = urpRendererInternal.GetBackBuffer(); - } - else - { - SetSource2DRenderer(); - } -#endif - - bool shouldResetTarget = currentSRPassData.canvasDisappearWorkaround && renderingData.cameraData.resolveFinalTarget; - - var blurSources = currentPassData.blurSources; - for (var i = 0; i < blurSources.Count; i++) - { - var blurSource = blurSources[i]; - - if ((currentPassData.shouldUpdateBlurMask & (1 << i)) == 0) - continue; - - blurSource.ReallocateBlurTexIfNeeded(currentPassData.camPixelRect); - currentPassData.blurAlgorithm.Init(blurSource.BlurConfig, false); - var blurExecData = new BlurExecutor.BlurExecutionData(sourceTex, - blurSource, - currentPassData.blurAlgorithm); - BlurExecutor.ExecuteBlurWithTempTextures(cmd, ref blurExecData); - - if (shouldResetTarget) - CoreUtils.SetRenderTarget(cmd, BuiltinRenderTextureType.CameraTarget); - } - - - if (currentPassData.previewIndex != -1) - { - var previewTarget = shouldResetTarget ? BuiltinRenderTextureType.CameraTarget : sourceTex; - var previewExecData = new PreviewExecutionData(blurSources[currentPassData.previewIndex], - previewTarget, - currentPassData.previewMaterial); - ExecutePreview(cmd, ref previewExecData); - } - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public static void ExecutePreview(CommandBuffer cmd, ref PreviewExecutionData data) - { - var blurSource = data.blurSource; - - data.previewMaterial.SetVector(ShaderID.CROP_REGION, RectUtils.ToMinMaxVector(blurSource.BlurRegion)); - Blitter.Blit(cmd, blurSource.BlurredScreen, data.previewTarget, data.previewMaterial, 0); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs.meta deleted file mode 100644 index df34f8889..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPass.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 05ed55b26a77f1b4aa7fc2236c80b9e8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 4bc9a290ca74e434499699e3db41c3f9, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs deleted file mode 100644 index 902f0f4f0..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs +++ /dev/null @@ -1,173 +0,0 @@ -#if UNITY_2023_3_OR_NEWER -#define HAS_RENDERGRAPH -#endif - -#if HAS_RENDERGRAPH -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.RenderGraphModule; -using UnityEngine.Rendering.Universal; -#endif - -namespace LeTai.Asset.TranslucentImage.UniversalRP -{ -public partial class TranslucentImageBlurRenderPass -{ -#if HAS_RENDERGRAPH - class BlurRGPassData - { - public TextureHandle sourceTex; - public TextureHandle[] scratches; - public TranslucentImageSource blurSource; - public IBlurAlgorithm blurAlgorithm; - public int scratchesCount; - } - - class PreviewRGPassData - { - public TranslucentImageSource blurSource; - public TextureHandle previewTarget; - public Material previewMaterial; - } - - readonly Dictionary blurredScreenHdlDict = new(); - - List scratchesList; - string[] scratchNames; - - void RenderGraphInit() - { - scratchesList = new List(2); - AddScratchList(); - scratchNames = new string[14]; - for (var i = 0; i < scratchNames.Length; i++) - { - scratchNames[i] = $"TI_intermediate_rt_{i}"; - } - } - - void AddScratchList() - { - scratchesList.Add(new TextureHandle[14]); - } - - void RenderGraphDispose() - { - foreach (var (_, hdl) in blurredScreenHdlDict) - { - hdl?.Release(); - } - } - - public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) - { - var blurSources = currentPassData.blurSources; - var blurAlgorithm = currentPassData.blurAlgorithm; - - for (var i = 0; i < blurSources.Count; i++) - { - var blurSource = blurSources[i]; - if (!blurSource - || !blurSource.BlurConfig) - continue; - if ((currentPassData.shouldUpdateBlurMask & (1 << i)) == 0) - continue; - - blurSource.ReallocateBlurTexIfNeeded(currentPassData.camPixelRect); - - var blurredScreen = blurSource.BlurredScreen; - blurredScreenHdlDict.TryGetValue(blurredScreen, out var blurredScreenHdl); - if (blurredScreenHdl == null || blurredScreenHdl.rt != blurredScreen) - { - blurredScreenHdl?.Release(); - blurredScreenHdl = RTHandles.Alloc(blurredScreen); - - blurredScreenHdlDict[blurredScreen] = blurredScreenHdl; - } - - // ReSharper disable once ConvertToUsingDeclaration - using (var builder = renderGraph.AddUnsafePass(PROFILER_TAG, out var data)) - { - blurAlgorithm.Init(blurSource.BlurConfig, false); - - var desc = blurSource.BlurredScreen.descriptor; - var cropRegionSize = blurSource.BlurRegion.size; - var scratchesCount = blurAlgorithm.GetScratchesCount(desc.width / cropRegionSize.x, - desc.height / cropRegionSize.y); - - var resourceData = frameData.Get(); - data.sourceTex = resourceData.activeColorTexture; - if (scratchesList.Count <= i) - AddScratchList(); - data.scratches = scratchesList[i]; - data.blurSource = blurSource; - data.blurAlgorithm = blurAlgorithm; - data.scratchesCount = scratchesCount; - - builder.UseTexture(data.sourceTex, AccessFlags.Read); - - - for (int j = 0; j < scratchesCount; j++) - { - blurAlgorithm.GetNextScratchDescriptor(ref desc); - data.scratches[j] = UniversalRenderer.CreateRenderGraphTexture(renderGraph, - desc, - scratchNames[j] + "--" + i, - false, - FilterMode.Bilinear, - TextureWrapMode.Clamp); - builder.UseTexture(data.scratches[j], AccessFlags.ReadWrite); - } - - var blurredScreenTHdl = renderGraph.ImportTexture(blurredScreenHdl); - builder.UseTexture(blurredScreenTHdl, AccessFlags.Write); - - builder.SetRenderFunc(static (BlurRGPassData data, UnsafeGraphContext context) => - { - data.blurAlgorithm.Init(data.blurSource.BlurConfig, true); - for (int j = 0; j < data.scratchesCount; j++) - data.blurAlgorithm.SetScratch(j, data.scratches[j]); - - var blurExecData = new BlurExecutor.BlurExecutionData( - data.sourceTex, - data.blurSource, - data.blurAlgorithm - ); - BlurExecutor.ExecuteBlur(CommandBufferHelpers.GetNativeCommandBuffer(context.cmd), ref blurExecData); - }); - } - } - - if (currentPassData.previewIndex != -1) - { - // ReSharper disable once ConvertToUsingDeclaration - using (var builder = renderGraph.AddUnsafePass(PROFILER_TAG, out var data)) - { - var resourceData = frameData.Get(); - data.blurSource = blurSources[currentPassData.previewIndex]; - data.previewMaterial = currentPassData.previewMaterial; - data.previewTarget = resourceData.activeColorTexture; - - builder.UseTexture(data.previewTarget, AccessFlags.Write); - - builder.SetRenderFunc(static (PreviewRGPassData data, UnsafeGraphContext context) => - { - var previewExecData = new PreviewExecutionData( - data.blurSource, - data.previewTarget, - data.previewMaterial - ); - ExecutePreview(CommandBufferHelpers.GetNativeCommandBuffer(context.cmd), ref previewExecData); - }); - } - } - } - -#else - void RenderGraphInit() { } - void RenderGraphDispose() { } - -#endif -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs.meta deleted file mode 100644 index cb7f96a0a..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurRenderPassRenderGraph.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9c44d0c2822b4034b31007221f773f14 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs deleted file mode 100644 index 72e699dad..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs +++ /dev/null @@ -1,361 +0,0 @@ -#if !UNITY_2023_3_OR_NEWER -#define BUGGY_OVERLAY_CAM_PIXEL_RECT -#endif - -#if UNITY_2022_3_OR_NEWER -#define HAS_DOUBLEBUFFER_BOTH -#endif - -#if UNITY_2022_1_OR_NEWER -#define HAS_RTHANDLE -#define HAS_SETUP_OVERRIDE -#endif - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEngine.Scripting.APIUpdating; -using Debug = UnityEngine.Debug; - - -#if HAS_RTHANDLE -using RTH = UnityEngine.Rendering.RTHandle; -#else -using RTH = UnityEngine.Rendering.Universal.RenderTargetHandle; -#endif - - -[assembly: InternalsVisibleTo("LeTai.TranslucentImage.UniversalRP.Editor")] - -namespace LeTai.Asset.TranslucentImage.UniversalRP -{ -class URPRendererInternal -{ - ScriptableRenderer renderer; - Func getBackBufferDelegate; - Func getAfterPostColorDelegate; - - - public void CacheRenderer(ScriptableRenderer renderer) - { - if (this.renderer == renderer) return; - - this.renderer = renderer; - - void CacheBackBufferGetter(object rd) - { -#if UNITY_2022_1_OR_NEWER - const string backBufferMethodName = "PeekBackBuffer"; -#else - const string backBufferMethodName = "GetBackBuffer"; -#endif - - // ReSharper disable once PossibleNullReferenceException - var cbs = rd.GetType() - .GetField("m_ColorBufferSystem", BindingFlags.NonPublic | BindingFlags.Instance) - .GetValue(rd); - var gbb = cbs.GetType() - .GetMethods(BindingFlags.Public | BindingFlags.Instance) - .First(m => m.Name == backBufferMethodName && m.GetParameters().Length == 0); - - getBackBufferDelegate = (Func)gbb.CreateDelegate(typeof(Func), cbs); - } - -#if HAS_DOUBLEBUFFER_BOTH - CacheBackBufferGetter(renderer); -#else - if (renderer is UniversalRenderer ur) - { - CacheBackBufferGetter(ur); - } - else - { - // ReSharper disable once PossibleNullReferenceException - getAfterPostColorDelegate = - (Func)renderer.GetType() - .GetProperty("afterPostProcessColorHandle", BindingFlags.NonPublic | BindingFlags.Instance) - .GetGetMethod(true) - .CreateDelegate(typeof(Func), renderer); - } -#endif - } - - public RenderTargetIdentifier GetBackBuffer() - { - Debug.Assert(getBackBufferDelegate != null); - - var r = getBackBufferDelegate.Invoke(); -#if HAS_RTHANDLE - return r.nameID; -#else - return r.Identifier(); -#endif - } - - public RenderTargetIdentifier GetAfterPostColor() - { - Debug.Assert(getAfterPostColorDelegate != null); - - var r = getAfterPostColorDelegate.Invoke(); -#if HAS_RTHANDLE - return r.nameID; -#else - return r.Identifier(); -#endif - } -} - -[MovedFrom("LeTai.Asset.TranslucentImage.LWRP")] -public class TranslucentImageBlurSource : ScriptableRendererFeature -{ - public enum RenderOrder - { - AfterPostProcessing, - BeforePostProcessing, - } - - public RenderOrder renderOrder = RenderOrder.AfterPostProcessing; - - public bool canvasDisappearWorkaround = false; - - internal RendererType rendererType; - - readonly Dictionary> blurSourceCache = new(); - readonly Dictionary baseCameraCache = new(); - - URPRendererInternal urpRendererInternal; - TranslucentImageBlurRenderPass pass; - IBlurAlgorithm blurAlgorithm; - Material previewMaterial; - - Material PreviewMaterial - { - get - { - if (!previewMaterial) - previewMaterial = CoreUtils.CreateEngineMaterial("Hidden/FillCrop_UniversalRP"); - - return previewMaterial; - } - } - - /// - /// When adding new Translucent Image Source to existing Camera at run time, the new Source must be registered here - /// - public void RegisterSource(Camera camera, TranslucentImageSource source) - { - if (!blurSourceCache.TryGetValue(camera, out var srcList)) - { - srcList = new List(); - blurSourceCache.Add(camera, srcList); - } - srcList.Add(source); - } - - - public override void Create() - { - blurAlgorithm = new ScalableBlur(); - urpRendererInternal = new URPRendererInternal(); - - var renderPassEvent = renderOrder == RenderOrder.BeforePostProcessing - ? RenderPassEvent.BeforeRenderingPostProcessing - : RenderPassEvent.AfterRenderingPostProcessing; - pass = new TranslucentImageBlurRenderPass(urpRendererInternal) { - renderPassEvent = renderPassEvent - }; - - blurSourceCache.Clear(); - } - - protected override void Dispose(bool disposing) - { - pass?.Dispose(); - CoreUtils.Destroy(previewMaterial); - } - - void SetupSRP(ScriptableRenderer renderer) - { - urpRendererInternal.CacheRenderer(renderer); - - if (renderer is UniversalRenderer) - rendererType = RendererType.Universal; - else - rendererType = RendererType.Renderer2D; - - - pass.SetupSRP(new TranslucentImageBlurRenderPass.SRPassData { -#if !HAS_DOUBLEBUFFER_BOTH - rendererType = rendererType, -#if HAS_RTHANDLE - cameraColorTarget = renderer.cameraColorTargetHandle, -#else - cameraColorTarget = renderer.cameraColorTarget, -#endif - renderOrder = renderOrder, -#endif // !HAS_DOUBLEBUFFER_BOTH - canvasDisappearWorkaround = canvasDisappearWorkaround, - }); - } - -#if HAS_SETUP_OVERRIDE - public override void SetupRenderPasses(ScriptableRenderer renderer, in RenderingData renderingData) - { - var cameraData = renderingData.cameraData; - var sourceList = GetBlurSources(cameraData.camera); - - if (sourceList.Count == 0) - return; - - SetupSRP(renderer); - } -#endif - - public override void AddRenderPasses( - ScriptableRenderer renderer, - ref RenderingData renderingData - ) - { - var cameraData = renderingData.cameraData; - - if (cameraData.cameraType != CameraType.Game) - return; - - var camera = renderingData.cameraData.camera; - var blurSources = GetBlurSources(camera); - - if (blurSources.Count == 0) - return; - - if (blurSources.Count > 32) - Debug.LogWarning("Only 32 Translucent Image Sources is supported per camera"); - - bool needAddPass = false; - uint shouldUpdateBlurMask = 0; - int previewIndex = -1; - - - for (int i = 0; i < blurSources.Count; i++) - { - if (!blurSources[i]) - continue; - if (!blurSources[i].BlurConfig) - continue; - - blurSources[i].CamRectOverride = Rect.zero; - - var shouldUpdate = blurSources[i].ShouldUpdateBlur(); - - if (shouldUpdate) - shouldUpdate = blurSources[i].CompleteCull(); - - if (shouldUpdate) - shouldUpdateBlurMask |= 1u << i; - - var needPreview = blurSources[i].Preview; - if (needPreview) - previewIndex = i; - - needAddPass |= shouldUpdate || needPreview; - } - - if (!needAddPass) - return; - -#if BUGGY_OVERLAY_CAM_PIXEL_RECT - if (cameraData.renderType == CameraRenderType.Overlay) - { - var baseCam = GetBaseCamera(camera); - if (baseCam) - { - foreach (var source in blurSources) source.CamRectOverride = baseCam.rect; - } - } -#endif - -#if UNITY_BUGGED_HAS_PASSES_AFTER_POSTPROCESS - bool applyFinalPostProcessing = renderingData.postProcessingEnabled - && cameraData.resolveFinalTarget - && cameraData.antialiasing == AntialiasingMode.FastApproximateAntialiasing; - pass.renderPassEvent = applyFinalPostProcessing ? RenderPassEvent.AfterRenderingPostProcessing : RenderPassEvent.AfterRendering; -#endif - - if (renderer is not UniversalRenderer) - pass.ConfigureInput(ScriptableRenderPassInput.Color); - - pass.Setup(new TranslucentImageBlurRenderPass.PassData { - blurAlgorithm = blurAlgorithm, - blurSources = blurSources, - camPixelRect = GetPixelRect(cameraData), - shouldUpdateBlurMask = shouldUpdateBlurMask, - previewIndex = previewIndex, - previewMaterial = PreviewMaterial - }); - -#if !HAS_SETUP_OVERRIDE - SetupSRP(renderer); -#endif - - renderer.EnqueuePass(pass); - } - - IReadOnlyList GetBlurSources(Camera camera) - { - if (!blurSourceCache.TryGetValue(camera, out var srcList)) - { - srcList = new List(); - srcList.AddRange(camera.GetComponents()); - blurSourceCache.Add(camera, srcList); - } - - return srcList; - } - -#if BUGGY_OVERLAY_CAM_PIXEL_RECT - Camera GetBaseCamera(Camera camera) - { - if (!baseCameraCache.ContainsKey(camera)) - { - Camera baseCamera = null; - - foreach (var uacd in Shims.FindObjectsOfType()) - { - if (uacd.renderType != CameraRenderType.Base) continue; - if (uacd.cameraStack == null) continue; - if (!uacd.cameraStack.Contains(camera)) continue; - - baseCamera = uacd.GetComponent(); - } - - baseCameraCache.Add(camera, baseCamera); - } - - return baseCameraCache[camera]; - } - - readonly FieldInfo cameraDataPixelRectField = typeof(CameraData).GetField("pixelRect", BindingFlags.Instance | BindingFlags.NonPublic); -#endif - - public Rect GetPixelRect(CameraData cameraData) - { -#if !BUGGY_OVERLAY_CAM_PIXEL_RECT - return cameraData.camera.pixelRect; -#else - if (cameraData.renderType == CameraRenderType.Base) - return cameraData.camera.pixelRect; - - if (cameraDataPixelRectField == null) - Debug.LogError("CameraData.pixelRect does not exists in this version of URP. Please report a bug."); - - // ReSharper disable once PossibleNullReferenceException - return (Rect)cameraDataPixelRectField.GetValue(cameraData); -#endif - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs.meta deleted file mode 100644 index 3e10796e8..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Render Pass/TranslucentImageBlurSource.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8e1eeeaa7fba944fb8e39c0af65b268 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 4bc9a290ca74e434499699e3db41c3f9, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities.meta deleted file mode 100644 index 8d70dca02..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e922b2483fd9e164ebbd098b4e9f7822 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs deleted file mode 100644 index 0f9b98acd..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Rendering; - -namespace LeTai.Asset.TranslucentImage -{ -public static class Blitter -{ - static Mesh fullscreenTriangle; - - /// - /// A fullscreen triangle mesh. - /// - static Mesh FullscreenTriangle - { - get - { - if (fullscreenTriangle != null) - return fullscreenTriangle; - - fullscreenTriangle = new Mesh { name = "Fullscreen Triangle" }; - fullscreenTriangle.SetVertices( - new List { - new Vector3(-1f, -1f, 0f), - new Vector3(-1f, 3f, 0f), - new Vector3(3f, -1f, 0f) - } - ); - fullscreenTriangle.SetIndices(new[] { 0, 1, 2 }, MeshTopology.Triangles, 0, false); - fullscreenTriangle.UploadMeshData(false); - - return fullscreenTriangle; - } - } - - public static void Blit( - CommandBuffer cmd, - RenderTargetIdentifier source, - RenderTargetIdentifier destination, - Material material, - int passIndex, - MaterialPropertyBlock propertyBlock = null, - Rect viewport = default - ) - { - cmd.SetGlobalTexture(ShaderID.MAIN_TEX, source); - cmd.SetRenderTarget(new RenderTargetIdentifier(destination, 0, CubemapFace.Unknown, -1), - RenderBufferLoadAction.DontCare, - RenderBufferStoreAction.Store, - RenderBufferLoadAction.DontCare, - RenderBufferStoreAction.DontCare); - if (viewport.width != 0) - cmd.SetViewport(viewport); - - if (SystemInfo.graphicsShaderLevel >= 30 -#if !UNITY_2023_1_OR_NEWER - && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES2 -#endif - ) - cmd.DrawProcedural(Matrix4x4.identity, material, passIndex, MeshTopology.Triangles, 3, 1, propertyBlock); - else - cmd.DrawMesh(FullscreenTriangle, Matrix4x4.identity, material, 0, passIndex, propertyBlock); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs.meta deleted file mode 100644 index 740b59a62..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 263b05d298234228b5e7ccfae5ac0b69 -timeCreated: 1730191817 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/Blitter.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs deleted file mode 100644 index 89ef501eb..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs +++ /dev/null @@ -1,73 +0,0 @@ -using UnityEngine; -using UnityEngine.Rendering; - -namespace LeTai.Asset.TranslucentImage -{ -public static class BlurExecutor -{ - static readonly int[] TEMP_RT = new int[14]; - - static BlurExecutor() - { - for (var i = 0; i < TEMP_RT.Length; i++) - { - TEMP_RT[i] = Shader.PropertyToID($"TI_intermediate_rt_{i}"); - } - } - - public readonly struct BlurExecutionData - { - public readonly RenderTargetIdentifier sourceTex; - public readonly TranslucentImageSource blurSource; - public readonly IBlurAlgorithm blurAlgorithm; - - public BlurExecutionData( - RenderTargetIdentifier sourceTex, - TranslucentImageSource blurSource, - IBlurAlgorithm blurAlgorithm - ) - { - this.sourceTex = sourceTex; - this.blurSource = blurSource; - this.blurAlgorithm = blurAlgorithm; - } - } - - public static void ExecuteBlurWithTempTextures(CommandBuffer cmd, ref BlurExecutionData data) - { - var desc = data.blurSource.BlurredScreen.descriptor; - desc.msaaSamples = 1; - desc.useMipMap = false; - desc.depthBufferBits = 0; - - var cropRegionSize = data.blurSource.BlurRegion.size; - var scratchesCount = data.blurAlgorithm.GetScratchesCount(desc.width / cropRegionSize.x, - desc.height / cropRegionSize.y); - for (int i = 0; i < scratchesCount; i++) - { - data.blurAlgorithm.GetNextScratchDescriptor(ref desc); - cmd.GetTemporaryRT(TEMP_RT[i], desc, FilterMode.Bilinear); - data.blurAlgorithm.SetScratch(i, TEMP_RT[i]); - } - - { - ExecuteBlur(cmd, ref data); - } - - for (int i = 0; i < scratchesCount; i++) - cmd.ReleaseTemporaryRT(TEMP_RT[i]); - } - - public static void ExecuteBlur(CommandBuffer cmd, ref BlurExecutionData data) - { - var blurSource = data.blurSource; - - data.blurAlgorithm.Blur(cmd, - data.sourceTex, - blurSource.BlurRegion, - blurSource.ActiveRegion, - blurSource.BackgroundFill, - blurSource.BlurredScreen); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs.meta deleted file mode 100644 index d6236e822..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 8fff8a033240e1c4491e2587b6d285e9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/BlurExecutor.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs deleted file mode 100644 index 1f1d0c994..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs +++ /dev/null @@ -1,75 +0,0 @@ -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public static class RectUtils -{ - /// - /// Fast approximate equal for rect position and size in range [0,1] - /// - internal static bool ApproximateEqual01(Rect a, Rect b) - { - return QuickApproximate01(a.x, b.x) - && QuickApproximate01(a.y, b.y) - && QuickApproximate01(a.width, b.width) - && QuickApproximate01(a.height, b.height); - } - - - private static bool QuickApproximate01(float a, float b) - { - const float epsilon01 = 5.9604644e-8f; // different between 1 and largest float < 1 - return Mathf.Abs(b - a) < epsilon01; - } - - public static Rect Intersect(Rect a, Rect b) - { - float xMin = Mathf.Max(a.xMin, b.xMin); - float xMax = Mathf.Min(a.xMax, b.xMax); - float yMin = Mathf.Max(a.yMin, b.yMin); - float yMax = Mathf.Min(a.yMax, b.yMax); - - if (xMin < xMax && yMin < yMax) - { - return new Rect(xMin, yMin, xMax - xMin, yMax - yMin); - } - - return Rect.zero; - } - - public static Rect Crop(Rect src, Rect cropRegion) - { - var rect = src; - rect.x += cropRegion.x * rect.width; - rect.y += cropRegion.y * rect.height; - rect.width *= cropRegion.width; - rect.height *= cropRegion.height; - - return rect; - } - - public static Vector4 ToMinMaxVector(Rect rect) - { - return new Vector4(rect.xMin, - rect.yMin, - rect.xMax, - rect.yMax); - } - - public static Vector4 ToVector4(Rect rect) - { - return new Vector4(rect.xMin, - rect.yMin, - rect.width, - rect.height); - } - - public static Rect Expand(Rect rect, Vector2 padding) - { - return new Rect(rect.x - padding.x, - rect.y - padding.y, - rect.width + 2 * padding.x, - rect.height + 2 * padding.y); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs.meta deleted file mode 100644 index 33bbda593..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 29b4a2967894477c93934b7e21ce2d5b -timeCreated: 1558521365 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/RectUtils.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs deleted file mode 100644 index c46b38474..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs +++ /dev/null @@ -1,179 +0,0 @@ -// Due to the use of asmdef in the ../Editor folder, this class cannot be put there, -// as then it cannot be referenced outside of the assembly -// The Blur region GUI requires the use of OnGUI for interactivity, -// so it cannot be completely done within the custom Editor either - -#if UNITY_EDITOR -using UnityEditor; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public static class ResizableScreenRect -{ - const float BORDER_THICKNESS = 2; - const float DRAG_EXTEND = 16; - - delegate void DragHandlerDelegate(Vector2 delta, ref Rect rect); - - static DragHandlerDelegate currentDragHandler; - - static void DrawSquareFromCenter(Vector2 postion, float extent) - { - var v = Vector2.one * extent; - GUI.DrawTexture(new Rect(postion - v, v * 2), Texture2D.whiteTexture); - } - - public static Rect Draw(Rect normalizedScreenRect, bool interactable = false) - { - var guiRect = normalizedScreenRect; - guiRect.y = 1 - guiRect.y - guiRect.height; - guiRect.x *= Screen.width; - guiRect.width *= Screen.width; - guiRect.y *= Screen.height; - guiRect.height *= Screen.height; - - var borderThickness = BORDER_THICKNESS * EditorGUIUtility.pixelsPerPoint; - GUI.DrawTexture(new Rect(guiRect.x - borderThickness, - guiRect.y - borderThickness, - borderThickness, - guiRect.height + borderThickness * 2), - Texture2D.whiteTexture); - GUI.DrawTexture(new Rect(guiRect.x, - guiRect.y - borderThickness, - guiRect.width + 1, - borderThickness), - Texture2D.whiteTexture); - GUI.DrawTexture(new Rect(guiRect.xMax, - guiRect.y - borderThickness, - borderThickness, - guiRect.height + borderThickness * 2), - Texture2D.whiteTexture); - GUI.DrawTexture(new Rect(guiRect.x, - guiRect.yMax, - guiRect.width + 1, - borderThickness), - Texture2D.whiteTexture); - if (interactable) - { - var boxExtend = borderThickness * 2; - DrawSquareFromCenter(guiRect.min, boxExtend); - DrawSquareFromCenter(guiRect.max, boxExtend); - DrawSquareFromCenter(new Vector2(guiRect.xMax, guiRect.yMin), boxExtend); - DrawSquareFromCenter(new Vector2(guiRect.xMin, guiRect.yMax), boxExtend); - } - - if (interactable) - guiRect = HandleEvent(guiRect); - - - var result = guiRect; - - result.x /= Screen.width; - result.y /= Screen.height; - result.width /= Screen.width; - result.height /= Screen.height; - result.y = 1 - result.y - result.height; - - result.xMin = Mathf.Max(0, result.xMin); - result.yMin = Mathf.Max(0, result.yMin); - result.width = Mathf.Min(1, result.width); - result.height = Mathf.Min(1, result.height); - - return result; - } - - static Rect HandleEvent(Rect guiRect) - { - var ev = Event.current; - if (ev.type == EventType.MouseDown && ev.button == 0) - { - currentDragHandler = ChooseDragHandler(guiRect, ev.mousePosition); - } - else if (ev.type == EventType.MouseUp) - { - currentDragHandler = null; - } - else if (ev.type == EventType.MouseDrag) - { - currentDragHandler?.Invoke(ev.delta, ref guiRect); - } - - return guiRect; - } - - static DragHandlerDelegate ChooseDragHandler(Rect rect, Vector2 pointer) - { - float extend = DRAG_EXTEND * EditorGUIUtility.pixelsPerPoint; - - bool PointerXNear(float point) => Mathf.Abs(point - pointer.x) <= extend; - bool PointerYNear(float point) => Mathf.Abs(point - pointer.y) <= extend; - - if (PointerXNear(rect.xMin)) - { - if (PointerYNear(rect.yMin)) return DRAG_HANDLER_TOP_LEFT; - if (PointerYNear(rect.yMax)) return DRAG_HANDLER_BOTTOM_LEFT; - return DRAG_HANDLER_LEFT; - } - - if (PointerXNear(rect.xMax)) - { - if (PointerYNear(rect.yMin)) return DRAG_HANDLER_TOP_RIGHT; - if (PointerYNear(rect.yMax)) return DRAG_HANDLER_BOTTOM_RIGHT; - return DRAG_HANDLER_RIGHT; - } - - if (PointerYNear(rect.yMin)) return DRAG_HANDLER_TOP; - if (PointerYNear(rect.yMax)) return DRAG_HANDLER_BOTTOM; - - if (!rect.Contains(pointer)) - return null; - - return DRAG_HANDLER_CENTER; - } - - static readonly DragHandlerDelegate DRAG_HANDLER_CENTER = - (Vector2 delta, ref Rect rect) => { rect.position += delta; }; - - static readonly DragHandlerDelegate DRAG_HANDLER_LEFT = - (Vector2 delta, ref Rect rect) => { rect.xMin += delta.x; }; - - static readonly DragHandlerDelegate DRAG_HANDLER_TOP = - (Vector2 delta, ref Rect rect) => { rect.yMin += delta.y; }; - - static readonly DragHandlerDelegate DRAG_HANDLER_BOTTOM = - (Vector2 delta, ref Rect rect) => { rect.yMax += delta.y; }; - - static readonly DragHandlerDelegate DRAG_HANDLER_RIGHT = - (Vector2 delta, ref Rect rect) => { rect.xMax += delta.x; }; - - static readonly DragHandlerDelegate DRAG_HANDLER_TOP_LEFT = - (Vector2 delta, ref Rect rect) => - { - rect.xMin += delta.x; - rect.yMin += delta.y; - }; - - static readonly DragHandlerDelegate DRAG_HANDLER_TOP_RIGHT = - (Vector2 delta, ref Rect rect) => - { - rect.xMax += delta.x; - rect.yMin += delta.y; - }; - - static readonly DragHandlerDelegate DRAG_HANDLER_BOTTOM_RIGHT = - (Vector2 delta, ref Rect rect) => - { - rect.xMax += delta.x; - rect.yMax += delta.y; - }; - - static readonly DragHandlerDelegate DRAG_HANDLER_BOTTOM_LEFT = - (Vector2 delta, ref Rect rect) => - { - rect.xMin += delta.x; - rect.yMax += delta.y; - }; -} -} -#endif diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs.meta deleted file mode 100644 index beeb1d093..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: b71ecc50ad61ec745a62fe5d0c7f8810 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/ResizableScreenRect.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs deleted file mode 100644 index 37f9b6e22..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs +++ /dev/null @@ -1,37 +0,0 @@ -using LeTai.Paraform.Scaffold; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public static class ShaderID -{ - public static readonly int BLUR_TEX = Shader.PropertyToID("_BlurTex"); - public static readonly int MAIN_TEX = Shader.PropertyToID("_MainTex"); - public static readonly int OFFSET = Shader.PropertyToID("_Offset"); - public static readonly int TARGET_SIZE = Shader.PropertyToID("_TargetSize"); - public static readonly int BACKGROUND_COLOR = Shader.PropertyToID("_BackgroundColor"); - public static readonly int CROP_REGION = Shader.PropertyToID("_CropRegion"); - public static readonly int IS_LAST = Shader.PropertyToID("_IsLast"); - // public static readonly int ENV_TEX = Shader.PropertyToID("_EnvTex"); - - public const string KW_BACKGROUND_MODE_COLORFUL = "_BACKGROUND_MODE_COLORFUL"; - public const string KW_BACKGROUND_MODE_NORMAL = "_BACKGROUND_MODE_NORMAL"; - public const string KW_BACKGROUND_MODE_OPAQUE = "_BACKGROUND_MODE_OPAQUE"; - - public static readonly int G_CANVAS_SCALE_FACTOR = ParaformMaterial.ShaderID.G_CANVAS_SCALE_FACTOR; - - public const string REFRACTION_MODE_OFF = ParaformMaterial.ShaderID.REFRACTION_MODE_OFF; - public const string REFRACTION_MODE_ON = ParaformMaterial.ShaderID.REFRACTION_MODE_ON; - public const string REFRACTION_MODE_CHROMATIC = ParaformMaterial.ShaderID.REFRACTION_MODE_CHROMATIC; - public static readonly int REFRACTIVE_INDEX_DUMMY = ParaformMaterial.ShaderID.REFRACTIVE_INDEX_DUMMY; - public static readonly int CHROMATIC_DISPERSION_DUMMY = ParaformMaterial.ShaderID.CHROMATIC_DISPERSION_DUMMY; - public static readonly int REFRACTIVE_INDEX_RATIOS = ParaformMaterial.ShaderID.REFRACTIVE_INDEX_RATIOS; - - public const string USE_EDGE_GLINT = ParaformMaterial.ShaderID.USE_EDGE_GLINT; - public static readonly int EDGE_GLINT_DIRECTIONS = ParaformMaterial.ShaderID.EDGE_GLINT_DIRECTIONS; - public static readonly int EDGE_GLINT1_STRENGTH = ParaformMaterial.ShaderID.EDGE_GLINT1_STRENGTH; - public static readonly int EDGE_GLINT2_STRENGTH = ParaformMaterial.ShaderID.EDGE_GLINT2_STRENGTH; - public static readonly int EDGE_GLINT_WRAP_RAW = ParaformMaterial.ShaderID.EDGE_GLINT_WRAP_RAW; - public static readonly int EDGE_GLINT_SHARPNESS_RAW = ParaformMaterial.ShaderID.EDGE_GLINT_SHARPNESS_RAW; -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs.meta deleted file mode 100644 index 016af8c04..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: e531f31ceeeb4a2d99d46564b2754c17 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/ShaderID.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs deleted file mode 100644 index 81db4f0e7..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Runtime.CompilerServices; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -public static class Shims -{ - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T FindObjectOfType(bool includeInactive = false, bool sorted = true) where T : Object - { -#if UNITY_2023_1_OR_NEWER - if (sorted) - return Object.FindFirstObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); - else - return Object.FindAnyObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); -#elif UNITY_2020_1_OR_NEWER - return Object.FindObjectOfType(includeInactive); -#else - return Object.FindObjectOfType(); -#endif - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T[] FindObjectsOfType(bool includeInactive = false) where T : Object - { -#if UNITY_2023_1_OR_NEWER - return Object.FindObjectsByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, - FindObjectsSortMode.None); -#elif UNITY_2020_1_OR_NEWER - return Object.FindObjectsOfType(includeInactive); -#else - return Object.FindObjectsOfType(); -#endif - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs.meta deleted file mode 100644 index b65a737ba..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: aa7ab5ec42143544499feb36b80d3720 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/Utilities/Shims.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs deleted file mode 100644 index 629b8163c..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using Unity.Collections; -using UnityEngine; - -namespace LeTai.Asset.TranslucentImage -{ -/// -/// Optimized for a small number of entries and the ability to be read in Jobs -/// Since VP matrices are expensive to get, use IndexOf to check if the related Camera is cached before calling Add -/// -public class VPMatrixCache : IDisposable -{ - public readonly struct Index - { - public static readonly Index INVALID = new Index(-1); - - internal readonly int index; - - public Index(int index) - { - this.index = index; - } - - public bool IsValid() - { - return index >= 0; - } - } - - readonly List cameras = new List(2); - public NativeList VpMatrices { get; } = new NativeList(2, Allocator.Persistent); - - /// - /// Check if the Camera's VP matrix is cached - /// - /// The index of the camera if found; otherwise, -1. - public Index IndexOf(Camera camera) - { - return new Index(cameras.IndexOf(camera)); - } - - /// - /// Add to the cache. No duplicate check is done. Make sure to call IndexOf first - /// - /// The camera to get the matrix is from - /// The index in the cache where the matrix is stored - public Index Add(Camera camera) - { - var matrix = camera.projectionMatrix * camera.worldToCameraMatrix; - return Add(camera, matrix); - } - - /// - /// Add to the cache. No duplicate check is done. Make sure to call IndexOf first - /// - /// The camera from which the matrix is from - /// camera.projectionMatrix * camera.worldToCameraMatrix - /// The index in the cache where the matrix is stored - public Index Add(Camera camera, Matrix4x4 vpMatrix) - { - var index = cameras.Count; - cameras.Add(camera); - VpMatrices.Add(vpMatrix); - return new Index(index); - } - - public void Clear() - { - cameras.Clear(); - VpMatrices.Clear(); - } - - public void Dispose() - { - VpMatrices.Dispose(); - } -} -} diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs.meta deleted file mode 100644 index f8e303092..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c67c201d9783428680302068286ab7d0 -timeCreated: 1729064473 -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/Script/VPMatrixCache.cs - uploadId: 824068 diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt deleted file mode 100644 index 0eee7dca3..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt +++ /dev/null @@ -1,5 +0,0 @@ -For use with URP, please follow the instruction at http://leloctai.com/asset/translucentimage/docs/articles/universalrp.html - -TLDR: - - Import "URP support.unitypackage" - - Add TranslucentImageBlurSource Renderer Features to each Universal Renderer Assets diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt.meta b/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt.meta deleted file mode 100644 index 8d068bcce..000000000 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/URP README.txt.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: b12c9ba0e5d5cab45a39404b57693e5b -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/TranslucentImage/URP README.txt - uploadId: 824068 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab.meta index 171bcbfe7..c96a17531 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Cube.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab.meta index 2551a1d17..b5780cf5c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/CubeRoup.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab.meta index c4ad41c67..d4ef3ecff 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Env.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab.meta index 621fa0a71..5aa55c123 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Plane.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab.meta index e8c095051..822ea96bb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeBuildDemo.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab.meta index 4fa159121..610b86709 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/RuntimeDressUpDemo.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab.meta index 09ff93124..d1c7fa4e2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/SimpleImputManager.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab.meta index 2f9a7d157..8f297e214 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/Stage.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab.meta index f80ded2b4..149bc0aee 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_KAGURA.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab.meta index 8b6b965dc..d0ff2b4da 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeBuild.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab.meta index ccd5525c3..4d052ef4a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_RuntimeDressUp.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab.meta index c34790214..1a9911fb4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/UI_Wind.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab.meta index 87e20892c..3ed10e9a5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindDemo.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab.meta index e29126c52..94dff1e96 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Prefabs/WindParticle.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json.meta index 03641655c..cb690e10a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Resources/MC2_BoneCloth_Ribbon_Demo.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs.meta index e6ac8b69c..462f97a22 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs.meta @@ -14,6 +14,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/AutoRotate.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs.meta index c0abe7569..4da1a4a6a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/CameraOrbit.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef.meta index b6f93031f..0456cce21 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/MagicaCloth2UPMImporterShaderGraph.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs.meta index d12cf7c89..1dfe26093 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/Editor/ShaderGraph/UnityPackageImporter.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs.meta index ed8a41fae..0334c1a6a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/GameObjectContainer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef.meta index 286731ade..44d64a92b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/MagicaCloth2Example.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs.meta index 665a61141..d5af35d82 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/ModelController.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs.meta index e2230b3db..558fb6c56 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeBuildDemo.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs.meta index 3889a77de..15ef6e0e4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/RuntimeDressUpDemo.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs.meta index 2d04c60be..1336745ff 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInput.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs.meta index 4c5aecaa9..03a6aeb24 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SimpleInputManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs.meta index e73da0a5b..129beef52 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/SliderText.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs.meta index 5dd6ddeb4..15a402512 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/TargetFPS.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs.meta index 68808b5a6..32ebc7620 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Scripts/WindDemo.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph.meta index bb0521bb8..07b9d9c27 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph.meta @@ -12,6 +12,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Back.shadergraph - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph.meta index f9c8f206a..4fcda1d58 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph.meta @@ -12,6 +12,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Shaders/MC2_Common_Lit_Front.shadergraph - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png.meta index 4313437bd..f52f620d2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/Common/Textures/SD_UnityChan_Skirt_PaintMap.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity.meta index 48840054e..aa433fed4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeBuild_CoreRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity.meta index ef8cfa053..dfcc79827 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/RuntimeDressUp_CoreRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity.meta index 975b86de2..f15e6dbf1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/CoreRP/UnityChanKAGURA_CoreRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset.meta index 556889f24..1c4fe48b7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/MC2_SkyandFogSettingsProfile.asset - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity.meta index 11a356336..43695ece0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeBuild_HDRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity.meta index 734b43527..d3b3bdb40 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/RuntimeDressUp_HDRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity.meta index 08d55816c..61ade6555 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/UnityChanKAGURA_HDRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity.meta index 9b7b2e323..8b6981fc4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/HDRP/Wind_HDRP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity.meta index a0e899a71..6bba83bfb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeBuild_URP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity.meta index 5dade8d6a..4f17eecc2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/RuntimeDressUp_URP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity.meta index 7d27e17c8..346a0fa87 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/UnityChanKAGURA_URP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity.meta index bcd58bff4..4f3f49956 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes/URP/Wind_URP.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity.meta index e1428868c..d94a6ee5c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeBuild_HighDefinition3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity.meta index 10c8be0a9..0d833f422 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/RuntimeDressUp_HighDefinition3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity.meta index 7d80a8957..b05624279 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/UnityChanKAGURA_HighDefinition3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity.meta index 7756cdc61..068ead4d4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/HighDefinition3D/Wind_HighDefinition3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity.meta index 8246a372f..522e3e732 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeBuild_Universal3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity.meta index 9dbbb7a6a..ab186afd4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/RuntimeDressUp_Universal3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity.meta index 85e92acae..5f3d152bc 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/UnityChanKAGURA_Universal3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity.meta index 46acbec91..a773e93df 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/DemoScenes_Unity_6.1_or_Higher/Universal3D/Wind_Universal3D.unity - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png.meta index 454730986..77c0aacfb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Logo/Dark_Silhouette.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller.meta index 7fb6bc905..0b8412e1a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/SD_UnityChan.controller - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png.meta index 79bdd6db4..89f61d1e9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_sum.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png.meta index dc159c4d7..fc6f07e69 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/body_win.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png.meta index d25e3a545..1a803170c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/misaki_head.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/utc_all2.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/utc_all2.png.meta index 95c3c5bd3..4db9b4db9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/utc_all2.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/utc_all2.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/utc_all2.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/yuko_head.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/yuko_head.png.meta index fde4a73ca..ece53ec2c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/yuko_head.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/yuko_head.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Textures/yuko_head.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Body).prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Body).prefab.meta index b47d0aa6d..cc4ff6eec 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Body).prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Body).prefab.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Body).prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Hair).prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Hair).prefab.meta index 8796c8732..9596e74f7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Hair).prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Hair).prefab.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Hair).prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Skeleton).prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Skeleton).prefab.meta index 6ba1cba69..c0bd35b3d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Skeleton).prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Skeleton).prefab.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/SD_Kohaku_chanz/Utc_sum_humanoid (Skeleton).prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/01Unity-Chan License Terms and Condition_EN_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/01Unity-Chan License Terms and Condition_EN_UCL2.0.pdf.meta index 827400dbd..76a7679f6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/01Unity-Chan License Terms and Condition_EN_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/01Unity-Chan License Terms and Condition_EN_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/01Unity-Chan License Terms and Condition_EN_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/02Unity-Chan License Terms and Condition_Summary_EN_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/02Unity-Chan License Terms and Condition_Summary_EN_UCL2.0.pdf.meta index c33a3e18a..6c6993872 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/02Unity-Chan License Terms and Condition_Summary_EN_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/02Unity-Chan License Terms and Condition_Summary_EN_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/02Unity-Chan License Terms and Condition_Summary_EN_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/03Indication of License_EN_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/03Indication of License_EN_UCL2.0.pdf.meta index 013951899..ba94be99e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/03Indication of License_EN_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/03Indication of License_EN_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/English/03Indication of License_EN_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/01Unity-Chan License Terms and Condition_JP_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/01Unity-Chan License Terms and Condition_JP_UCL2.0.pdf.meta index 7f4102d24..ce7e14609 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/01Unity-Chan License Terms and Condition_JP_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/01Unity-Chan License Terms and Condition_JP_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/01Unity-Chan License Terms and Condition_JP_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/02Unity-Chan License Terms and Condition_Summary_JP_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/02Unity-Chan License Terms and Condition_Summary_JP_UCL2.0.pdf.meta index 1324e856c..9a7e8e800 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/02Unity-Chan License Terms and Condition_Summary_JP_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/02Unity-Chan License Terms and Condition_Summary_JP_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/02Unity-Chan License Terms and Condition_Summary_JP_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/03Indication of License_JP_UCL2.0.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/03Indication of License_JP_UCL2.0.pdf.meta index e1cb17fdb..f6c1816db 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/03Indication of License_JP_UCL2.0.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/03Indication of License_JP_UCL2.0.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/Japanese/03Indication of License_JP_UCL2.0.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.ai.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.ai.meta index 812943fe6..7a85a3f49 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.ai.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.ai.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.ai - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.psd.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.psd.meta index cfed2a041..1adc96a43 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.psd.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.psd.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_LOGO_rules02.psd - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline.pdf.meta index 753a7327e..7ad27ab14 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline_en.pdf.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline_en.pdf.meta index 2f6af2e4d..4fda43dde 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline_en.pdf.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline_en.pdf.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/LUUL_logo-guideline_en.pdf - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Dark_Silhouette.jpg.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Dark_Silhouette.jpg.meta index 3e7e15520..fd0935d2d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Dark_Silhouette.jpg.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Dark_Silhouette.jpg.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Dark_Silhouette.jpg - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Light_Silhouette.jpg.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Light_Silhouette.jpg.meta index b8325902b..83c4b1e0a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Light_Silhouette.jpg.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Light_Silhouette.jpg.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/jpg/Light_Silhouette.jpg - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Dark_Silhouette.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Dark_Silhouette.png.meta index 37c26221d..a928fafbd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Dark_Silhouette.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Dark_Silhouette.png.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Dark_Silhouette.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Frame.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Frame.png.meta index 19c7343be..1fdda5159 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Frame.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Frame.png.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Frame.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Silhouette.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Silhouette.png.meta index acd9b682b..35187acbe 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Silhouette.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Silhouette.png.meta @@ -137,7 +137,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UCL2.0/License Logo/Others/png/Light_Silhouette.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Unity-Chan License.txt.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Unity-Chan License.txt.meta index 37ced1cf5..b0136520b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Unity-Chan License.txt.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Unity-Chan License.txt.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/Unity-Chan License.txt - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/RUN00_F.anim.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/RUN00_F.anim.meta index 51a76330e..4c697476a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/RUN00_F.anim.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/RUN00_F.anim.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/RUN00_F.anim - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/UC01_001_UniteInTheSky -WA-.fbx.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/UC01_001_UniteInTheSky -WA-.fbx.meta index 64afa005e..f6131ab3d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/UC01_001_UniteInTheSky -WA-.fbx.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/UC01_001_UniteInTheSky -WA-.fbx.meta @@ -1143,7 +1143,7 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/UC01_001_UniteInTheSky -WA-.fbx - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT02.anim.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT02.anim.meta index 506e81e4d..199b15fdd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT02.anim.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT02.anim.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT02.anim - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT04.anim.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT04.anim.meta index e3f7b9b3b..d251766b4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT04.anim.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT04.anim.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WAIT04.anim - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WALK00_F.anim.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WALK00_F.anim.meta index 937146ae7..55f178084 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WALK00_F.anim.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WALK00_F.anim.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WALK00_F.anim - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WIN00.anim.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WIN00.anim.meta index d8bcb87ba..8ebcfb75a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WIN00.anim.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WIN00.anim.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Animation/WIN00.anim - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/Albedo.mat.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/Albedo.mat.meta index bd95769da..2a49444ab 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/Albedo.mat.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/Albedo.mat.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/Albedo.mat - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Base.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Base.png.meta index d2564dfcc..2ec0b2354 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Base.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Base.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Base.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Emi.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Emi.png.meta index e3b890b29..069a3a20d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Emi.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Emi.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Emi.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_SGM.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_SGM.png.meta index 0d9aa3742..aa291edf9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_SGM.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_SGM.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_SGM.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd1.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd1.png.meta index dd626f585..0e0bcc37b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd1.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd1.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd1.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd2.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd2.png.meta index 5f70fbfb1..1d605d370 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd2.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd2.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Shd2.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Spc.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Spc.png.meta index c982588c8..5863c6bd5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Spc.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Spc.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Body_Spc.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Base.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Base.png.meta index 53785957c..ed916c4a7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Base.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Base.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Base.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Emi.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Emi.png.meta index b32d2ea8e..219fab282 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Emi.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Emi.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Emi.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_LSM.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_LSM.png.meta index 5d7e570f2..24bbf5df9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_LSM.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_LSM.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_LSM.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Rim.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Rim.png.meta index 3327fcb3f..c0fc3871e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Rim.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Rim.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Rim.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_SGM.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_SGM.png.meta index 11406a71c..cda2b8d00 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_SGM.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_SGM.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_SGM.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd1.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd1.png.meta index efce9a595..135bd0eb2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd1.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd1.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd1.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd2.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd2.png.meta index 4c4c044dc..7fe1223fe 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd2.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd2.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Face_Shd2.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Hair_SGM.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Hair_SGM.png.meta index 520c17ffe..dced61065 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Hair_SGM.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Hair_SGM.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Hair_SGM.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Headfgear_Base.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Headfgear_Base.png.meta index 604c172e6..6c75cf226 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Headfgear_Base.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Headfgear_Base.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Headfgear_Base.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Base.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Base.png.meta index 17300872a..95e6872db 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Base.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Base.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Base.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Emi.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Emi.png.meta index 2b0106797..6d671a8c7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Emi.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Emi.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Emi.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Nrm.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Nrm.png.meta index baab0a9c9..defb0c299 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Nrm.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Nrm.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Nrm.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Rim.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Rim.png.meta index e1bf0e1b0..be551af61 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Rim.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Rim.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Rim.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SGM.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SGM.png.meta index d0a5cec0e..bb4f019a1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SGM.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SGM.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SGM.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Spc.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Spc.png.meta index 23307e659..b02c42987 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Spc.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Spc.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_Spc.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SpcCol.png.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SpcCol.png.meta index bd908b681..5ab654a21 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SpcCol.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SpcCol.png.meta @@ -142,6 +142,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/Materials/TEX/PNG/Skin_SpcCol.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UniteInTheSky.controller.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UniteInTheSky.controller.meta index 5c2c0418b..f3443a7a1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UniteInTheSky.controller.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UniteInTheSky.controller.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UniteInTheSky.controller - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA.fbx.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA.fbx.meta index a7353f1dd..79100079c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA.fbx.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA.fbx.meta @@ -2261,6 +2261,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA.fbx - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA_MC2.prefab.meta b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA_MC2.prefab.meta index 1b54d1f1f..47c5d8876 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA_MC2.prefab.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA_MC2.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Example (Can be deleted)/UnityChan/UnityChanKAGURA/UnityCHanKAGURA_MC2.prefab - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/MagicaCloth2.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/MagicaCloth2.asmdef.meta index 968f93211..437002344 100644 --- a/Assets/OtherPlugins/MagicaCloth2/MagicaCloth2.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/MagicaCloth2.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/MagicaCloth2.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Readme.txt.meta b/Assets/OtherPlugins/MagicaCloth2/Readme.txt.meta index 3880274ee..23608a569 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Readme.txt.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Readme.txt.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Readme.txt - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Readme_jpn.txt.meta b/Assets/OtherPlugins/MagicaCloth2/Readme_jpn.txt.meta index a4462f1d0..774de6a51 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Readme_jpn.txt.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Readme_jpn.txt.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Readme_jpn.txt - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-cloth.png.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-cloth.png.meta index 4fe8d3392..f926dd07f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-cloth.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-cloth.png.meta @@ -126,6 +126,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-cloth.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-collider.png.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-collider.png.meta index c576cb925..06c94a5ad 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-collider.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-collider.png.meta @@ -138,6 +138,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-collider.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-settings.png.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-settings.png.meta index 050f27b52..34edc79df 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-settings.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-settings.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-settings.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-wind.png.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-wind.png.meta index 7b5906d20..d40b02951 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-wind.png.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-wind.png.meta @@ -137,6 +137,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Icon/icon-wind.png - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Accessory.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Accessory.json.meta index 410cdb70c..6a350536e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Accessory.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Accessory.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Accessory.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Cape.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Cape.json.meta index c1892f476..6a6540a98 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Cape.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Cape.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Cape.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_FrontHair.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_FrontHair.json.meta index dfdd5ec74..cafc434d6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_FrontHair.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_FrontHair.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_FrontHair.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_HardSpring.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_HardSpring.json.meta index a61f38561..ac7e52ece 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_HardSpring.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_HardSpring.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_HardSpring.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_LongHair.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_LongHair.json.meta index da72b8b23..d84114500 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_LongHair.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_LongHair.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_LongHair.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_MiddleSpring.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_MiddleSpring.json.meta index 63440fb3d..284ab8cd7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_MiddleSpring.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_MiddleSpring.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_MiddleSpring.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_ShortHair.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_ShortHair.json.meta index c99f51bb5..a447294fd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_ShortHair.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_ShortHair.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_ShortHair.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Skirt.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Skirt.json.meta index 5da95fd43..d08620f0c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Skirt.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Skirt.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Skirt.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSkirt.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSkirt.json.meta index 41708d3e1..88c424b02 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSkirt.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSkirt.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSkirt.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSpring.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSpring.json.meta index c9706af4b..282fe17b1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSpring.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSpring.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_SoftSpring.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Tail.json.meta b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Tail.json.meta index 375d020bf..fb0990563 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Tail.json.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Tail.json.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Res/Preset/MC2_Preset_Tail.json - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs.meta index 148257bad..816f03258 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs.meta index 30fa2c448..38b7322c8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs new file mode 100644 index 000000000..a41135ba6 --- /dev/null +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs @@ -0,0 +1,22 @@ +// Magica Cloth 2. +// Copyright (c) 2026 MagicaSoft. +// https://magicasoft.jp + +namespace MagicaCloth2 +{ + /// + /// Simulation Disable Mode + /// + public enum ClothDisableMode + { + /// + /// Reset the simulation. + /// + Reset = 0, + + /// + /// Maintain the simulation. + /// + Keep = 1, + } +} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs.meta similarity index 52% rename from Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs.meta rename to Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs.meta index 560a0b5fb..5d60b7ad6 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/Knob.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8785778a8d728904589c40f715ae793d +guid: b7f7df74e3431e84199fe50874a58668 MonoImporter: externalObjects: {} serializedVersion: 2 @@ -11,8 +11,8 @@ MonoImporter: assetBundleVariant: AssetOrigin: serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/Knob.cs - uploadId: 824068 + productId: 242307 + packageName: Magica Cloth 2 + packageVersion: 2.18.1 + assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs.meta index 650dfacb0..17049156f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs index 7e3e4ab40..a4a3b465d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs @@ -167,7 +167,7 @@ namespace MagicaCloth2 clothSetupDataList?.ForEach(x => x.GetUsedTransform(transformSet)); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { clothTransformRecord?.ReplaceTransform(replaceDict); normalAdjustmentTransformRecord?.ReplaceTransform(replaceDict); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs.meta index 5609d3701..81039230f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs.meta index 3d5e946c3..977825af2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs.meta index 652221aa6..9f1309f1a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs.meta index 4803a51a3..252352050 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs index 106aee893..389388b8f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs @@ -170,8 +170,8 @@ namespace MagicaCloth2 // 初期化データの参照 RenderSetupSerializeData initSetupData = useInitData ? sdata2.initData.clothSetupDataList[i] : null; - int handle = AddRenderer(ren, setup, uniquePreBuildSetupData, initSetupData); - if (handle == 0) + MagicaObjectId handle = AddRenderer(ren, setup, uniquePreBuildSetupData, initSetupData); + if (handle.IsValid() == false) { result.SetError(Define.Result.ClothInit_FailedAddRenderer); throw new OperationCanceledException(); @@ -221,7 +221,7 @@ namespace MagicaCloth2 if (syncPartnerCloth) { // partner - MagicaManager.Team.comp2SyncPartnerCompMap.Add(cloth.GetInstanceID(), syncPartnerCloth.GetInstanceID()); + MagicaManager.Team.comp2SyncPartnerCompMap.Add(cloth.GetMagicaId(), syncPartnerCloth.GetMagicaId()); // top // デッドロック対策 @@ -237,7 +237,7 @@ namespace MagicaCloth2 } Debug.Assert(c); SyncTopCloth = c; - MagicaManager.Team.comp2SyncTopCompMap.Add(cloth.GetInstanceID(), SyncTopCloth.GetInstanceID()); + MagicaManager.Team.comp2SyncTopCompMap.Add(cloth.GetMagicaId(), SyncTopCloth.GetMagicaId()); } result.SetSuccess(); @@ -275,7 +275,7 @@ namespace MagicaCloth2 /// /// /// レンダー情報ハンドル - int AddRenderer( + MagicaObjectId AddRenderer( Renderer ren, RenderSetupData referenceSetupData, RenderSetupData.UniqueSerializationData referenceUniqueSetupData, @@ -283,16 +283,16 @@ namespace MagicaCloth2 ) { if (ren == null) - return 0; + return MagicaObjectId.Invalid; if (renderHandleList == null) - return 0; + return MagicaObjectId.Invalid; - int handle = ren.GetInstanceID(); + MagicaObjectId handle = ren.GetMagicaId(); if (renderHandleList.Contains(handle) == false) { // レンダラーの利用開始 handle = MagicaManager.Render.AddRenderer(ren, referenceSetupData, referenceUniqueSetupData, referenceInitSetupData); - if (handle != 0) + if (handle.IsValid()) { lock (lockObject) { @@ -365,12 +365,12 @@ namespace MagicaCloth2 SetState(State_Enable, now); // チーム - MagicaManager.Team.SetEnable(TeamId, now); + MagicaManager.Team.SetEnable(this, TeamId, now); // レンダラー if (renderHandleList != null) { - foreach (int renderHandle in renderHandleList) + foreach (MagicaObjectId renderHandle in renderHandleList) { if (now) MagicaManager.Render.StartUse(this, renderHandle); @@ -514,7 +514,7 @@ namespace MagicaCloth2 result.SetError(Define.Result.CreateCloth_VertexAttributeListIsNull); throw new MagicaClothProcessingException(); } - int renderHandle = renderHandleList[i]; + MagicaObjectId renderHandle = renderHandleList[i]; var renderData = MagicaManager.Render.GetRendererData(renderHandle); if (renderData.setupData.vertexCount != vertexAttributeArray.Length) { @@ -550,15 +550,15 @@ namespace MagicaCloth2 SelectionData selectionData = (usePaintMap || useManualVertexAttribute) ? new SelectionData() : sdata2.selectionData.Clone(); // BoneCloth/BoneSpringでシリアライズ２にTransformと属性辞書がある場合はIDと属性の辞書に変換（スレッドではアクセスできないため） - Dictionary boneAttributeDict = null; + Dictionary boneAttributeDict = null; if (sdata2.boneAttributeDict.Count > 0) { - boneAttributeDict = new Dictionary(sdata2.boneAttributeDict.Count); + boneAttributeDict = new Dictionary(sdata2.boneAttributeDict.Count); foreach (var kv in sdata2.boneAttributeDict) { if (kv.Key) { - boneAttributeDict.Add(kv.Key.GetInstanceID(), kv.Value); + boneAttributeDict.Add(kv.Key.GetMagicaId(), kv.Value); } } } @@ -575,7 +575,7 @@ namespace MagicaCloth2 ct.ThrowIfCancellationRequested(); proxyMesh = new VirtualMesh("Proxy"); proxyMesh.result.SetProcess(); - List copyRenderHandleList = null; + List copyRenderHandleList = null; if (clothType == ClothType.MeshCloth) { // MeshClothではクロストランスフォームを追加しておく @@ -583,7 +583,7 @@ namespace MagicaCloth2 lock (lockObject) { - copyRenderHandleList = new List(renderHandleList); + copyRenderHandleList = new List(renderHandleList); } } @@ -606,7 +606,7 @@ namespace MagicaCloth2 { ct.ThrowIfCancellationRequested(); - int renderHandle = copyRenderHandleList[i]; + MagicaObjectId renderHandle = copyRenderHandleList[i]; // レンダーメッシュ作成 var renderData = MagicaManager.Render.GetRendererData(renderHandle); @@ -719,7 +719,7 @@ namespace MagicaCloth2 selectionData.Fill(VertexAttribute.Move); // 次にルートのみ固定 - foreach (int id in boneClothSetupData.rootTransformIdList) + foreach (MagicaObjectId id in boneClothSetupData.rootTransformIdList) { int rootIndex = boneClothSetupData.GetTransformIndexFromId(id); selectionData.attributes[rootIndex] = VertexAttribute.Fixed; @@ -1476,7 +1476,7 @@ namespace MagicaCloth2 renderMeshContainerList[i] = null; // レンダーハンドル - int renderHandle = renderHandleList[i]; + MagicaObjectId renderHandle = renderHandleList[i]; var renderData = MagicaManager.Render.GetRendererData(renderHandle); // MappingMesh登録 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs.meta index a8165d076..82f552e0e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs index 20cc15227..eb6a22391 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs @@ -57,7 +57,7 @@ namespace MagicaCloth2 /// レンダー情報へのハンドル /// （レンダラーのセットアップデータ） /// - internal List renderHandleList = new List(); + internal List renderHandleList = new List(); /// /// BoneClothのセットアップデータ @@ -69,7 +69,7 @@ namespace MagicaCloth2 /// public class RenderMeshInfo { - public int renderHandle; + public MagicaObjectId renderHandle; public VirtualMeshContainer renderMeshContainer; public DataChunk mappingChunk; //public DataChunk renderMeshPositionAndNormalChunk; @@ -187,12 +187,12 @@ namespace MagicaCloth2 /// /// 現在アンカーとして設定されているTransformのインスタンスID /// - internal int anchorTransformId = 0; + internal MagicaObjectId anchorTransformId = MagicaObjectId.Invalid; /// /// 現在距離カリングの参照として設定されているオブジェクトのインスタンスID /// - internal int distanceReferenceObjectId = 0; + internal MagicaObjectId distanceReferenceObjectId = MagicaObjectId.Invalid; /// /// コンポーネントの登録TransformIndex @@ -341,7 +341,7 @@ namespace MagicaCloth2 renderMeshInfoList = null; // レンダーデータの利用終了 - foreach (int renderHandle in renderHandleList) + foreach (MagicaObjectId renderHandle in renderHandleList) { MagicaManager.Render?.RemoveRenderer(renderHandle); } @@ -366,7 +366,7 @@ namespace MagicaCloth2 // 作業バッファ破棄 SyncTopCloth = null; - int compId = cloth.GetInstanceID(); + MagicaObjectId compId = cloth.GetMagicaId(); MagicaManager.Team?.comp2SuspendCounterMap.Remove(compId); MagicaManager.Team?.comp2TeamIdMap.Remove(compId); MagicaManager.Team?.comp2SyncPartnerCompMap.Remove(compId); @@ -385,7 +385,7 @@ namespace MagicaCloth2 { //suspendCounter++; var tm = MagicaManager.Team; - int compId = cloth.GetInstanceID(); + MagicaObjectId compId = cloth.GetMagicaId(); if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt)) { cnt++; @@ -400,12 +400,11 @@ namespace MagicaCloth2 { //suspendCounter--; var tm = MagicaManager.Team; - int compId = cloth.GetInstanceID(); + MagicaObjectId compId = cloth.GetMagicaId(); if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt)) { cnt--; if (cnt > 0) - //tm.comp2SuspendCounterMap.Add(compId, cnt); tm.comp2SuspendCounterMap[compId] = cnt; else tm.comp2SuspendCounterMap.Remove(compId); @@ -416,7 +415,7 @@ namespace MagicaCloth2 { //return suspendCounter; var tm = MagicaManager.Team; - int compId = cloth.GetInstanceID(); + MagicaObjectId compId = cloth.GetMagicaId(); if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt)) return cnt; else @@ -451,7 +450,7 @@ namespace MagicaCloth2 transformSet.Remove(null); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { cloth.SerializeData.ReplaceTransform(replaceDict); cloth.serializeData2.ReplaceTransform(replaceDict); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs.meta index 29ae62d6b..1bad2c5d8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs index 0d69d07da..6533e44c0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs @@ -106,7 +106,7 @@ namespace MagicaCloth2 { if (rt) { - int index = setupData.GetTransformIndexFromId(rt.GetInstanceID()); + int index = setupData.GetTransformIndexFromId(rt.GetMagicaId()); selectionData.attributes[index] = VertexAttribute.Fixed; } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs.meta index ed2590613..48481d164 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs index 209cb6727..1d8cf9ad1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs @@ -109,6 +109,14 @@ namespace MagicaCloth2 /// public ClothUpdateMode updateMode = ClothUpdateMode.AnimatorLinkage; + /// + /// Set the disable mode. + /// Component inactive behavior. + /// [OK] Runtime changes. + /// [NG] Export/Import with Presets + /// + public ClothDisableMode disableMode = ClothDisableMode.Reset; + /// /// Blend ratio between initial pose and animation pose. /// [OK] Runtime changes. diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs.meta index 47d6b0ebb..a6649160c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs index fda9bd42f..9fec43e09 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs @@ -85,7 +85,7 @@ namespace MagicaCloth2 preBuildData.GetUsedTransform(transformSet); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { initData.ReplaceTransform(replaceDict); preBuildData.ReplaceTransform(replaceDict); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs.meta index 025cd430c..e6bff684c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs index 289622191..14484f5e7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs @@ -122,7 +122,7 @@ namespace MagicaCloth2 int hash = 0; hash += (int)clothType; foreach (var ren in sourceRenderers) - hash += ren != null ? ren.GetInstanceID() : NullHash; + hash += ren != null ? ren.GetMagicaId().GetHashCode() : NullHash; foreach (var t in rootBones) { var stack = new Stack(30); @@ -135,7 +135,7 @@ namespace MagicaCloth2 hash += NullHash; continue; } - hash += t2.GetInstanceID(); + hash += t2.GetMagicaId().GetHashCode(); hash += t2.localPosition.GetHashCode(); hash += t2.localRotation.GetHashCode(); int cnt = t2.childCount; @@ -153,7 +153,7 @@ namespace MagicaCloth2 { if (map) { - hash += map.GetInstanceID(); + hash += map.GetMagicaId().GetHashCode(); hash += map.isReadable ? 1 : 0; } } @@ -213,6 +213,7 @@ namespace MagicaCloth2 float rotationalInterpolation; float rootRotation; ClothUpdateMode updateMode; + ClothDisableMode disableMode; float animationPoseRatio; ReductionSettings reductionSetting; CustomSkinningSettings customSkinningSetting; @@ -245,6 +246,7 @@ namespace MagicaCloth2 rotationalInterpolation = sdata.rotationalInterpolation; rootRotation = sdata.rootRotation; updateMode = sdata.updateMode; + disableMode = sdata.disableMode; animationPoseRatio = sdata.animationPoseRatio; reductionSetting = sdata.reductionSetting.Clone(); customSkinningSetting = sdata.customSkinningSetting.Clone(); @@ -273,6 +275,7 @@ namespace MagicaCloth2 sdata.rotationalInterpolation = rotationalInterpolation; sdata.rootRotation = rootRotation; sdata.updateMode = updateMode; + sdata.disableMode = disableMode; sdata.animationPoseRatio = animationPoseRatio; sdata.reductionSetting = reductionSetting; sdata.customSkinningSetting = customSkinningSetting; @@ -354,6 +357,7 @@ namespace MagicaCloth2 rotationalInterpolation = sdata.rotationalInterpolation; rootRotation = sdata.rootRotation; updateMode = sdata.updateMode; + disableMode = sdata.disableMode; animationPoseRatio = sdata.animationPoseRatio; reductionSetting = sdata.reductionSetting.Clone(); customSkinningSetting = sdata.customSkinningSetting.Clone(); @@ -408,14 +412,14 @@ namespace MagicaCloth2 colliderCollisionConstraint.GetUsedTransform(transformSet); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { for (int i = 0; i < rootBones.Count; i++) { var t = rootBones[i]; - if (t && replaceDict.ContainsKey(t.GetInstanceID())) + if (t && replaceDict.ContainsKey(t.GetMagicaId())) { - rootBones[i] = replaceDict[t.GetInstanceID()]; + rootBones[i] = replaceDict[t.GetMagicaId()]; } } customSkinningSetting.ReplaceTransform(replaceDict); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs.meta index 617b1b175..0fa1f81e3 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs.meta index 1f565160a..5adcfca43 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs index 927ec2b4a..6a70d2c80 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs @@ -378,12 +378,12 @@ namespace MagicaCloth2 transformSet.Add(symmetryTarget); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (symmetryTarget) { - int id = symmetryTarget.GetInstanceID(); - if (id != 0 && replaceDict.ContainsKey(id)) + MagicaObjectId id = symmetryTarget.GetMagicaId(); + if (id.IsValid() && replaceDict.ContainsKey(id)) symmetryTarget = replaceDict[id]; } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs.meta index 1e0e0c37b..d388086db 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs.meta index 516fb6857..333b5a61a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs.meta index b7968b042..dad17aa8d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs.meta index 6444e33ca..7cd5fe9ac 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs.meta index 6359c6920..cc66bd6f5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs.meta index 9ec7cb838..4e77791f8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs index 2afc02a27..8850b3eae 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs @@ -103,7 +103,7 @@ namespace MagicaCloth2 foreach (var t in collisionBones) { if (t) - hash += t.GetInstanceID(); + hash += t.GetMagicaId().GetHashCode(); } return hash; @@ -123,7 +123,7 @@ namespace MagicaCloth2 } } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { colliderList.ForEach(x => { @@ -133,9 +133,9 @@ namespace MagicaCloth2 for (int i = 0; i < collisionBones.Count; i++) { var t = collisionBones[i]; - if (t && replaceDict.ContainsKey(t.GetInstanceID())) + if (t && replaceDict.ContainsKey(t.GetMagicaId())) { - collisionBones[i] = replaceDict[t.GetInstanceID()]; + collisionBones[i] = replaceDict[t.GetMagicaId()]; } } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs.meta index c15de82cd..1d0efd8cd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs.meta index d027e8627..ee56a89d1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs.meta index 530b25628..5c12762f7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs.meta index 3b6e190f4..5ef8f0b26 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs.meta index dda1e9adc..302382540 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs.meta index 3facfff3c..2662b4fa7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs.meta index 283e1fa01..7abb9bb06 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs.meta index 2bcf0a12b..e13691fe1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs.meta index 2bc1f2bb5..563ccaffa 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs.meta index ad8933078..73eea6d0c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs index 347d00d3e..3cec209ce 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs @@ -85,14 +85,14 @@ namespace MagicaCloth2 } } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { for (int i = 0; i < skinningBones.Count; i++) { var t = skinningBones[i]; - if (t && replaceDict.ContainsKey(t.GetInstanceID())) + if (t && replaceDict.ContainsKey(t.GetMagicaId())) { - skinningBones[i] = replaceDict[t.GetInstanceID()]; + skinningBones[i] = replaceDict[t.GetMagicaId()]; } } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs.meta index 55053fcc3..48645f47c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs.meta index 0976944e9..6d4c639d1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs index e5ceef752..4ad84f26a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs @@ -135,7 +135,7 @@ namespace MagicaCloth2 public override int GetMagicaHashCode() { int hash = SerializeData.GetHashCode() + serializeData2.GetHashCode(); - hash += isActiveAndEnabled ? GetInstanceID() : 0; // component active. + hash += isActiveAndEnabled ? this.GetMagicaId().GetHashCode() : 0; // component active. return hash; } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs.meta index 02b57ea09..f56a05a5a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs index ca5fe6b5e..1ccaebb75 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs @@ -159,12 +159,12 @@ namespace MagicaCloth2 // 置換処理用の辞書を作成 // key:置換対象トランスフォームのインスタンスID // value:入れ替えるトランスフォーム - var replaceDict = new Dictionary(); + var replaceDict = new Dictionary(); foreach (var t in useTransformSet) { if (t && targetTransformDict.ContainsKey(t.name)) { - replaceDict.Add(t.GetInstanceID(), targetTransformDict[t.name]); + replaceDict.Add(t.GetMagicaId(), targetTransformDict[t.name]); } } @@ -307,7 +307,7 @@ namespace MagicaCloth2 { if (IsValid() == false || ren == null) return null; - int handle = ren.GetInstanceID(); + MagicaObjectId handle = ren.GetMagicaId(); return MagicaManager.Render.GetRendererData(handle); } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs.meta index 7e0527836..7dc456e8a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs.meta index 956c14f64..f3779c8e6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs index d0c35e103..bef9e8d6d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs @@ -83,7 +83,7 @@ namespace MagicaCloth2 hash += (int)alignmentMode * 105; if (adjustmentTransform) { - hash += adjustmentTransform.GetInstanceID(); + hash += adjustmentTransform.GetMagicaId().GetHashCode(); hash += adjustmentTransform.position.GetHashCode(); } @@ -96,11 +96,11 @@ namespace MagicaCloth2 transformSet.Add(adjustmentTransform); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { - if (adjustmentTransform && replaceDict.ContainsKey(adjustmentTransform.GetInstanceID())) + if (adjustmentTransform && replaceDict.ContainsKey(adjustmentTransform.GetMagicaId())) { - adjustmentTransform = replaceDict[adjustmentTransform.GetInstanceID()]; + adjustmentTransform = replaceDict[adjustmentTransform.GetMagicaId()]; } } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs.meta index 24abe6e85..92c0db3cd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs.meta index 6f80b50c7..33edaca2b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs.meta index ddecfe88d..1a50165c4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs.meta index 5f5c23b20..8a5e35ab8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs.meta index 8ec17c928..182a702c1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/ResultDefine.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/ResultDefine.cs.meta index 5b77a44ad..1c35e0305 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/ResultDefine.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/ResultDefine.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/ResultDefine.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/SystemDefine.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/SystemDefine.cs.meta index 1693d13af..77ce58d61 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/SystemDefine.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/SystemDefine.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Define/SystemDefine.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ICount.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ICount.cs.meta index 0f5af9ed5..4287697ee 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ICount.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ICount.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ICount.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IDataValidate.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IDataValidate.cs.meta index 3a1418bfb..eade0a8b1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IDataValidate.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IDataValidate.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IDataValidate.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs index e41bfe686..44d55c953 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs @@ -20,6 +20,6 @@ namespace MagicaCloth2 /// value:入れ替えるトランスフォーム /// /// - void ReplaceTransform(Dictionary replaceDict); + void ReplaceTransform(Dictionary replaceDict); } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs.meta index ef067aedd..c692e2c3f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/ITransform.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IValid.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IValid.cs.meta index 8cce09719..bc4ab7477 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IValid.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IValid.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Interface/IValid.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs index 26856b2f6..ae39b2328 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs @@ -24,8 +24,8 @@ namespace MagicaCloth2 internal HashSet meshClothSet = new HashSet(); //========================================================================================= - Dictionary animatorVisibleDict = new Dictionary(30); - Dictionary rendererVisibleDict = new Dictionary(100); + Dictionary animatorVisibleDict = new Dictionary(30); + Dictionary rendererVisibleDict = new Dictionary(100); //========================================================================================= /// @@ -121,7 +121,7 @@ namespace MagicaCloth2 } // チームマネージャの作業バッファへ登録 - MagicaManager.Team.comp2TeamIdMap.Add(cprocess.cloth.GetInstanceID(), teamId); + MagicaManager.Team.comp2TeamIdMap.Add(cprocess.cloth.GetMagicaId(), teamId); return teamId; } @@ -290,7 +290,7 @@ namespace MagicaCloth2 { if (ani) { - int id = ani.GetInstanceID(); + MagicaObjectId id = ani.GetMagicaId(); if (animatorVisibleDict.ContainsKey(id)) return animatorVisibleDict[id]; @@ -311,7 +311,7 @@ namespace MagicaCloth2 if (ren) { bool visible; - int id = ren.GetInstanceID(); + MagicaObjectId id = ren.GetMagicaId(); if (rendererVisibleDict.ContainsKey(id)) { visible = rendererVisibleDict[id]; diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs.meta index f19b94753..eb4c7ce84 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/ClothManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/PreBuildManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/PreBuildManager.cs.meta index 3b4af2e22..542b131d6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/PreBuildManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/PreBuildManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Cloth/PreBuildManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/IManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/IManager.cs.meta index 548f82830..56b5a6512 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/IManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/IManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/IManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManager.cs.meta index e34358fdd..58888e37b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManagerAPI.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManagerAPI.cs.meta index b636d396b..016f6826c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManagerAPI.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManagerAPI.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaManagerAPI.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaSettings.cs.meta index 980f5ce06..ff0bd78fc 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/MagicaSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs index d69332767..14473bbe4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs @@ -73,7 +73,7 @@ namespace MagicaCloth2 setupData?.GetUsedTransform(transformSet); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { setupData?.ReplaceTransform(replaceDict); } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs.meta index 6822f2b3f..85f088e62 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs index 8572bffcb..7c3053148 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs @@ -18,7 +18,7 @@ namespace MagicaCloth2 /// /// 描画データをint型ハンドルで管理する /// - Dictionary renderDataDict = new Dictionary(); + Dictionary renderDataDict = new Dictionary(); //========================================================================================= // ■RenderData @@ -159,7 +159,7 @@ namespace MagicaCloth2 /// /// /// - public int AddRenderer( + public MagicaObjectId AddRenderer( Renderer ren, RenderSetupData referenceSetupData, RenderSetupData.UniqueSerializationData referenceUniqueSetupData, @@ -167,11 +167,11 @@ namespace MagicaCloth2 ) { if (isValid == false) - return 0; + return MagicaObjectId.Invalid; Debug.Assert(ren); // 制御ハンドル - int handle = ren.GetInstanceID(); + MagicaObjectId handle = ren.GetMagicaId(); lock (renderDataDict) { @@ -190,7 +190,7 @@ namespace MagicaCloth2 return handle; } - public bool RemoveRenderer(int handle) + public bool RemoveRenderer(MagicaObjectId handle) { if (isValid == false) return false; @@ -221,7 +221,7 @@ namespace MagicaCloth2 return delete; } - public RenderData GetRendererData(int handle) + public RenderData GetRendererData(MagicaObjectId handle) { if (isValid == false) return null; @@ -327,7 +327,7 @@ namespace MagicaCloth2 /// 有効化 /// /// - public void StartUse(ClothProcess cprocess, int handle) + public void StartUse(ClothProcess cprocess, MagicaObjectId handle) { GetRendererData(handle)?.StartUse(cprocess); } @@ -336,7 +336,7 @@ namespace MagicaCloth2 /// 無効化 /// /// - public void EndUse(ClothProcess cprocess, int handle) + public void EndUse(ClothProcess cprocess, MagicaObjectId handle) { GetRendererData(handle)?.EndUse(cprocess); } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs.meta index f25b0eddb..8a7459424 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs index 2d6477362..893b4bfd1 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs @@ -59,7 +59,7 @@ namespace MagicaCloth2 public NativeArray localTangents; // Bone --------------------------------------------------------------- - public List rootTransformIdList; + public List rootTransformIdList; public enum BoneConnectionMode { // line only. @@ -85,9 +85,9 @@ namespace MagicaCloth2 // Transform情報 // 通常メッシュはrenderTransorm100%のスキニングとして扱われる public List transformList; // skin bonesは[0]～skinBoneCountまで - public List transformIdList; - public List transformParentIdList; // 親ID(0=なし) - public List> transformChildIdList; // 子IDリスト + public List transformIdList; + public List transformParentIdList; // 親ID(0=なし) + public List> transformChildIdList; // 子IDリスト public NativeArray transformPositions; public NativeArray transformRotations; public NativeArray transformLocalPositions; @@ -443,10 +443,10 @@ namespace MagicaCloth2 } // root transform id - rootTransformIdList = new List(rootTransforms.Count); + rootTransformIdList = new List(rootTransforms.Count); foreach (var t in rootTransforms) { - rootTransformIdList.Add(t.GetInstanceID()); + rootTransformIdList.Add(t.GetMagicaId()); } // collision transform (use BoneSpring) @@ -583,18 +583,20 @@ namespace MagicaCloth2 } // id / parent id - transformIdList = new List(tcnt); - transformParentIdList = new List(tcnt); + transformIdList = new List(tcnt); + transformParentIdList = new List(tcnt); for (int i = 0; i < tcnt; i++) { - int id = 0, pid = 0; + //int id = 0, pid = 0; + MagicaObjectId id = MagicaObjectId.Invalid; + MagicaObjectId pid = MagicaObjectId.Invalid; var t = transformList[i]; if (t) { - id = t.GetInstanceID(); + id = t.GetMagicaId(); if (includeChilds && t.parent) - pid = t.parent.GetInstanceID(); + pid = t.parent.GetMagicaId(); } transformIdList.Add(id); transformParentIdList.Add(pid); @@ -603,17 +605,17 @@ namespace MagicaCloth2 // child id if (includeChilds) { - transformChildIdList = new List>(tcnt); + transformChildIdList = new List>(tcnt); for (int i = 0; i < tcnt; i++) { var t = transformList[i]; - var clist = new FixedList512Bytes(); + var clist = new FixedList512Bytes(); if (t && t.childCount > 0) { for (int j = 0; j < t.childCount; j++) { var ct = t.GetChild(j); - clist.Add(ct.GetInstanceID()); + clist.Add(ct.GetMagicaId()); } } transformChildIdList.Add(clist); @@ -733,33 +735,33 @@ namespace MagicaCloth2 } } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (rootTransformIdList != null) { for (int i = 0; i < rootTransformIdList.Count; i++) { - int id = rootTransformIdList[i]; + MagicaObjectId id = rootTransformIdList[i]; if (replaceDict.ContainsKey(id)) { - rootTransformIdList[i] = replaceDict[id].GetInstanceID(); + rootTransformIdList[i] = replaceDict[id].GetMagicaId(); } } } for (int i = 0; i < TransformCount; i++) { - int id = transformIdList[i]; + MagicaObjectId id = transformIdList[i]; if (replaceDict.ContainsKey(id)) { var t = replaceDict[id]; - transformIdList[i] = t.GetInstanceID(); + transformIdList[i] = t.GetMagicaId(); transformList[i] = t; } - int pid = transformParentIdList[i]; + MagicaObjectId pid = transformParentIdList[i]; if (replaceDict.ContainsKey(pid)) { var t = replaceDict[pid]; - transformParentIdList[i] = t.GetInstanceID(); + transformParentIdList[i] = t.GetMagicaId(); } if (transformChildIdList != null) @@ -767,11 +769,11 @@ namespace MagicaCloth2 var cidlist = transformChildIdList[i]; for (int j = 0; j < cidlist.Length; j++) { - int cid = cidlist[j]; + MagicaObjectId cid = cidlist[j]; if (replaceDict.ContainsKey(cid)) { var t = replaceDict[cid]; - cidlist[j] = t.GetInstanceID(); + cidlist[j] = t.GetMagicaId(); } } transformChildIdList[i] = cidlist; @@ -789,7 +791,7 @@ namespace MagicaCloth2 return transformList[renderTransformIndex]; } - public int GetRenderTransformId() + public MagicaObjectId GetRenderTransformId() { return transformIdList[renderTransformIndex]; } @@ -812,12 +814,12 @@ namespace MagicaCloth2 return transformList[skinRootBoneIndex]; } - public int GetSkinRootTransformId() + public MagicaObjectId GetSkinRootTransformId() { return transformIdList[skinRootBoneIndex]; } - public int GetTransformIndexFromId(int id) + public int GetTransformIndexFromId(MagicaObjectId id) { return transformIdList.IndexOf(id); } @@ -830,7 +832,7 @@ namespace MagicaCloth2 /// なし(-1) public int GetParentTransformIndex(int index, bool centerExcluded) { - int pid = transformParentIdList[index]; + MagicaObjectId pid = transformParentIdList[index]; int i = transformIdList.IndexOf(pid); if (centerExcluded && i == renderTransformIndex) i = -1; diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs.meta index 002343f0c..d9534a727 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs index 13e1cc18f..8389defa7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs @@ -155,7 +155,7 @@ namespace MagicaCloth2 }); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (transformList != null) { @@ -164,8 +164,8 @@ namespace MagicaCloth2 var t = transformList[i]; if (t) { - int id = t.GetInstanceID(); - if (id != 0 && replaceDict.ContainsKey(id)) + MagicaObjectId id = t.GetMagicaId(); + if (id.IsValid() && replaceDict.ContainsKey(id)) { transformList[i] = replaceDict[id]; } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs.meta index 5ff0fbe97..8e072f5c6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupDataSerialization.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs index 518364115..48687e6cd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs @@ -338,16 +338,16 @@ namespace MagicaCloth2 } } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (transformArray == null) return; for (int i = 0; i < transformArray.Length; i++) { var t = transformArray[i]; - if (t && replaceDict.ContainsKey(t.GetInstanceID())) + if (t && replaceDict.ContainsKey(t.GetMagicaId())) { - transformArray[i] = replaceDict[t.GetInstanceID()]; + transformArray[i] = replaceDict[t.GetMagicaId()]; } } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs.meta index 854e5cc77..708896f3d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Render/RenderSetupSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/ColliderManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/ColliderManager.cs.meta index c3f9daf6e..dc88eb5a9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/ColliderManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/ColliderManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/ColliderManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs index 9caf1949c..e8fee4791 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs @@ -654,6 +654,11 @@ namespace MagicaCloth2 // buffer stepBasicPositionBuffer = stepBasicPositionBuffer, stepBasicRotationBuffer = stepBasicRotationBuffer, + // temp + tempVectorBufferA = tempVectorBufferA, + tempVectorBufferB = tempVectorBufferB, + tempCountBuffer = tempCountBuffer, + tempFloatBufferA = tempFloatBufferA, }; splitClothJobHandle = splitStep_B_job.Schedule(splitClothTeamCount * workerCount, 1, splitClothJobHandle); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs.meta index bdcb07107..0930aa023 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs index a5b99143d..e5a3dd536 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs @@ -459,7 +459,12 @@ namespace MagicaCloth2 ref frictionArray, // buffer ref stepBasicPositionBuffer, - ref stepBasicRotationBuffer + ref stepBasicRotationBuffer, + // temp + ref tempVectorBufferA, + ref tempVectorBufferB, + ref tempCountBuffer, + ref tempFloatBufferA ); // 制約解決のためのステップごとの基準姿勢を計算 @@ -1070,7 +1075,12 @@ namespace MagicaCloth2 ref NativeArray frictionArray, // buffer ref NativeArray stepBasicPositionBuffer, - ref NativeArray stepBasicRotationBuffer + ref NativeArray stepBasicRotationBuffer, + // temp buffer + ref NativeArray tempVectorBufferA, + ref NativeArray tempVectorBufferB, + ref NativeArray tempCountBuffer, + ref NativeArray tempFloatBufferA ) { // 速度更新、外力の影響、慣性シフト @@ -1225,6 +1235,12 @@ namespace MagicaCloth2 // 予測位置格納 nextPosArray[pindex] = nextPos; + + // 作業バッファクリア + tempVectorBufferA[pindex] = 0; + tempVectorBufferB[pindex] = 0; + tempCountBuffer[pindex] = 0; + tempFloatBufferA[pindex] = 0; } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs.meta index b4272cf4f..3ae3516e6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerNormal.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs index 12f7eeb4b..d85f72d43 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs @@ -607,6 +607,20 @@ namespace MagicaCloth2 [NativeDisableContainerSafetyRestriction] public NativeArray stepBasicRotationBuffer; + // temp + [NativeDisableParallelForRestriction] + [NativeDisableContainerSafetyRestriction] + public NativeArray tempVectorBufferA; + [NativeDisableParallelForRestriction] + [NativeDisableContainerSafetyRestriction] + public NativeArray tempVectorBufferB; + [NativeDisableParallelForRestriction] + [NativeDisableContainerSafetyRestriction] + public NativeArray tempCountBuffer; + [NativeDisableParallelForRestriction] + [NativeDisableContainerSafetyRestriction] + public NativeArray tempFloatBufferA; + // バッチ内のローカルチームインデックスごと public void Execute(int index) { @@ -670,7 +684,12 @@ namespace MagicaCloth2 ref frictionArray, // buffer ref stepBasicPositionBuffer, - ref stepBasicRotationBuffer + ref stepBasicRotationBuffer, + // temp + ref tempVectorBufferA, + ref tempVectorBufferB, + ref tempCountBuffer, + ref tempFloatBufferA ); } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs.meta index 5802aa90b..73e5b90a7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/SimulationManagerSplit.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/TimeManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/TimeManager.cs.meta index 0efc2dc4f..aec343964 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/TimeManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/TimeManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/TimeManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/WindManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/WindManager.cs.meta index 729232dbf..542866f21 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/WindManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/WindManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Simulation/WindManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs index 59758ee3d..b2afc2e37 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs @@ -206,7 +206,8 @@ namespace MagicaCloth2 /// /// MagicaClothコンポーネントのインスタンスID /// - public int componentId; + //public int componentId; + public MagicaObjectId componentId; /// /// 同期チームID(0=なし) @@ -226,7 +227,8 @@ namespace MagicaCloth2 /// /// 連動するAnimatorのインスタンスID(0=なし) /// - public int interlockingAnimatorId; + //public int interlockingAnimatorId; + public MagicaObjectId interlockingAnimatorId; /// /// 初期姿勢とアニメーション姿勢のブレンド率（制約で利用） @@ -647,10 +649,10 @@ namespace MagicaCloth2 internal int edgeColliderCollisionCount; internal NativeReference edgeColliderCollisionCountBuff; - internal NativeParallelHashMap comp2SuspendCounterMap; - internal NativeParallelHashMap comp2TeamIdMap; - internal NativeParallelHashMap comp2SyncPartnerCompMap; - internal NativeParallelHashMap comp2SyncTopCompMap; + internal NativeParallelHashMap comp2SuspendCounterMap; + internal NativeParallelHashMap comp2TeamIdMap; + internal NativeParallelHashMap comp2SyncPartnerCompMap; + internal NativeParallelHashMap comp2SyncTopCompMap; internal NativeList batchNormalClothTeamList; internal NativeList batchSplitClothTeamList; @@ -659,12 +661,12 @@ namespace MagicaCloth2 internal List skipWritingDirtyList; internal NativeList cullingDirtyList; internal NativeParallelHashSet selfCollisionUpdateSet; - internal NativeParallelHashMap animatorUpdateModeMap; + internal NativeParallelHashMap animatorUpdateModeMap; - internal ExSimpleNativeArray teamAnchorTransformIndexArray; - internal ExSimpleNativeArray teamDistanceTransformIndexArray; - internal NativeParallelHashMap transformPositionMap; - internal NativeParallelHashMap transformRotationMap; + internal ExSimpleNativeArray teamAnchorTransformIndexArray; + internal ExSimpleNativeArray teamDistanceTransformIndexArray; + internal NativeParallelHashMap transformPositionMap; + internal NativeParallelHashMap transformRotationMap; internal HashSet cameraCullingClothSet = new HashSet(256); @@ -762,10 +764,10 @@ namespace MagicaCloth2 // 作業用 edgeColliderCollisionCountBuff = new NativeReference(Allocator.Persistent); - comp2SuspendCounterMap = new NativeParallelHashMap(256, Allocator.Persistent); - comp2TeamIdMap = new NativeParallelHashMap(256, Allocator.Persistent); - comp2SyncPartnerCompMap = new NativeParallelHashMap(256, Allocator.Persistent); - comp2SyncTopCompMap = new NativeParallelHashMap(256, Allocator.Persistent); + comp2SuspendCounterMap = new NativeParallelHashMap(256, Allocator.Persistent); + comp2TeamIdMap = new NativeParallelHashMap(256, Allocator.Persistent); + comp2SyncPartnerCompMap = new NativeParallelHashMap(256, Allocator.Persistent); + comp2SyncTopCompMap = new NativeParallelHashMap(256, Allocator.Persistent); batchNormalClothTeamList = new NativeList(Allocator.Persistent); batchSplitClothTeamList = new NativeList(Allocator.Persistent); @@ -774,12 +776,12 @@ namespace MagicaCloth2 skipWritingDirtyList = new List(128); cullingDirtyList = new NativeList(128, Allocator.Persistent); selfCollisionUpdateSet = new NativeParallelHashSet(256, Allocator.Persistent); - animatorUpdateModeMap = new NativeParallelHashMap(128, Allocator.Persistent); + animatorUpdateModeMap = new NativeParallelHashMap(128, Allocator.Persistent); - teamAnchorTransformIndexArray = new ExSimpleNativeArray(256, true); - teamDistanceTransformIndexArray = new ExSimpleNativeArray(256, true); - transformPositionMap = new NativeParallelHashMap(32, Allocator.Persistent); - transformRotationMap = new NativeParallelHashMap(32, Allocator.Persistent); + teamAnchorTransformIndexArray = new ExSimpleNativeArray(256, true); + teamDistanceTransformIndexArray = new ExSimpleNativeArray(256, true); + transformPositionMap = new NativeParallelHashMap(32, Allocator.Persistent); + transformRotationMap = new NativeParallelHashMap(32, Allocator.Persistent); // 破棄監視更新処理 MagicaManager.afterUpdateDelegate += MonitoringProcessUpdate; @@ -807,7 +809,7 @@ namespace MagicaCloth2 // この段階でProxyMeshは完成している var team = new TeamData(); - team.componentId = cprocess.cloth.GetInstanceID(); + team.componentId = cprocess.cloth.GetMagicaId(); // ★Enableフラグは立てない team.flag.SetBits(Flag_Valid, true); team.flag.SetBits(Flag_Reset, true); @@ -889,8 +891,8 @@ namespace MagicaCloth2 centerDataArray.Remove(c); // チーム作業バッファをクリア - teamAnchorTransformIndexArray[teamId] = 0; - teamDistanceTransformIndexArray[teamId] = 0; + teamAnchorTransformIndexArray[teamId] = MagicaObjectId.Invalid; + teamDistanceTransformIndexArray[teamId] = MagicaObjectId.Invalid; clothProcessDict.Remove(teamId); } @@ -900,22 +902,39 @@ namespace MagicaCloth2 /// /// /// - public void SetEnable(int teamId, bool sw) + public void SetEnable(ClothProcess cprocess, int teamId, bool sw) { + //Debug.Log($"Set Enable:{sw} F:{Time.frameCount}"); if (isValid == false || teamId == 0) return; ref var team = ref teamDataArray.GetRef(teamId); + + // シミュレーションリセットの有無 + // （同期先を参照） + ClothProcess syncProcess = cprocess.SyncTopCloth ? cprocess.SyncTopCloth.Process : cprocess; + bool isReset = syncProcess.cloth.SerializeData.disableMode == ClothDisableMode.Reset; + team.flag.SetBits(Flag_Enable, sw); - team.flag.SetBits(Flag_Reset, sw); + if (isReset) + team.flag.SetBits(Flag_Reset, sw); + + //Debug.Log($"Set Enable:{sw}, isReset:{isReset} F:{Time.frameCount}"); if (sw) enableTeamSet.Add(teamId); else enableTeamSet.Remove(teamId); - // 無効時には一度のみTransform復元フラグを立てる - if (sw == false) + // 非表示（リセット）の挙動 + if (sw == false && isReset) + { + // 無効時には一度のみTransform復元フラグを立てる team.flag.SetBits(Flag_RestoreTransformOnlyOnec, true); + // Disable時は非表示設定にする + team.flag.SetBits(Flag_CameraCullingInvisible, true); + cprocess.SetState(ClothProcess.State_CameraCullingInvisible, true); + cprocess.cameraCullingOldInvisible = true; + } // コライダーの有効状態（内部でコライダートランスフォームの有効状態も設定） MagicaManager.Collider.EnableTeamCollider(teamId); @@ -1096,12 +1115,12 @@ namespace MagicaCloth2 // 状態変更 if (oldInvisible != invisible) { + //Debug.Log($"Camera culling change. oldInvisible:{oldInvisible} -> invisible:{invisible} F:{Time.frameCount}"); int teamId = cprocess.TeamId; ref var tdata = ref GetTeamDataRef(teamId); tdata.flag.SetBits(Flag_CameraCullingInvisible, invisible); tdata.flag.SetBits(Flag_CameraCullingKeep, false); - //Debug.Log($"Change camera culling invisible:({oldInvisible}) -> ({invisible})"); // cprocessクラスにもコピーする cprocess.SetState(ClothProcess.State_CameraCullingInvisible, invisible); @@ -1193,7 +1212,7 @@ namespace MagicaCloth2 var cloth = cprocess.cloth; // 連動アニメーターのインスタンスID - tdata.interlockingAnimatorId = cprocess.interlockingAnimator != null ? cprocess.interlockingAnimator.GetInstanceID() : 0; + tdata.interlockingAnimatorId = cprocess.interlockingAnimator != null ? cprocess.interlockingAnimator.GetMagicaId() : MagicaObjectId.Invalid; // パラメータ変更 cprocess.SyncParameters(); @@ -1281,7 +1300,7 @@ namespace MagicaCloth2 // 連動アニメーターの更新モード取得 if (cprocess.interlockingAnimator) { - int animatorId = cprocess.interlockingAnimator.GetInstanceID(); + MagicaObjectId animatorId = cprocess.interlockingAnimator.GetMagicaId(); if (animatorUpdateModeMap.ContainsKey(animatorId) == false) { animatorUpdateModeMap.Add(animatorId, (int)cprocess.interlockingAnimator.updateMode); @@ -1295,8 +1314,8 @@ namespace MagicaCloth2 #if true // アンカー参照オブジェクト var anchorTransform = sdata.inertiaConstraint.anchor; - int anchorTransformId = anchorTransform != null ? anchorTransform.GetInstanceID() : 0; - if (anchorTransformId != 0 && transformPositionMap.ContainsKey(anchorTransformId) == false) + MagicaObjectId anchorTransformId = anchorTransform != null ? anchorTransform.GetMagicaId() : MagicaObjectId.Invalid; + if (anchorTransformId.IsValid() && transformPositionMap.ContainsKey(anchorTransformId) == false) { // 参照オブジェクトの座標取得 transformPositionMap.Add(anchorTransformId, anchorTransform.position); @@ -1310,8 +1329,8 @@ namespace MagicaCloth2 } // 距離カリング参照オブジェクト - int distanceObjectId = sdata.cullingSettings.distanceCullingReferenceObject != null ? sdata.cullingSettings.distanceCullingReferenceObject.GetInstanceID() : 0; - if (distanceObjectId != 0 && transformPositionMap.ContainsKey(distanceObjectId) == false) + MagicaObjectId distanceObjectId = sdata.cullingSettings.distanceCullingReferenceObject != null ? sdata.cullingSettings.distanceCullingReferenceObject.GetMagicaId() : MagicaObjectId.Invalid; + if (distanceObjectId.IsValid() && transformPositionMap.ContainsKey(distanceObjectId) == false) { // 参照オブジェクトの座標取得 transformPositionMap.Add(distanceObjectId, sdata.cullingSettings.distanceCullingReferenceObject.transform.position); @@ -1328,7 +1347,8 @@ namespace MagicaCloth2 // メインカメラ座標 bool hasMainCamera = Camera.main != null; float3 mainCameraPosition = Camera.main ? Camera.main.transform.position : 0; - transformPositionMap.Add(0, mainCameraPosition); + //transformPositionMap.Add(0, mainCameraPosition); + transformPositionMap.Add(MagicaObjectId.Invalid, mainCameraPosition); startClothUpdateComponentProfiler.End(); // チーム前処理ジョブ待ち @@ -1426,10 +1446,10 @@ namespace MagicaCloth2 public NativeArray parameterArray; // work - public NativeParallelHashMap comp2SuspendCounterMap; - public NativeParallelHashMap comp2TeamIdMap; - public NativeParallelHashMap comp2SyncPartnerCompMap; - public NativeParallelHashMap comp2SyncTopCompMap; + public NativeParallelHashMap comp2SuspendCounterMap; + public NativeParallelHashMap comp2TeamIdMap; + public NativeParallelHashMap comp2SyncPartnerCompMap; + public NativeParallelHashMap comp2SyncTopCompMap; public NativeParallelHashSet selfCollisionUpdateSet; public NativeReference edgeColliderCollisionCountBuff; @@ -1444,7 +1464,7 @@ namespace MagicaCloth2 if (teamId == 0) continue; - int compId = kv.Key; + MagicaObjectId compId = kv.Key; ref var tdata = ref *(tt + teamId); // 作業フラグをクリア ------------------------------------- @@ -1462,7 +1482,7 @@ namespace MagicaCloth2 // 同期相手の有効状態 if (comp2SyncPartnerCompMap.ContainsKey(compId)) { - int syncCompId = comp2SyncPartnerCompMap[compId]; + MagicaObjectId syncCompId = comp2SyncPartnerCompMap[compId]; if (comp2TeamIdMap.ContainsKey(syncCompId)) { int syncTeamId = comp2TeamIdMap[syncCompId]; @@ -1486,7 +1506,7 @@ namespace MagicaCloth2 tdata.syncTeamId = 0; if (comp2SyncPartnerCompMap.ContainsKey(compId)) { - int syncCompId = comp2SyncPartnerCompMap[compId]; + MagicaObjectId syncCompId = comp2SyncPartnerCompMap[compId]; if (comp2TeamIdMap.ContainsKey(syncCompId)) { int syncTeamId = comp2TeamIdMap[syncCompId]; @@ -1543,7 +1563,7 @@ namespace MagicaCloth2 int syncTopTeamId = 0; if (comp2SyncTopCompMap.ContainsKey(compId)) { - int syncTopCompId = comp2SyncTopCompMap[compId]; + MagicaObjectId syncTopCompId = comp2SyncTopCompMap[compId]; if (comp2TeamIdMap.ContainsKey(syncTopCompId)) { syncTopTeamId = comp2TeamIdMap[syncTopCompId]; @@ -1618,13 +1638,13 @@ namespace MagicaCloth2 public bool hasMainCamera; // work - public NativeParallelHashMap comp2TeamIdMap; - public NativeParallelHashMap comp2SyncTopCompMap; - public NativeParallelHashMap animatorUpdateModeMap; - public NativeArray teamAnchorTransformIndexArray; - public NativeArray teamDistanceTransformIndexArray; - public NativeParallelHashMap transformPositionMap; - public NativeParallelHashMap transformRotationMap; + public NativeParallelHashMap comp2TeamIdMap; + public NativeParallelHashMap comp2SyncTopCompMap; + public NativeParallelHashMap animatorUpdateModeMap; + public NativeArray teamAnchorTransformIndexArray; + public NativeArray teamDistanceTransformIndexArray; + public NativeParallelHashMap transformPositionMap; + public NativeParallelHashMap transformRotationMap; public NativeList cullingDirtyList; public NativeList batchNormalClothTeamList; @@ -1640,7 +1660,7 @@ namespace MagicaCloth2 for (int teamId = 1; teamId < teamCount; teamId++) { var tdata = teamDataArray[teamId]; - int compId = tdata.componentId; + MagicaObjectId compId = tdata.componentId; if (tdata.IsEnable == false) continue; if (tdata.flag.IsSet(Flag_SyncSuspend)) @@ -1658,14 +1678,14 @@ namespace MagicaCloth2 } // アンカー - int anchorTransformIndex = teamAnchorTransformIndexArray[teamId]; + MagicaObjectId anchorTransformIndex = teamAnchorTransformIndexArray[teamId]; bool oldAnchor = tdata.flag.IsSet(Flag_Anchor); - bool newAnchor = anchorTransformIndex != 0; + bool newAnchor = anchorTransformIndex.IsValid(); tdata.flag.SetBits(Flag_Anchor, newAnchor); tdata.flag.SetBits(Flag_AnchorReset, oldAnchor != newAnchor); var cdata = centerDataArray[teamId]; - cdata.anchorPosition = anchorTransformIndex != 0 ? transformPositionMap[anchorTransformIndex] : float3.zero; - cdata.anchorRotation = anchorTransformIndex != 0 ? transformRotationMap[anchorTransformIndex] : quaternion.identity; + cdata.anchorPosition = anchorTransformIndex.IsValid() ? transformPositionMap[anchorTransformIndex] : float3.zero; + cdata.anchorRotation = anchorTransformIndex.IsValid() ? transformRotationMap[anchorTransformIndex] : quaternion.identity; centerDataArray[teamId] = cdata; // 距離カリング判定 @@ -1681,7 +1701,7 @@ namespace MagicaCloth2 int syncTopTeamId = 0; if (comp2SyncTopCompMap.ContainsKey(compId)) { - int syncTopCompId = comp2SyncTopCompMap[compId]; + MagicaObjectId syncTopCompId = comp2SyncTopCompMap[compId]; if (comp2TeamIdMap.ContainsKey(syncTopCompId)) { syncTopTeamId = comp2TeamIdMap[syncTopCompId]; @@ -1690,7 +1710,7 @@ namespace MagicaCloth2 if (tdata.originalUpdateMode == ClothUpdateMode.AnimatorLinkage || syncTopTeamId > 0) { var originalUpdateMode = tdata.originalUpdateMode; - int animatorId = tdata.interlockingAnimatorId; + MagicaObjectId animatorId = tdata.interlockingAnimatorId; if (syncTopTeamId > 0) { var syncTeamData = teamDataArray[syncTopTeamId]; @@ -1876,7 +1896,7 @@ namespace MagicaCloth2 { // 距離カリング有効 // 距離判定 - int transformId = teamDistanceTransformIndexArray[teamId]; + MagicaObjectId transformId = teamDistanceTransformIndexArray[teamId]; if (transformPositionMap.ContainsKey(transformId)) { // 現在コンポーネント位置(pos)は同期を取っていない diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs.meta index 421ea5123..b84577435 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamWindData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamWindData.cs.meta index b68a89d22..f36854187 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamWindData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamWindData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/Team/TeamWindData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs index 2db22b552..75bd6ed46 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs @@ -70,17 +70,17 @@ namespace MagicaCloth2 /// /// トランスフォームのインスタンスID /// - internal ExSimpleNativeArray idArray; + internal ExSimpleNativeArray idArray; /// /// 親トランスフォームのインスタンスID(0=なし) /// - internal ExSimpleNativeArray parentIdArray; + internal ExSimpleNativeArray parentIdArray; /// /// BoneClothのルートトランスフォームIDリスト /// - internal List rootIdList; + internal List rootIdList; /// /// Transformリストに変更があったかどうか @@ -114,8 +114,8 @@ namespace MagicaCloth2 { // 領域のみ確保する transformList = new List(capacity); - idArray = new ExSimpleNativeArray(capacity, true); - parentIdArray = new ExSimpleNativeArray(capacity, true); + idArray = new ExSimpleNativeArray(capacity, true); + parentIdArray = new ExSimpleNativeArray(capacity, true); flagArray = new ExSimpleNativeArray(capacity, true); initLocalPositionArray = new ExSimpleNativeArray(capacity, true); initLocalRotationArray = new ExSimpleNativeArray(capacity, true); @@ -163,10 +163,12 @@ namespace MagicaCloth2 /// すでに登録済みの同じトランスフォームがある場合はそのインデックスを返す /// /// - /// 0の場合はTransformからGetInstanceId()を即時設定する + /// Invalidの場合はTransformからGetInstanceId()を即時設定する + /// 不要ならInvalid /// /// - public int AddTransform(Transform t, int tid = 0, int pid = 0, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) + //public int AddTransform(Transform t, int tid = 0, int pid = 0, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) + public int AddTransform(Transform t, MagicaObjectId tid, MagicaObjectId pid, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) { int index; @@ -183,11 +185,11 @@ namespace MagicaCloth2 { index = emptyStack.Dequeue(); transformList[index] = t; - if (tid == 0) + if (tid.IsValid() == false) { // Transformからデータを取得（メインスレッドのみ） - idArray[index] = t.GetInstanceID(); - parentIdArray[index] = t.parent ? t.parent.GetInstanceID() : 0; + idArray[index] = t.GetMagicaId(); + parentIdArray[index] = t.parent ? t.parent.GetMagicaId() : MagicaObjectId.Invalid; initLocalPositionArray[index] = t.localPosition; initLocalRotationArray[index] = t.localRotation; positionArray[index] = t.position; @@ -218,11 +220,11 @@ namespace MagicaCloth2 { index = Count; transformList.Add(t); - if (tid == 0) + if (tid.IsValid() == false) { // Transformからデータを取得（メインスレッドのみ） - idArray.Add(t.GetInstanceID()); - parentIdArray.Add(t.parent ? t.parent.GetInstanceID() : 0); + idArray.Add(t.GetMagicaId()); + parentIdArray.Add(t.parent ? t.parent.GetMagicaId() : MagicaObjectId.Invalid); initLocalPositionArray.Add(t.localPosition); initLocalRotationArray.Add(t.localRotation); positionArray.Add(t.position); @@ -260,11 +262,12 @@ namespace MagicaCloth2 /// すでに登録済みの同じトランスフォームがある場合はそのインデックスを返す /// /// トランスフォーム記録クラス - /// 親のインスタンスID + /// 親のインスタンスID。なければInvalid /// /// 重複チェックの有無 /// - public int AddTransform(TransformRecord record, int pid = 0, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) + //public int AddTransform(TransformRecord record, int pid = 0, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) + public int AddTransform(TransformRecord record, MagicaObjectId pid, byte flag = TransformManager.Flag_Read, bool checkDuplicate = true) { int index; @@ -335,8 +338,8 @@ namespace MagicaCloth2 } // 新規追加 - int id = srcData.idArray[srcIndex]; - int pid = srcData.parentIdArray[srcIndex]; + MagicaObjectId id = srcData.idArray[srcIndex]; + MagicaObjectId pid = srcData.parentIdArray[srcIndex]; var initPos = srcData.initLocalPositionArray[srcIndex]; var initRot = srcData.initLocalRotationArray[srcIndex]; var pos = srcData.positionArray[srcIndex]; @@ -389,7 +392,7 @@ namespace MagicaCloth2 /// /// /// - public int[] AddTransformRange(List tlist, List idList, List pidList, int copyCount = 0) + public int[] AddTransformRange(List tlist, List idList, List pidList, int copyCount = 0) { //int tcnt = tlist.Count; int tcnt = copyCount > 0 ? copyCount : tlist.Count; @@ -434,8 +437,8 @@ namespace MagicaCloth2 Debug.Assert(stdata != null); return AddTransformRange( stdata.transformList, - new List(stdata.idArray.ToArray()), - new List(stdata.parentIdArray.ToArray()), + new List(stdata.idArray.ToArray()), + new List(stdata.parentIdArray.ToArray()), copyCount ); } @@ -453,9 +456,9 @@ namespace MagicaCloth2 /// public int[] AddTransformRange( List tlist, - List idList, - List pidList, - List rootIds, + List idList, + List pidList, + List rootIds, NativeArray localPositions, NativeArray localRotations, NativeArray positions, @@ -482,7 +485,7 @@ namespace MagicaCloth2 if (rootIds != null && rootIds.Count > 0) { if (rootIdList == null) - rootIdList = new List(rootIds); + rootIdList = new List(rootIds); else rootIdList.AddRange(rootIds); } @@ -522,20 +525,22 @@ namespace MagicaCloth2 /// Transform単体を追加する(tidを指定するならスレッド可） /// /// - /// 0の場合はTransformからGetInstanceId()を即時設定する + /// Invalidの場合はTransformからGetInstanceId()を即時設定する + /// 不要ならInvalid /// /// - public int ReplaceTransform(int index, Transform t, int tid = 0, int pid = 0, byte flag = TransformManager.Flag_Read) + //public int ReplaceTransform(int index, Transform t, int tid = 0, int pid = 0, byte flag = TransformManager.Flag_Read) + public int ReplaceTransform(int index, Transform t, MagicaObjectId tid, MagicaObjectId pid, byte flag = TransformManager.Flag_Read) { Debug.Assert(index < Count); transformList[index] = t; flagArray[index] = new ExBitFlag8(flag); - if (tid == 0) + if (tid.IsValid() == false) { // Transformからデータを取得（メインスレッドのみ） - idArray[index] = t.GetInstanceID(); - parentIdArray[index] = t.parent ? t.parent.GetInstanceID() : 0; + idArray[index] = t.GetMagicaId(); + parentIdArray[index] = t.parent ? t.parent.GetMagicaId() : MagicaObjectId.Invalid; initLocalPositionArray[index] = t.localPosition; initLocalRotationArray[index] = t.localRotation; positionArray[index] = t.position; @@ -840,8 +845,8 @@ namespace MagicaCloth2 // 新しい領域 var newTransformList = new List(newTransformCount); - var newTransformIdArray = new ExSimpleNativeArray(newTransformCount); - var newParentIdArray = new ExSimpleNativeArray(newTransformCount); + var newTransformIdArray = new ExSimpleNativeArray(newTransformCount); + var newParentIdArray = new ExSimpleNativeArray(newTransformCount); var newFlagArray = new ExSimpleNativeArray(newTransformCount); var newInitLocalPositionArray = new ExSimpleNativeArray(newTransformCount); var newInitLocalRotationArray = new ExSimpleNativeArray(newTransformCount); @@ -910,7 +915,7 @@ namespace MagicaCloth2 /// /// /// -1=見つからない - public int GetTransformIndexFormId(int id) + public int GetTransformIndexFormId(MagicaObjectId id) { var array = idArray.GetNativeArray(); int cnt = Count; @@ -922,12 +927,12 @@ namespace MagicaCloth2 return -1; } - public int GetTransformIdFromIndex(int index) + public MagicaObjectId GetTransformIdFromIndex(int index) { return idArray[index]; } - public int GetParentIdFromIndex(int index) + public MagicaObjectId GetParentIdFromIndex(int index) { return parentIdArray[index]; } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs.meta index 1da997286..d5a47ba62 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs index 79d9f3011..8b5b47ebe 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs @@ -79,7 +79,7 @@ namespace MagicaCloth2 } } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (transformArray != null) { @@ -88,8 +88,8 @@ namespace MagicaCloth2 var t = transformArray[i]; if (t) { - int id = t.GetInstanceID(); - if (id != 0 && replaceDict.ContainsKey(id)) + MagicaObjectId id = t.GetMagicaId(); + if (id.IsValid() && replaceDict.ContainsKey(id)) { transformArray[i] = replaceDict[id]; } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs.meta index 40d168a27..55335583f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformDataSerialization.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformManager.cs.meta index ea49c6d67..79e379c15 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs index 6918139b4..737b144ac 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs @@ -12,7 +12,7 @@ namespace MagicaCloth2 public class TransformRecord : IValid, ITransform { public Transform transform; - public int id; + public MagicaObjectId id; public Vector3 localPosition; public Quaternion localRotation; public Vector3 position; @@ -20,14 +20,14 @@ namespace MagicaCloth2 public Vector3 scale; // lossy scale public Matrix4x4 localToWorldMatrix; public Matrix4x4 worldToLocalMatrix; - public int pid; + public MagicaObjectId pid; public TransformRecord(Transform t, bool read) { if (t) { transform = t; - id = t.GetInstanceID(); + id = t.GetMagicaId(); if (read) { @@ -41,7 +41,7 @@ namespace MagicaCloth2 } if (t.parent) - pid = t.parent.GetInstanceID(); + pid = t.parent.GetMagicaId(); } } @@ -52,7 +52,7 @@ namespace MagicaCloth2 public bool IsValid() { - return id != 0; + return id.IsValid(); } public void GetUsedTransform(HashSet transformSet) @@ -60,18 +60,18 @@ namespace MagicaCloth2 transformSet.Add(transform); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { if (replaceDict.ContainsKey(id)) { var t = replaceDict[id]; transform = t; - id = transform.GetInstanceID(); + id = transform.GetMagicaId(); } if (replaceDict.ContainsKey(pid)) { var t = replaceDict[pid]; - pid = t.GetInstanceID(); + pid = t.GetMagicaId(); } } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs.meta index 11f770701..431d27aa6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecord.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs index df3990ca1..5fb330798 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs @@ -72,10 +72,10 @@ namespace MagicaCloth2 transformSet.Add(transform); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { - int id = transform != null ? transform.GetInstanceID() : 0; - if (id != 0 && replaceDict.ContainsKey(id)) + MagicaObjectId id = transform != null ? transform.GetMagicaId() : MagicaObjectId.Invalid; + if (id.IsValid() && replaceDict.ContainsKey(id)) transform = replaceDict[id]; } } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs.meta index e140620f0..3ca253ffe 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/TransformManager/TransformRecordSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/VirtualMesh/VirtualMeshManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/VirtualMesh/VirtualMeshManager.cs.meta index ddbda2d7e..44891ef4b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/VirtualMesh/VirtualMeshManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/VirtualMesh/VirtualMeshManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Manager/VirtualMesh/VirtualMeshManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildScriptableObject.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildScriptableObject.cs.meta index 6054abcba..9e67f272c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildScriptableObject.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildScriptableObject.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildScriptableObject.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs index 78f76562e..ec3ccac3a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs @@ -93,7 +93,7 @@ namespace MagicaCloth2 uniquePreBuildData.GetUsedTransform(transformSet); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { uniquePreBuildData.ReplaceTransform(replaceDict); } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs.meta index 2269e73cd..cc7168a28 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/PreBuildSerializeData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/SharePreBuildData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/SharePreBuildData.cs.meta index 6c05a4edc..7a7cd9623 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/SharePreBuildData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/SharePreBuildData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/SharePreBuildData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs index af90e07c2..b700c559a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs @@ -39,7 +39,7 @@ namespace MagicaCloth2 renderMeshList.ForEach(x => x?.GetUsedTransform(transformSet)); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { renderSetupDataList.ForEach(x => x?.ReplaceTransform(replaceDict)); proxyMesh?.ReplaceTransform(replaceDict); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs.meta index a89d1d4f3..837c998eb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/PreBuild/UniquePreBuildData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionSettings.cs.meta index 398f6669d..06678308c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionWorkData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionWorkData.cs.meta index ef39668ac..744ba7270 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionWorkData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionWorkData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ReductionWorkData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SameDistanceReduction.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SameDistanceReduction.cs.meta index 9e1cdfcab..0916be21e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SameDistanceReduction.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SameDistanceReduction.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SameDistanceReduction.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ShapeDistanceReduction.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ShapeDistanceReduction.cs.meta index d7ac5c086..669b105f6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ShapeDistanceReduction.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ShapeDistanceReduction.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/ShapeDistanceReduction.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SimpleDistanceReduction.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SimpleDistanceReduction.cs.meta index a08c234ac..78847d92a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SimpleDistanceReduction.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SimpleDistanceReduction.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/SimpleDistanceReduction.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/StepReductionBase.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/StepReductionBase.cs.meta index 2072e1022..03d19b78b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/StepReductionBase.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/StepReductionBase.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Reduction/StepReductionBase.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/ClothDebugSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/ClothDebugSettings.cs.meta index e12a826d3..e202c0a41 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/ClothDebugSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/ClothDebugSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/ClothDebugSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/VirtualMeshDebugSettings.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/VirtualMeshDebugSettings.cs.meta index 9f930d3c2..b505414e5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/VirtualMeshDebugSettings.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/VirtualMeshDebugSettings.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Settings/VirtualMeshDebugSettings.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/DataUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/DataUtility.cs.meta index f59705287..01c45459b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/DataUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/DataUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/DataUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs new file mode 100644 index 000000000..8e9ab68a5 --- /dev/null +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs @@ -0,0 +1,98 @@ +// Magica Cloth 2. +// Copyright (c) 2026 MagicaSoft. +// https://magicasoft.jp +using System; +using UnityEngine; + +namespace MagicaCloth2 +{ + /// + /// Unityのバージョン差異（InstanceID vs EntityId）を吸収するID構造体。 + /// 現在はUnity6.4以上でEntityIdに切り替え + /// + public readonly struct MagicaObjectId : IEquatable + { + // ------------------------------------------------------- + // 内部データ保持 + // ------------------------------------------------------- +#if UNITY_6000_4_OR_NEWER + private readonly EntityId _value; + + public MagicaObjectId(EntityId id) + { + _value = id; + } + + // 無効なIDの定義（EntityIdの仕様に合わせる） + public static readonly MagicaObjectId Invalid = new(EntityId.None); + + public bool IsValid() => _value.IsValid(); + +#else + private readonly int _value; + + public MagicaObjectId(int id) + { + _value = id; + } + + // 従来のInstanceIDでは0が事実上の無効値として扱われることが多い + public static readonly MagicaObjectId Invalid = new MagicaObjectId(0); + + public bool IsValid() => _value != 0; +#endif + + public bool Equals(MagicaObjectId other) + { + return _value.Equals(other._value); + } + + public override bool Equals(object obj) + { + return obj is MagicaObjectId other && Equals(other); + } + + public override int GetHashCode() + { + return _value.GetHashCode(); + } + + public static bool operator ==(MagicaObjectId left, MagicaObjectId right) + { + return left.Equals(right); + } + + public static bool operator !=(MagicaObjectId left, MagicaObjectId right) + { + return !left.Equals(right); + } + + // これはデバッグ用途以外では使わない + public override string ToString() + { + return _value.ToString(); + } + } + + // ------------------------------------------------------- + // 拡張メソッド + // ------------------------------------------------------- + public static class MagicaObjectIdExtensions + { + /// + /// GameObjectやComponentからバージョンに合わせたIDを取得する + /// + public static MagicaObjectId GetMagicaId(this UnityEngine.Object obj) + { + if (obj == null) return MagicaObjectId.Invalid; + +#if UNITY_6000_4_OR_NEWER + // Unity 6.4 API + return new MagicaObjectId(obj.GetEntityId()); +#else + // 従来の API + return new MagicaObjectId(obj.GetInstanceID()); +#endif + } + } +} diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs.meta similarity index 51% rename from Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs.meta rename to Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs.meta index 78b119ab1..caddb0a6b 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor/EditorProperty.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6efd34a11308a746bf9a43556eb283b +guid: 527929c5c74a0224b91228de398467f3 MonoImporter: externalObjects: {} serializedVersion: 2 @@ -11,8 +11,8 @@ MonoImporter: assetBundleVariant: AssetOrigin: serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Le Tai's Asset/Common/Editor/EditorProperty.cs - uploadId: 824068 + productId: 242307 + packageName: Magica Cloth 2 + packageVersion: 2.18.1 + assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MagicaObjectId.cs + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MultiDataBuilder.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MultiDataBuilder.cs.meta index 9968c0b03..64f941054 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MultiDataBuilder.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MultiDataBuilder.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Data/MultiDataBuilder.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Grid/GridMap.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Grid/GridMap.cs.meta index 808f8fa0e..5f30c4958 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Grid/GridMap.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Grid/GridMap.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Grid/GridMap.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/InterlockUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/InterlockUtility.cs.meta index 5db19418a..37071e32e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/InterlockUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/InterlockUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/InterlockUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/JobUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/JobUtility.cs.meta index db393324c..5d5b288e6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/JobUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/JobUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Jobs/JobUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/AABB.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/AABB.cs.meta index bbfadd94c..4727dc444 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/AABB.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/AABB.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/AABB.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/IntAABB.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/IntAABB.cs.meta index ae1a66d78..dd14cd5b5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/IntAABB.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/IntAABB.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/IntAABB.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathExtensions.cs.meta index 8ae9d4009..2919f8241 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathUtility.cs.meta index 36aa87b42..93921a5c5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MathUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MinimumData.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MinimumData.cs.meta index 4a529bdc4..a87a775f5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MinimumData.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MinimumData.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Math/MinimumData.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Mesh/MeshUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Mesh/MeshUtility.cs.meta index bf750dccc..cc9bc3130 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Mesh/MeshUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Mesh/MeshUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Mesh/MeshUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/Develop.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/Develop.cs.meta index f381f1130..fe4d07410 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/Develop.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/Develop.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/Develop.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/StaticStringBuilder.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/StaticStringBuilder.cs.meta index 18b53bc4e..77b31e267 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/StaticStringBuilder.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/StaticStringBuilder.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Misc/StaticStringBuilder.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/DataChunk.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/DataChunk.cs.meta index 759668f96..563d8e311 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/DataChunk.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/DataChunk.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/DataChunk.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag16.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag16.cs.meta index 02ac3abd8..31544f558 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag16.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag16.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag16.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag8.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag8.cs.meta index 34a4ecfd0..31f744a1d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag8.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag8.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExBitFlag8.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList1.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList1.cs.meta index 9f822f3f5..6b2f34f95 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList1.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList1.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList1.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList4.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList4.cs.meta index d6a3e0b2c..48c5b10ad 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList4.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList4.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExCostSortedList4.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExNativeArray.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExNativeArray.cs.meta index 1af18180a..edf11fff6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExNativeArray.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExNativeArray.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExNativeArray.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExProcessingList.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExProcessingList.cs.meta index 27ab5559e..5c8094e29 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExProcessingList.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExProcessingList.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExProcessingList.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExSimpleNativeArray.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExSimpleNativeArray.cs.meta index 878a69320..3c8cf0f45 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExSimpleNativeArray.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExSimpleNativeArray.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExSimpleNativeArray.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs index a5e944877..19bd0a80d 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs @@ -31,17 +31,17 @@ namespace MagicaCloth2 /// /// 使用インデックス辞書 /// - Dictionary useIndexDict; + Dictionary useIndexDict; /// /// トランスフォームインデックス辞書 /// - Dictionary indexDict; + Dictionary indexDict; /// /// トランスフォーム参照カウンタ辞書 /// - Dictionary referenceDict; + Dictionary referenceDict; //========================================================================================= public ExTransformAccessArray(int capacity, int desiredJobCount = -1) @@ -50,9 +50,9 @@ namespace MagicaCloth2 nativeLength = transformArray.length; emptyStack = new Queue(capacity); - useIndexDict = new Dictionary(capacity); - indexDict = new Dictionary(capacity); - referenceDict = new Dictionary(capacity); + useIndexDict = new Dictionary(capacity); + indexDict = new Dictionary(capacity); + referenceDict = new Dictionary(capacity); } public void Dispose() @@ -84,7 +84,7 @@ namespace MagicaCloth2 { int index = 0; - int id = element.GetInstanceID(); + MagicaObjectId id = element.GetMagicaId(); if (referenceDict.ContainsKey(id)) { @@ -122,7 +122,7 @@ namespace MagicaCloth2 { if (useIndexDict.ContainsKey(index)) { - int id = useIndexDict[index]; + MagicaObjectId id = useIndexDict[index]; int cnt = referenceDict[id] - 1; if (cnt > 0) { @@ -150,7 +150,7 @@ namespace MagicaCloth2 { if (element == null) return false; - return indexDict.ContainsKey(element.GetInstanceID()); + return indexDict.ContainsKey(element.GetMagicaId()); } /// @@ -187,7 +187,7 @@ namespace MagicaCloth2 { if (element == null) return -1; - int id = element.GetInstanceID(); + MagicaObjectId id = element.GetMagicaId(); if (indexDict.ContainsKey(id)) return indexDict[id]; else diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs.meta index ff45301a3..310873e10 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/ExTransformAccessArray.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList128BytesExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList128BytesExtensions.cs.meta index 6704e930b..c9d01e593 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList128BytesExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList128BytesExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList128BytesExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList32BytesExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList32BytesExtensions.cs.meta index 6f5b466ed..c8ac7f498 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList32BytesExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList32BytesExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList32BytesExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList4096BytesExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList4096BytesExtensions.cs.meta index d83bcd2a5..c527fc9ad 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList4096BytesExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList4096BytesExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList4096BytesExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList512BytesExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList512BytesExtensions.cs.meta index ee08c146b..d03536771 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList512BytesExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList512BytesExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList512BytesExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList64BytesExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList64BytesExtensions.cs.meta index 32bce5c02..19086b24c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList64BytesExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList64BytesExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/FixedList64BytesExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeArrayExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeArrayExtensions.cs.meta index 99901eba1..3040d2967 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeArrayExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeArrayExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeArrayExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeMultiHashMapExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeMultiHashMapExtensions.cs.meta index 7b0bdcba1..349a5f90e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeMultiHashMapExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeMultiHashMapExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeMultiHashMapExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeParallelHashMapExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeParallelHashMapExtensions.cs.meta index e61dcdc77..c01c41b71 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeParallelHashMapExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeParallelHashMapExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeParallelHashMapExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeReferenceExtensions.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeReferenceExtensions.cs.meta index 16c4baa57..b407919e7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeReferenceExtensions.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeReferenceExtensions.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/NativeCollection/NativeReferenceExtensions.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/Exception.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/Exception.cs.meta index 72e3447ad..d2dd58d5e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/Exception.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/Exception.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/Exception.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/ResultCode.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/ResultCode.cs.meta index e056acc80..7d385de45 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/ResultCode.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/ResultCode.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/ResultCode/ResultCode.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/TimeSpan.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/TimeSpan.cs.meta index a7e6b9fb7..f46f83c6b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/TimeSpan.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/TimeSpan.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/TimeSpan.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/UnityTimeSpan.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/UnityTimeSpan.cs.meta index 9ee955a3b..74948f2c7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/UnityTimeSpan.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/UnityTimeSpan.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Utility/Time/UnityTimeSpan.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs index 9dce1e097..01b44bde7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs @@ -518,7 +518,7 @@ namespace MagicaCloth2 { // Mesh接続 // トランスフォームIDからインデックスへの辞書を作成 - var idToIndexDict = new Dictionary(vcnt); + var idToIndexDict = new Dictionary(vcnt); for (int i = 0; i < vcnt; i++) { if (idToIndexDict.ContainsKey(rsetup.transformIdList[i]) == false) @@ -533,7 +533,7 @@ namespace MagicaCloth2 || rsetup.boneConnectionMode == RenderSetupData.BoneConnectionMode.SequentialNonLoopMesh; // ルートリスト - var rootTransformIdList = new List(rsetup.rootTransformIdList); // copy + var rootTransformIdList = new List(rsetup.rootTransformIdList); // copy int rootCnt = rootTransformIdList.Count; const int firstRootIndex = 0; int lastRootIndex = rootCnt - 1; @@ -541,24 +541,24 @@ namespace MagicaCloth2 // オート接続の場合はルート同士が最近接点になるように並べ替える if (rsetup.boneConnectionMode == RenderSetupData.BoneConnectionMode.AutomaticMesh) { - var tempRootIdList = new List(rootTransformIdList); + var tempRootIdList = new List(rootTransformIdList); rootTransformIdList.Clear(); rootTransformIdList.Add(tempRootIdList[0]); float lastDist = 0; while (tempRootIdList.Count > 0) { - int rootId = rootTransformIdList[rootTransformIdList.Count - 1]; + MagicaObjectId rootId = rootTransformIdList[rootTransformIdList.Count - 1]; tempRootIdList.Remove(rootId); int vindex = idToIndexDict[rootId]; var pos = localPositions[vindex]; // next connection float minDist = float.MaxValue; - int minId = 0; + MagicaObjectId minId = MagicaObjectId.Invalid; for (int i = 0; i < tempRootIdList.Count; i++) { - int rootId2 = tempRootIdList[i]; + MagicaObjectId rootId2 = tempRootIdList[i]; int vindex2 = idToIndexDict[rootId2]; var pos2 = localPositions[vindex2]; @@ -570,7 +570,7 @@ namespace MagicaCloth2 } } - if (minId != 0) + if (minId.IsValid()) { if (lastDist == 0 || minDist < lastDist * 1.5f) { @@ -589,8 +589,8 @@ namespace MagicaCloth2 // 最初と最後のルート距離が平均以下ならばループ接続にする if (rootTransformIdList.Count >= 3) { - int rootId1 = rootTransformIdList[0]; - int rootId2 = rootTransformIdList[rootTransformIdList.Count - 1]; + MagicaObjectId rootId1 = rootTransformIdList[0]; + MagicaObjectId rootId2 = rootTransformIdList[rootTransformIdList.Count - 1]; int vindex1 = idToIndexDict[rootId1]; int vindex2 = idToIndexDict[rootId2]; var pos1 = localPositions[vindex1]; @@ -619,7 +619,7 @@ namespace MagicaCloth2 var mainEdgeSet = new HashSet(); // メインエッジ // まずトランスフォームの親子関係に接続 - var stack = new Stack(vcnt); + var stack = new Stack(vcnt); var lvstack = new Stack(vcnt); for (int i = 0; i < rootCnt; i++) { @@ -630,7 +630,7 @@ namespace MagicaCloth2 while (stack.Count > 0) { - int id = stack.Pop(); + MagicaObjectId id = stack.Pop(); int lv = lvstack.Pop(); int vindex = idToIndexDict[id]; var pos = localPositions[vindex]; @@ -644,7 +644,7 @@ namespace MagicaCloth2 var link = new FixedList128Bytes(); // parent - int pid = rsetup.transformParentIdList[vindex]; + MagicaObjectId pid = rsetup.transformParentIdList[vindex]; if (idToIndexDict.ContainsKey(pid)) { int vindex2 = idToIndexDict[pid]; @@ -661,7 +661,7 @@ namespace MagicaCloth2 { for (int j = 0; j < clist.Length; j++) { - int cid = clist[j]; + MagicaObjectId cid = clist[j]; stack.Push(cid); lvstack.Push(lv + 1); @@ -1706,8 +1706,11 @@ namespace MagicaCloth2 /// メッシュの基準トランスフォームを設定する（メインスレッドのみ） /// /// - /// - public void SetTransform(Transform center, Transform skinRoot = null, int centerId = 0, int skinRootId = 0) + /// 不要ならnull + /// 不要ならInvalid + /// 不要ならInvalid + //public void SetTransform(Transform center, Transform skinRoot = null, int centerId = 0, int skinRootId = 0) + public void SetTransform(Transform center, Transform skinRoot, MagicaObjectId centerId, MagicaObjectId skinRootId) { SetCenterTransform(center, centerId); if (skinRoot != null) @@ -1729,9 +1732,9 @@ namespace MagicaCloth2 /// public void SetTransform(TransformRecord centerRecord, TransformRecord skinRootRecord = null) { - centerTransformIndex = transformData.AddTransform(centerRecord); + centerTransformIndex = transformData.AddTransform(centerRecord, MagicaObjectId.Invalid); if (skinRootRecord != null) - skinRootIndex = transformData.AddTransform(skinRootRecord); + skinRootIndex = transformData.AddTransform(skinRootRecord, MagicaObjectId.Invalid); else skinRootIndex = centerTransformIndex; @@ -1743,34 +1746,36 @@ namespace MagicaCloth2 initScale = centerRecord.scale; } - public void SetCenterTransform(Transform t, int tid = 0) + //public void SetCenterTransform(Transform t, int tid = 0) + public void SetCenterTransform(Transform t, MagicaObjectId tid) { if (t) { // すでに存在する場合は入れ替え if (centerTransformIndex >= 0) { - transformData.ReplaceTransform(centerTransformIndex, t, tid); + transformData.ReplaceTransform(centerTransformIndex, t, tid, MagicaObjectId.Invalid); } else { - centerTransformIndex = transformData.AddTransform(t, tid); + centerTransformIndex = transformData.AddTransform(t, tid, MagicaObjectId.Invalid); } } } - public void SetSkinRoot(Transform t, int tid = 0) + //public void SetSkinRoot(Transform t, int tid = 0) + public void SetSkinRoot(Transform t, MagicaObjectId tid) { if (t) { // すでに存在する場合は入れ替え if (skinRootIndex >= 0) { - transformData.ReplaceTransform(skinRootIndex, t, tid); + transformData.ReplaceTransform(skinRootIndex, t, tid, MagicaObjectId.Invalid); } else { - skinRootIndex = transformData.AddTransform(t, tid); + skinRootIndex = transformData.AddTransform(t, tid, MagicaObjectId.Invalid); } } } @@ -1801,7 +1806,7 @@ namespace MagicaCloth2 // ボーンの登録。スキニング用ボーンとしても登録。 index = skinBoneTransformIndices.Count; - int tindex = transformData.AddTransform(rd, checkDuplicate: false); // 重複ありで最後に追加する + int tindex = transformData.AddTransform(rd, pid: MagicaObjectId.Invalid, checkDuplicate: false); // 重複ありで最後に追加する skinBoneTransformIndices.Add(tindex); var bindPose = math.mul(rd.worldToLocalMatrix, initLocalToWorld); // bind pose skinBoneBindPoses.Add(bindPose); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs.meta index 05a45b0fd..97273cf80 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs index b6e54fc01..9b069fb6b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs @@ -382,7 +382,7 @@ namespace MagicaCloth2 [Unity.Collections.ReadOnly] public NativeArray boneWeights; [Unity.Collections.ReadOnly] - public NativeArray transformIds; + public NativeArray transformIds; [Unity.Collections.WriteOnly] public NativeArray attributes; @@ -396,7 +396,7 @@ namespace MagicaCloth2 [Unity.Collections.ReadOnly] public NativeArray proxyBoneWeights; [Unity.Collections.ReadOnly] - public NativeArray proxyTransformIds; + public NativeArray proxyTransformIds; // out [Unity.Collections.WriteOnly] @@ -414,7 +414,7 @@ namespace MagicaCloth2 Debug.Assert(bw.IsValid); // もっともウエイトが重いボーンのハッシュ - int boneId = transformIds[bw.boneIndices[0]]; + MagicaObjectId boneId = transformIds[bw.boneIndices[0]]; // グリッド範囲を検索する @@ -441,7 +441,7 @@ namespace MagicaCloth2 bool hasBone = false; for (int j = 0; j < tbw.Count && hasBone == false; j++) { - int tboneId = proxyTransformIds[tbw.boneIndices[j]]; + MagicaObjectId tboneId = proxyTransformIds[tbw.boneIndices[j]]; if (tboneId == boneId) hasBone = true; } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs.meta index 34963853c..38b1c015f 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs index 26b879a8c..588785339 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs @@ -94,8 +94,11 @@ namespace MagicaCloth2 if (edgeToTriangleList.ContainsKey(edge)) { var tlist = edgeToTriangleList[edge]; - tlist.MC2Set(i); - edgeToTriangleList[edge] = tlist; + if (tlist.Length < tlist.Capacity) // Capacity check + { + tlist.MC2Set(i); + edgeToTriangleList[edge] = tlist; + } } else { diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs.meta index 4231dd2f8..e955f78c4 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs index c0e50e084..e702ff617 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs @@ -1937,7 +1937,7 @@ namespace MagicaCloth2 // トランスフォーム情報から親子関係を構築する // parent - var idToIndexDict = new Dictionary(vcnt); + var idToIndexDict = new Dictionary(vcnt); var idArray = transformData.idArray.GetNativeArray(); var parentIdArray = transformData.parentIdArray.GetNativeArray(); for (int i = 0; i < vcnt; i++) @@ -1946,7 +1946,7 @@ namespace MagicaCloth2 } for (int index = 0; index < vcnt; index++) { - int pid = parentIdArray[index]; + MagicaObjectId pid = parentIdArray[index]; if (idToIndexDict.ContainsKey(pid)) vertexParentIndices[index] = idToIndexDict[pid]; else @@ -1971,7 +1971,7 @@ namespace MagicaCloth2 var startIndices = new List(rootCount); var dataCounts = new List(rootCount); var indices = new List(vcnt); - foreach (int id in transformData.rootIdList) + foreach (MagicaObjectId id in transformData.rootIdList) { // ルートからTransformを走査して最初の移動ポイントを持つ固定を起点とする rootStack.Clear(); @@ -2153,7 +2153,7 @@ namespace MagicaCloth2 vertexLocalRotations[vindex] = lrot; // 親とのゼロ距離判定。フラグを立てる - if(MathUtility.IsZeroDistance(lpos)) + if (MathUtility.IsZeroDistance(lpos)) { var flag = attributes[vindex]; flag.SetFlag(VertexAttribute.Flag_ZeroDistance, true); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs.meta index 195193a92..902875a85 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs.meta index 53861c77d..752b57834 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs index 5d775927d..6a223f469 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs @@ -267,7 +267,7 @@ namespace MagicaCloth2 transformData?.GetUsedTransform(transformSet); } - public void ReplaceTransform(Dictionary replaceDict) + public void ReplaceTransform(Dictionary replaceDict) { transformData?.ReplaceTransform(replaceDict); } diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs.meta index 23e82e7e4..c22c60a20 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs.meta index 67b459467..457fd70d6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs.meta index 6efb80522..9278e4004 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs.meta index 512b36f97..1c8a03cc7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs.meta index 38db20cc5..f02d33afd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs.meta index f2cef66f2..74dec543e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs.meta index 3d70b8737..2b87d38bf 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs.meta index 7a3d5b6f1..6c3c37883 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs.meta index b871b2a54..bf3b4a830 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothAssetPostprocessor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothAssetPostprocessor.cs.meta index 331b67474..368738911 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothAssetPostprocessor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothAssetPostprocessor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothAssetPostprocessor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs index d45f33eb1..0ae6a1bf9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs @@ -38,9 +38,9 @@ namespace MagicaCloth2 public ClothInitSerializeData editInitSerializeData; } - static Dictionary editClothDict = new Dictionary(); + static Dictionary editClothDict = new Dictionary(); - static List destroyList = new List(); + static List destroyList = new List(); static List drawList = new List(); static CancellationTokenSource cancelToken = new CancellationTokenSource(); @@ -170,7 +170,7 @@ namespace MagicaCloth2 if (ClothPainter.IsPainting()) return; - int id = component.GetInstanceID(); + MagicaObjectId id = component.GetMagicaId(); MagicaCloth cloth = component as MagicaCloth; //if (cloth) @@ -273,7 +273,7 @@ namespace MagicaCloth2 return null; if (comp == null) return null; - int id = comp.GetInstanceID(); + MagicaObjectId id = comp.GetMagicaId(); VirtualMeshContainer cmesh = null; lock (editClothDict) { @@ -291,7 +291,7 @@ namespace MagicaCloth2 { if (comp == null) return ResultCode.Empty; - int id = comp.GetInstanceID(); + MagicaObjectId id = comp.GetMagicaId(); lock (editClothDict) { if (editClothDict.ContainsKey(id)) @@ -435,7 +435,7 @@ namespace MagicaCloth2 /// /// /// - static async Task CreateOrUpdateEditMesh(int id, MagicaCloth cloth, CancellationToken ct) + static async Task CreateOrUpdateEditMesh(MagicaObjectId id, MagicaCloth cloth, CancellationToken ct) { // ■メインスレッド Develop.DebugLog($"Create and update edit meshes: {cloth.name}"); @@ -554,7 +554,7 @@ namespace MagicaCloth2 if (sdata.clothType == ClothProcess.ClothType.MeshCloth) { // MeshClothではクロストランスフォームを追加しておく - editMesh.SetTransform(cloth.ClothTransform); + editMesh.SetTransform(cloth.ClothTransform, null, MagicaObjectId.Invalid, MagicaObjectId.Invalid); } editMesh.result.SetProcess(); @@ -850,7 +850,7 @@ namespace MagicaCloth2 { if (cloth == null) return; - int id = cloth.GetInstanceID(); + MagicaObjectId id = cloth.GetMagicaId(); if (editClothDict.ContainsKey(id) == false) return; @@ -924,7 +924,7 @@ namespace MagicaCloth2 var connectionMode = sdata.clothType == ClothProcess.ClothType.BoneSpring ? RenderSetupData.BoneConnectionMode.Line : sdata.connectionMode; var setupType = sdata.clothType == ClothProcess.ClothType.BoneSpring ? RenderSetupData.SetupType.BoneSpring : RenderSetupData.SetupType.BoneCloth; using var setup = new RenderSetupData(null, setupType, cloth.ClothTransform, sdata.rootBones, null, connectionMode, cloth.name); - foreach (int id in setup.rootTransformIdList) + foreach (MagicaObjectId id in setup.rootTransformIdList) { int rootIndex = setup.GetTransformIndexFromId(id); selectionData.attributes[rootIndex] = VertexAttribute.Fixed; diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs.meta index d25d21d55..51f7512c7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorManager.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorUtility.cs.meta index 9191710ec..8b792dafa 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothEditorUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothInspectorUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothInspectorUtility.cs.meta index fbb9057cf..81169ee46 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothInspectorUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothInspectorUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothInspectorUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPainter.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPainter.cs.meta index d0df9ccbf..78f3e1192 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPainter.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPainter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPainter.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPresetUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPresetUtility.cs.meta index 7ec8573c3..d23d4d2dc 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPresetUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPresetUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/ClothPresetUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaCapsuleColliderEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaCapsuleColliderEditor.cs.meta index 24b9a9778..69c03281e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaCapsuleColliderEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaCapsuleColliderEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaCapsuleColliderEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs index d0ba8d3be..6a0e6ec47 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs @@ -320,7 +320,10 @@ namespace MagicaCloth2 EditorGUILayout.Space(); if (sync == false) + { EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.updateMode")); + EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.disableMode")); + } else { // 同期中は操作不可 @@ -331,6 +334,11 @@ namespace MagicaCloth2 EditorGUILayout.LabelField("Update Mode"); EditorGUILayout.LabelField("(Synchronizing)"); } + using (new EditorGUILayout.HorizontalScope()) + { + EditorGUILayout.LabelField("Disable Mode"); + EditorGUILayout.LabelField("(Synchronizing)"); + } } } EditorGUILayout.PropertyField(serializedObject.FindProperty("serializeData.animationPoseRatio")); diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs.meta index fc27e6cd3..607f01fb0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaClothEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaEditorBase.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaEditorBase.cs.meta index 373642421..90c592a74 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaEditorBase.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaEditorBase.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaEditorBase.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaPlaneColliderEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaPlaneColliderEditor.cs.meta index e9095a322..911770bc3 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaPlaneColliderEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaPlaneColliderEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaPlaneColliderEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs.meta index 2eabb0190..e67dcc9e8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSettingsEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSphereColliderEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSphereColliderEditor.cs.meta index e5388382d..8e007e82b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSphereColliderEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSphereColliderEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaSphereColliderEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaWindZoneEditor.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaWindZoneEditor.cs.meta index e0ff0eb59..696343f81 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaWindZoneEditor.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaWindZoneEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/MagicaWindZoneEditor.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/VirtualMeshEditorUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/VirtualMeshEditorUtility.cs.meta index 87a2baf92..a7b9587ee 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/VirtualMeshEditorUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/VirtualMeshEditorUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Cloth/VirtualMeshEditorUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs index 3ad75a9c1..8145c04c2 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs @@ -14,7 +14,7 @@ namespace MagicaCloth2 [SerializeField] private Texture2D image = null; - public const string MagicaClothVersion = "2.17.0"; + public const string MagicaClothVersion = "2.18.1"; public static AboutMenu AboutWindow { get; set; } private const float windowWidth = 300; diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs.meta index bfd24af5f..eeeec07dd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs.meta @@ -15,6 +15,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/AboutMenu.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CheckSliderSerializeDataDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CheckSliderSerializeDataDrawer.cs.meta index c9b78219f..731dde4eb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CheckSliderSerializeDataDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CheckSliderSerializeDataDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CheckSliderSerializeDataDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CurveSerializeDataDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CurveSerializeDataDrawer.cs.meta index ddc5fa7e2..a29162e2b 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CurveSerializeDataDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CurveSerializeDataDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/CurveSerializeDataDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs index 27c42915d..6cf496ba3 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs @@ -16,10 +16,19 @@ namespace MagicaCloth2 static DrawIconInHierarchy() { +#if UNITY_6000_4_OR_NEWER + EditorApplication.hierarchyWindowItemByEntityIdOnGUI += DrawIcon; +#else EditorApplication.hierarchyWindowItemOnGUI += DrawIcon; +#endif } + //static void DrawIcon(int instanceId, Rect rect) +#if UNITY_6000_4_OR_NEWER + static void DrawIcon(EntityId instanceId, Rect rect) +#else static void DrawIcon(int instanceId, Rect rect) +#endif { rect.width = iconSize; #if UNITY_6000_3_OR_NEWER diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs.meta index 8c0bb6d7b..6e02f2eab 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/DrawIconInHierarchy.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/MenuItemScript.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/MenuItemScript.cs.meta index ac3d2f61c..16ee334c0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/MenuItemScript.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/MenuItemScript.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/MenuItemScript.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/SharePreBuildDataDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/SharePreBuildDataDrawer.cs.meta index 9d783ced1..af3eff7fb 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/SharePreBuildDataDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/SharePreBuildDataDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/EditorExtension/SharePreBuildDataDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/GizmoUtility.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/GizmoUtility.cs.meta index 133ef1d65..77574ea1a 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/GizmoUtility.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/GizmoUtility.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/GizmoUtility.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaCapsuleColliderGizmoDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaCapsuleColliderGizmoDrawer.cs.meta index 4b840b42f..a8fee77cd 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaCapsuleColliderGizmoDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaCapsuleColliderGizmoDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaCapsuleColliderGizmoDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaClothGizmoDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaClothGizmoDrawer.cs.meta index d00b36cf3..69af846b7 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaClothGizmoDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaClothGizmoDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaClothGizmoDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaPlaneColliderGizmoDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaPlaneColliderGizmoDrawer.cs.meta index ab0b372a6..07352303c 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaPlaneColliderGizmoDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaPlaneColliderGizmoDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaPlaneColliderGizmoDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaSphereColliderGizmoDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaSphereColliderGizmoDrawer.cs.meta index 4226c4b0b..9d6a387b9 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaSphereColliderGizmoDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaSphereColliderGizmoDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaSphereColliderGizmoDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaWindZoneGizmoDrawer.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaWindZoneGizmoDrawer.cs.meta index fbb742916..4331219c3 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaWindZoneGizmoDrawer.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaWindZoneGizmoDrawer.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/Gizmos/MagicaWindZoneGizmoDrawer.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/MagicaCloth2.Editor.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/MagicaCloth2.Editor.asmdef.meta index 32addb666..edff32bf5 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/MagicaCloth2.Editor.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/MagicaCloth2.Editor.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/MagicaCloth2.Editor.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs index a645eaf01..9f14b404e 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs @@ -335,7 +335,7 @@ namespace MagicaCloth2 selectionData.Fill(VertexAttribute.Move); // 次にルートのみ固定 - foreach (int id in boneClothSetupData.rootTransformIdList) + foreach (MagicaObjectId id in boneClothSetupData.rootTransformIdList) { int rootIndex = boneClothSetupData.GetTransformIndexFromId(id); selectionData.attributes[rootIndex] = VertexAttribute.Fixed; diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs.meta index d6f6330a9..d1b6970ae 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/PreBuild/PreBuildDataCreation.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/MagicaCloth2UPMImporterBurst.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/MagicaCloth2UPMImporterBurst.asmdef.meta index 35a7dbcc3..c2004f5f6 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/MagicaCloth2UPMImporterBurst.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/MagicaCloth2UPMImporterBurst.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/MagicaCloth2UPMImporterBurst.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/UnityPackageImporter.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/UnityPackageImporter.cs.meta index 24faf4a63..a0c5ab7e8 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/UnityPackageImporter.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/UnityPackageImporter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Burst/UnityPackageImporter.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/MagicaCloth2UPMImporterCollections.asmdef.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/MagicaCloth2UPMImporterCollections.asmdef.meta index 62325c983..922a432c0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/MagicaCloth2UPMImporterCollections.asmdef.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/MagicaCloth2UPMImporterCollections.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/MagicaCloth2UPMImporterCollections.asmdef - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/UnityPackageImporter.cs.meta b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/UnityPackageImporter.cs.meta index 27b53f0fc..0350024b0 100644 --- a/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/UnityPackageImporter.cs.meta +++ b/Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/UnityPackageImporter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 242307 packageName: Magica Cloth 2 - packageVersion: 2.17.0 + packageVersion: 2.18.1 assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Editor/UnityPackageImporter/Collections/UnityPackageImporter.cs - uploadId: 829902 + uploadId: 893596 diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index 58c72f7f0..f5d2b85ca 100644 --- a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -57,10 +57,6 @@ MonoBehaviour: - JeffGrawAssets.FlexibleUI.Runtime - LeanCommon - LeanPool - - LeTai.Asset.TranslucentImage - - LeTai.Common - - LeTai.Paraform.Scaffold - - LeTai.TranslucentImage.UniversalRP - MagicaCloth2Example - MagicaClothV2 - Opsive.BehaviorDesigner.AddOns.FormationsPack.Runtime diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Materials/DemoMeshParticles.mat.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Materials/DemoMeshParticles.mat.meta index e88ba36e5..c2dafa47b 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Materials/DemoMeshParticles.mat.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Materials/DemoMeshParticles.mat.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Materials/DemoMeshParticles.mat - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Prefabs/BlurDemoParticleSystem.prefab.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Prefabs/BlurDemoParticleSystem.prefab.meta index e9c8f0e59..1e23510fd 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Prefabs/BlurDemoParticleSystem.prefab.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Prefabs/BlurDemoParticleSystem.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Prefabs/BlurDemoParticleSystem.prefab - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset index f3dec5437..488b4d484 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset @@ -27,8 +27,8 @@ MonoBehaviour: sampleDistance: 1.5 referenceResolution: 1080 hqResample: 0 - blurAdditionalDistancePerIteration: 1 - ditherStrength: 0.25 + blurAdditionalDistancePerIteration: 0 + ditherStrength: 0 brightness: 0 contrast: 0 vibrancy: -0.598 @@ -52,7 +52,7 @@ MonoBehaviour: brightness: 0 contrast: 0 vibrancy: -0.598 - tint: {r: 0, g: 0, b: 0, a: 0} + tint: {r: 1, g: 1, b: 1, a: 1} - downscaleSections: - algorithmIdx: 3 iterations: 2 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset.meta index 3610dea97..aa071d678 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset1.asset - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset2.asset.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset2.asset.meta index f4879b64f..7c937f928 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset2.asset.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset2.asset.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset2.asset - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset3.asset.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset3.asset.meta index ff27fe384..db9d9ab6b 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset3.asset.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset3.asset.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Presets/DemoPreset3.asset - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity index ee0c37d5f..340645427 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity @@ -3922,6 +3922,63 @@ MonoBehaviour: additionalBlurPadding: 0 tryBatchWithSimilar: 1 fillEntireRenderTexture: 0 +--- !u!1 &420740351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420740353} + - component: {fileID: 420740352} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &420740352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420740351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3046180979db9c64ea39dcdc5a901c8a, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkInitializer + InitializationSettings: {fileID: 11400000, guid: 9c702a6546260e64cbc09606c7b98de9, type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + engineLogging: 0 +--- !u!4 &420740353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420740351} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &429017133 GameObject: m_ObjectHideFlags: 0 @@ -9931,7 +9988,7 @@ GameObject: - component: {fileID: 926385315} - component: {fileID: 926385314} - component: {fileID: 926385316} - - component: {fileID: 926385313} + - component: {fileID: 926385317} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -9939,26 +9996,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &926385313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926385312} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &926385314 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10001,6 +10038,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5cbfd76c5632a574ea827a1b858e16a3, type: 3} m_Name: m_EditorClassIdentifier: JeffGrawAssets.FlexibleUI.Runtime::JeffGrawAssets.FlexibleUI.InputManagerReplacer +--- !u!114 &926385317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926385312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &959605917 GameObject: m_ObjectHideFlags: 0 @@ -10401,8 +10469,9 @@ GameObject: m_Component: - component: {fileID: 961739753} - component: {fileID: 961739752} - - component: {fileID: 961739751} - component: {fileID: 961739750} + - component: {fileID: 961739755} + - component: {fileID: 961739754} m_Layer: 0 m_Name: Camera m_TagString: MainCamera @@ -10427,7 +10496,7 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 0 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 @@ -10454,14 +10523,6 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 ---- !u!81 &961739751 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961739749} - m_Enabled: 1 --- !u!20 &961739752 Camera: m_ObjectHideFlags: 0 @@ -10530,6 +10591,46 @@ Transform: - {fileID: 819963500} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &961739754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961739749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad482e3373334964bae675bc7b51aa85, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener + isDefaultListener: 1 + bOverrideScalingFactor: 0 + scalingFactor: -1 + listenerId: 0 +--- !u!114 &961739755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961739749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08c6f13482881574cb053132489e15ca, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj + m_listeners: + initialListenerList: [] + useDefaultListeners: 1 + isEnvironmentAware: 0 + isStaticObject: 0 + usePositionOffsetData: 0 + m_positionOffsetData: + KeepMe: 0 + positionOffset: {x: 0, y: 0, z: 0} + scalingFactor: 1 + m_posOffsetData: {fileID: 0} + listenerMask: 1 --- !u!1 &967242023 GameObject: m_ObjectHideFlags: 0 @@ -20876,7 +20977,6 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_UseReflectionProbes: 0 m_AdditionalShaderChannelsFlag: 7 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -23000,3 +23100,4 @@ SceneRoots: - {fileID: 926385315} - {fileID: 2031444752} - {fileID: 681775934} + - {fileID: 420740353} diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity.meta index a7fc4deaf..eb327f213 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/BatchedBlurs.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Controller.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Controller.unity.meta index a038f0b40..2b40a710a 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Controller.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Controller.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Controller.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Dithering.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Dithering.unity.meta index 0b5b3f82a..791bb4aa5 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Dithering.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Dithering.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Dithering.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Padding.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Padding.unity.meta index 87db4ec7d..8e1ddabb5 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Padding.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Padding.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Blur Padding.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Diverse Blurs.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Diverse Blurs.unity.meta index f9a21aab1..30434bdbb 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Diverse Blurs.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Diverse Blurs.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Diverse Blurs.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Masked Blur.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Masked Blur.unity.meta index 1388b99a1..5d176e619 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Masked Blur.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Masked Blur.unity.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Masked Blur.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Single Camera UI Preserving Blur.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Single Camera UI Preserving Blur.unity.meta index b10a0e992..1104b31fd 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Single Camera UI Preserving Blur.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Single Camera UI Preserving Blur.unity.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Single Camera UI Preserving Blur.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Multi Camera.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Multi Camera.unity.meta index de0126d34..a8307b2c0 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Multi Camera.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Multi Camera.unity.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Multi Camera.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Shared Camera.unity.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Shared Camera.unity.meta index ca5fd5e66..2c593c86e 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Shared Camera.unity.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Shared Camera.unity.meta @@ -9,7 +9,7 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scenes/Stacked Blur Shared Camera.unity - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scripts/DemoBlurController.cs.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scripts/DemoBlurController.cs.meta index 42330b460..69a9ecd87 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scripts/DemoBlurController.cs.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scripts/DemoBlurController.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Scripts/DemoBlurController.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/CircleFade.png.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/CircleFade.png.meta index e27897252..e8a8ef503 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/CircleFade.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/CircleFade.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/CircleFade.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedCorners.png.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedCorners.png.meta index 7d46d7757..52f4281c2 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedCorners.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedCorners.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedCorners.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedReticle.png.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedReticle.png.meta index 97106aa48..8e7613c98 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedReticle.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedReticle.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/RoundedReticle.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderBackground.png.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderBackground.png.meta index 612ade947..a167c6b45 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderBackground.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderBackground.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderBackground.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderHandle.png.meta b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderHandle.png.meta index 32f76031d..eb556bf84 100644 --- a/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderHandle.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderHandle.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/FlexibleBlur/Textures/SliderHandle.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Prefabs/DemoSceneCommon.prefab.meta b/Assets/Plugins/FlexibleUI/Demos/Prefabs/DemoSceneCommon.prefab.meta index 244475d0d..cb26dc99a 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Prefabs/DemoSceneCommon.prefab.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Prefabs/DemoSceneCommon.prefab.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Prefabs/DemoSceneCommon.prefab - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Scripts/DemoSceneControl.cs.meta b/Assets/Plugins/FlexibleUI/Demos/Scripts/DemoSceneControl.cs.meta index 770087efc..62a6d3ee9 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Scripts/DemoSceneControl.cs.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Scripts/DemoSceneControl.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Scripts/DemoSceneControl.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Scripts/InputModuleReplacer.cs.meta b/Assets/Plugins/FlexibleUI/Demos/Scripts/InputModuleReplacer.cs.meta index 610ce9a86..d984afbf4 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Scripts/InputModuleReplacer.cs.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Scripts/InputModuleReplacer.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Scripts/InputModuleReplacer.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Scripts/SimpleFPSCounter.cs.meta b/Assets/Plugins/FlexibleUI/Demos/Scripts/SimpleFPSCounter.cs.meta index 06989e450..ff5b3375c 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Scripts/SimpleFPSCounter.cs.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Scripts/SimpleFPSCounter.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Scripts/SimpleFPSCounter.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Textures/Background0.png.meta b/Assets/Plugins/FlexibleUI/Demos/Textures/Background0.png.meta index 1c863c0fa..67c67cea0 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Textures/Background0.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Textures/Background0.png.meta @@ -129,6 +129,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Textures/Background0.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Textures/Background1.png.meta b/Assets/Plugins/FlexibleUI/Demos/Textures/Background1.png.meta index 0c2961977..a5b3b9472 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Textures/Background1.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Textures/Background1.png.meta @@ -129,6 +129,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Textures/Background1.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Demos/Textures/Background2.png.meta b/Assets/Plugins/FlexibleUI/Demos/Textures/Background2.png.meta index e02bcde1d..a1d932361 100644 --- a/Assets/Plugins/FlexibleUI/Demos/Textures/Background2.png.meta +++ b/Assets/Plugins/FlexibleUI/Demos/Textures/Background2.png.meta @@ -132,6 +132,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Demos/Textures/Background2.png - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/EditorHelpers.cs.meta b/Assets/Plugins/FlexibleUI/Editor/EditorHelpers.cs.meta index 5328e0801..3e2271ab5 100644 --- a/Assets/Plugins/FlexibleUI/Editor/EditorHelpers.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/EditorHelpers.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/EditorHelpers.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurPresetEditor.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurPresetEditor.cs.meta index ff7d748fb..6c9aa6069 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurPresetEditor.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurPresetEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurPresetEditor.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurReferenceProviderEditor.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurReferenceProviderEditor.cs.meta index 8f60b7bfe..d026cc141 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurReferenceProviderEditor.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurReferenceProviderEditor.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurReferenceProviderEditor.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurredImageEditor.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurredImageEditor.cs.meta index cdd895d2e..60fa72383 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurredImageEditor.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurredImageEditor.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/BlurredImageEditor.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/DemoSceneFeatureCheckWindow.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/DemoSceneFeatureCheckWindow.cs.meta index daf21b1d6..564c12041 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/DemoSceneFeatureCheckWindow.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/DemoSceneFeatureCheckWindow.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/DemoSceneFeatureCheckWindow.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureBuildHelper.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureBuildHelper.cs.meta index e66fd9183..14afa74b2 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureBuildHelper.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureBuildHelper.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureBuildHelper.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureEditor.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureEditor.cs.meta index a9df74078..c1d7b5fb1 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureEditor.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureEditor.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurFeatureEditor.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurMenuItems.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurMenuItems.cs.meta index 54a5c17f7..4da86d555 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurMenuItems.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurMenuItems.cs.meta @@ -14,6 +14,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/FlexibleBlurMenuItems.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/UIBlurEditor.cs.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/UIBlurEditor.cs.meta index 7382d9214..c5ca85e7a 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/UIBlurEditor.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/UIBlurEditor.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleBlur/UIBlurEditor.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/FlexibleUI.Editor.asmdef.meta b/Assets/Plugins/FlexibleUI/Editor/FlexibleUI.Editor.asmdef.meta index 0fd59cb8e..97e984644 100644 --- a/Assets/Plugins/FlexibleUI/Editor/FlexibleUI.Editor.asmdef.meta +++ b/Assets/Plugins/FlexibleUI/Editor/FlexibleUI.Editor.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/FlexibleUI.Editor.asmdef - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/MenuItemCommon.cs.meta b/Assets/Plugins/FlexibleUI/Editor/MenuItemCommon.cs.meta index e1559e4aa..31e2c8195 100644 --- a/Assets/Plugins/FlexibleUI/Editor/MenuItemCommon.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/MenuItemCommon.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/MenuItemCommon.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/Editor/PresetSavePath.cs.meta b/Assets/Plugins/FlexibleUI/Editor/PresetSavePath.cs.meta index cf9b29ef7..c15be1616 100644 --- a/Assets/Plugins/FlexibleUI/Editor/PresetSavePath.cs.meta +++ b/Assets/Plugins/FlexibleUI/Editor/PresetSavePath.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/Editor/PresetSavePath.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FilledMeshHelper.cs.meta b/Assets/Plugins/FlexibleUI/FilledMeshHelper.cs.meta index 2bfe9e676..1bab4104d 100644 --- a/Assets/Plugins/FlexibleUI/FilledMeshHelper.cs.meta +++ b/Assets/Plugins/FlexibleUI/FilledMeshHelper.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FilledMeshHelper.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf.meta index e1bda1984..b8958e812 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/FlexibleBlur Manual.pdf - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute.meta index 32e5f1b57..17a67175f 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/ComputeBlurs.compute - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants.meta index 5a009b1f8..937a06598 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants.meta @@ -10,6 +10,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/FlexibleBlurIncludedShaders.shadervariants - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute.meta index e959a7ab7..99908e757 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Resources/VRComputeBlurs.compute - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs.meta index 4001d7778..43a58d3e9 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurAlgorithms.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs.meta index 432706b6d..a8f677bc5 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurPreset.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs.meta index b4880f749..b7a891bcc 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurReferenceProvider.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs.meta index ea70e5149..8caee1830 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs.meta @@ -4,6 +4,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/BlurredImage.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs.meta index 97c065f87..65530b6a3 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurFeature.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs index fb8e5d0f9..fe33f0e9c 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs @@ -35,7 +35,7 @@ public partial class FlexibleBlurPass blurLayerAdddedThisFrame = false; var cameraData = frameData.Get(); - if (cameraData.isPreviewCamera) + if (cameraData.isPreviewCamera || cameraData.isSceneViewCamera) return; var camera = cameraData.camera; diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs.meta index 2cd80c98d..9f36f062b 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/FlexibleBlurRenderGraph.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs.meta index d43b80cf3..c9761d6e9 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/IBlur.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs.meta index 945267458..a4ff38ced 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/PooledDictionary.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs.meta index 0c6b55398..b500ca7a5 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlur.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs index 2fbbfa3a4..c05e406ca 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs @@ -169,7 +169,7 @@ public class UIBlurCommon { hasCachedBlur = false; - if (!PresentInBlurList || prevKey.prevCamera == null || !blurDict.TryGetValue(prevKey, out var blurList)) + if (!PresentInBlurList || !blurDict.TryGetValue(prevKey, out var blurList)) { prevKey = (null, 0); PresentInBlurList = false; @@ -297,7 +297,7 @@ public class UIBlurCommon var key = GetCameraFeatureKey(canvas); var camera = key.camera; - if (!camera) + if (!camera || !canvas || !canvas.isActiveAndEnabled || !rectTransform.gameObject.activeInHierarchy) { RemoveFromBlurList(); return; diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs.meta index 9466919fe..2b8966c63 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs.meta @@ -13,6 +13,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Scripts/UIBlurCommon.cs - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader.meta index 80c45ce08..dd059d519 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader.meta @@ -11,6 +11,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/BlurredImage.shader - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader.meta index f0a9d8861..92af5c833 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader.meta @@ -11,6 +11,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/Blurs.shader - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader.meta index ac2cf3c92..42b31b9c4 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader.meta @@ -11,6 +11,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/FullScreenBlits.shader - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader.meta index 36ab795c6..3db202e41 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader.meta @@ -11,6 +11,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/QuadBlits.shader - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader.meta b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader.meta index ce3f28d4f..bbc7241e5 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader.meta @@ -11,6 +11,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleBlur/Shaders/RegionalBlits.shader - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Plugins/FlexibleUI/FlexibleUI.Runtime.asmdef.meta b/Assets/Plugins/FlexibleUI/FlexibleUI.Runtime.asmdef.meta index ebc716809..3ec08831c 100644 --- a/Assets/Plugins/FlexibleUI/FlexibleUI.Runtime.asmdef.meta +++ b/Assets/Plugins/FlexibleUI/FlexibleUI.Runtime.asmdef.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 338648 packageName: Flexible Blur - UI Blur Framework That Solves Hard Problems - packageVersion: 1.2.4 + packageVersion: 1.2.5 assetPath: Assets/Plugins/FlexibleUI/FlexibleUI.Runtime.asmdef - uploadId: 919710 + uploadId: 923130 diff --git a/Assets/Prefabs/MainGame/Characters/Automata/M1_Suppression_Centurion/M1_Suppression_Centurion.prefab b/Assets/Prefabs/MainGame/Characters/Automata/M1_Suppression_Centurion/M1_Suppression_Centurion.prefab index 64f1493da..d37050c7c 100644 --- a/Assets/Prefabs/MainGame/Characters/Automata/M1_Suppression_Centurion/M1_Suppression_Centurion.prefab +++ b/Assets/Prefabs/MainGame/Characters/Automata/M1_Suppression_Centurion/M1_Suppression_Centurion.prefab @@ -1517,6 +1517,26 @@ MonoBehaviour: - Name: effectRenderMaterials Entry: 6 Data: + - Name: particleEffects + Entry: 7 + Data: 2|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UnityEngine.ParticleSystem, + UnityEngine.ParticleSystemModule]], mscorlib + - Name: comparer + Entry: 7 + Data: 3|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: owner: {fileID: 7539845505866570745} baseRenderers: - {fileID: 5886335589259091668} @@ -2005,7 +2025,7 @@ MonoBehaviour: m_ValueHashes: m_LongValueHashes: 5876362df79b58fa30b77c28f48d1b2966cb3cf98c4bd96480f6501333363a66622a4da7e5588b5847627e5c3afba34a431ec8427602143adb21fc73562f2ad1e70d134b43612340368f67491458c65f8129accc2c4c083fd645c95eb0bbc7b61c5572c0895bd6766ae7290690860d27c528606748edf45031652e63901252dc8bd81d57a4beb285f2d1e30d37bbae2526b08a6a821f9f2a6044497b9d60b43c92c725a062ede7e6ed879e35824db4b354b56b7fb4b0f0f62bc879d0959b2dbfd4647e5c3afba34a9c2a345d7602143a0415006c562f2ad13839ef5443612340d5bb10932558c65f621ddb161d4c083f2188f949d593c7b6ff61051ab85bd676b5d3d51990860d271a1c9c7848edf450ee51d27c901252dc54ece148a4beb2852de51f1237bbae25f9847675821f9f2abf70b5649d60b43c4df3d9bf62ede7e632b3622a824db4b38b819760b4b0f0f6f4fc85cf959b2dbf61677e5c3afba34a3527305d7602143aad18046c562f2ad19134eb5443612340d0842b952558c65f6722e0101d4c083f6041a013da93c7b6fa5e3e1cb85bd6761cded11990860d27b311987848edf450475cd67c901252dcfde1e548a4beb28584e81b1237bbae2550897275821f9f2a167db1649d60b43ce4feddbf62ede7e69bbe662a824db4b3228c9360b4b0f0f65df181cf959b2dbfe4a06bb554569d8946fff10c773614c9 m_ValuePositions: 00000000010000000300000005000000070000000b0000003700000038000000390000003900000039000000390000003a0000003e0000004b0000004c0000004c000000500000005100000052000000530000005400000055000000590000005a000000860000008700000088000000880000008800000088000000890000008d0000009a0000009b0000009b0000009f000000a0000000a1000000a2000000a3000000a4000000a8000000a9000000d5000000d6000000d7000000d7000000d7000000d7000000d8000000dc000000e9000000ea000000ea000000ee000000ef000000f0000000f1000000f2000000f3000000f7000000f8000000f8000000 - m_Values: 01260024002700030000004369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423000cdcccc3d00010101010000c03f014369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423100cdcccc3d00010101010000c03f014369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423200cdcccc3d00010101010000c03f0100000000 + m_Values: 01260024002700030000004369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423000cdcccc3d00010101010000c03f014369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423100cdcccc3d00010101010000c03f014369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d010000ffffffff436f6d626f41747461636b423200cdcccc3d01010101010000c03f0100000000 m_UnityObjects: [] m_Version: 3.4 - m_ObjectType: Opsive.BehaviorDesigner.Runtime.Tasks.Actions.StackedAction @@ -2768,7 +2788,7 @@ MonoBehaviour: m_Version: 3.4 m_DisabledEventNodesData: [] m_DisabledLogicNodesData: [] - m_UniqueID: 655478830 + m_UniqueID: 432928133 m_LogicNodePropertiesData: - m_ObjectType: Opsive.GraphDesigner.Runtime.LogicNodeProperties m_ValueHashes: @@ -3040,7 +3060,7 @@ MonoBehaviour: m_ValueHashes: m_LongValueHashes: bc124df8ef5e104cf36ca30dee0de9958dd19827f48d1b29bd8814239a1bb7642f6406e2580d1e294f869cc9196b0c27aea3bc2e18d5b803ad9c17c154400885163a23b3ea21de23a034c7c2b541f015557e981535906112a98ff48b9e8a66b37f542abda0a249c23a7f01b1f88d1a7b27e688e1c35df93adc72f165a743d2e04173f165a743d2e0f671f165a743d2e0 m_ValuePositions: 00000000240000002c00000030000000360000003600000046000000470000004b0000004f00000053000000530000005500000057000000580000005c00000088000000b4000000 - m_Values: 37633230313834302d313133382d343036342d393364632d66303432343732623034383681e12dc5ccf937450000dc42436f6d626f4200000000000000000000000000000000000000000000000000000000002400270000030000004369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d4369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d4369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d + m_Values: 37633230313834302d313133382d343036342d393364632d66303432343732623034383692e92dc5ccf937450000dc42436f6d626f4200000000000000000000000000000000000000000000000000000000002400270000030000004369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d4369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d4369656c6f6e6f732e4d61696e47616d652e436861726163746572732e41492e506c617946756e63416e696d m_UnityObjects: [] m_Version: 3.4 - m_ObjectType: Opsive.GraphDesigner.Runtime.LogicNodeProperties diff --git a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/DualHarmony/Data/DualHarmony_FunctionData.asset b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/DualHarmony/Data/DualHarmony_FunctionData.asset index 1b61d5013..480384ad1 100644 --- a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/DualHarmony/Data/DualHarmony_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/DualHarmony/Data/DualHarmony_FunctionData.asset @@ -24,7 +24,7 @@ MonoBehaviour: SerializationNodes: - Name: functionUnits Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemFunctionUnit, + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp]], mscorlib - Name: comparer Entry: 7 @@ -44,22 +44,40 @@ MonoBehaviour: Data: LightAttack - Name: $v Entry: 7 - Data: 2|Cielonos.MainGame.Inventory.ItemFunctionUnit, Assembly-CSharp + Data: 2|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: - Name: operation Entry: 7 Data: 3|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 0 - Name: - Entry: 1 - Data: LMB + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 - Name: Entry: 13 Data: @@ -72,13 +90,13 @@ MonoBehaviour: - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -95,22 +113,40 @@ MonoBehaviour: Data: HeavyAttack - Name: $v Entry: 7 - Data: 4|Cielonos.MainGame.Inventory.ItemFunctionUnit, Assembly-CSharp + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: - Name: operation Entry: 7 - Data: 5|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 0 - Name: - Entry: 1 - Data: RMB + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 - Name: Entry: 13 Data: @@ -123,13 +159,13 @@ MonoBehaviour: - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -144,3 +180,136 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 9|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: LightAttack + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 10|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 11|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 12|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: HeavyAttack + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 14|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/FutureWand/Data/FutureWand_FunctionData.asset b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/FutureWand/Data/FutureWand_FunctionData.asset index e9f8001d8..a6347b3d2 100644 --- a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/FutureWand/Data/FutureWand_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/FutureWand/Data/FutureWand_FunctionData.asset @@ -24,7 +24,7 @@ MonoBehaviour: SerializationNodes: - Name: functionUnits Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemFunctionUnit, + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp]], mscorlib - Name: comparer Entry: 7 @@ -44,13 +44,22 @@ MonoBehaviour: Data: LightAttack - Name: $v Entry: 7 - Data: 2|Cielonos.MainGame.Inventory.ItemFunctionUnit, Assembly-CSharp + Data: 2|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: - Name: operation Entry: 7 Data: 3|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib @@ -66,19 +75,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 0 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -95,13 +107,22 @@ MonoBehaviour: Data: HeavyAttack - Name: $v Entry: 7 - Data: 4|Cielonos.MainGame.Inventory.ItemFunctionUnit, Assembly-CSharp + Data: 4|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: - Name: operation Entry: 7 Data: 5|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib @@ -117,19 +138,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 0 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -144,3 +168,127 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 7|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: LightAttack + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 10|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: HeavyAttack + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 11|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 6 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_FunctionData.asset b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_FunctionData.asset index b548c1424..fd9e976bb 100644 --- a/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_FunctionData.asset @@ -17,8 +17,9 @@ MonoBehaviour: SerializedBytes: ReferencedUnityObjects: - {fileID: 11400000} - - {fileID: 21300000, guid: 26d5d6ed66f72054da57b743b3822708, type: 3} - - {fileID: 21300000, guid: 6e54eaa482ea20d4fbe2b232ac925827, type: 3} + - {fileID: 21300000, guid: 134a11a29150c8b4ea4388d55c2a4781, type: 3} + - {fileID: 21300000, guid: 02a988d1e31d7d343b2c66a3074253d2, type: 3} + - {fileID: 21300000, guid: c81554475de282344ac1c69f8d0b88fa, type: 3} SerializedBytesString: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] @@ -37,7 +38,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 4 - Name: Entry: 7 Data: @@ -50,12 +51,18 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: true - Name: icon - Entry: 6 - Data: + Entry: 10 + Data: 1 - Name: operation Entry: 7 Data: 3|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib @@ -71,19 +78,31 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: - Name: energyCost Entry: 4 Data: 0 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -100,19 +119,37 @@ MonoBehaviour: Data: HeavyAttack - Name: $v Entry: 7 - Data: 4|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI + Entry: 5 + Data: true + - Name: isMain Entry: 5 Data: false - Name: icon - Entry: 6 - Data: + Entry: 10 + Data: 2 - Name: operation Entry: 7 - Data: 5|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -124,17 +161,17 @@ MonoBehaviour: Data: - Name: energyCost Entry: 4 - Data: 0 + Data: 10 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -151,18 +188,45 @@ MonoBehaviour: Data: Block - Name: $v Entry: 7 - Data: 6|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + Data: 8|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 6 Data: - Name: operation - Entry: 6 + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 10|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 Data: - Name: energyCost Entry: 4 @@ -170,13 +234,13 @@ MonoBehaviour: - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 0 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 0 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -190,63 +254,42 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TripleAttack + Data: DisruptionAttack - Name: $v Entry: 7 - Data: 7|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + Data: 11|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: true + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 10 - Data: 1 + Data: 3 - Name: operation Entry: 6 Data: - - Name: energyCost - Entry: 4 - Data: 25 - - Name: ammoCost - Entry: 3 - Data: 0 - - Name: interval - Entry: 4 - Data: 10 - - Name: intervalLowerLimit - Entry: 4 - Data: 5 - - Name: intervalReductionType - Entry: 3 + - Name: tags + Entry: 7 + Data: 12|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 Data: 1 - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k Entry: 1 - Data: DisruptAttack - - Name: $v - Entry: 7 - Data: 8|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp - - Name: parentData - Entry: 10 - Data: 0 - - Name: shownInUI - Entry: 5 - Data: true - - Name: icon - Entry: 10 - Data: 2 - - Name: operation - Entry: 6 + Data: Disruption + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 Data: - Name: energyCost Entry: 4 @@ -254,15 +297,15 @@ MonoBehaviour: - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 - Data: 10 - - Name: intervalLowerLimit + Data: 4 + - Name: cooldownLowerLimit Entry: 4 - Data: 5 - - Name: intervalReductionType + Data: 1 + - Name: cooldownReductionType Entry: 3 - Data: 0 + Data: 1 - Name: Entry: 8 Data: @@ -275,3 +318,199 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 14|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: LightAttack + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 10 + Data: 1 + - Name: operation + Entry: 7 + Data: 15|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 17|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: HeavyAttack + - Name: shownInUI + Entry: 5 + Data: true + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 10 + Data: 2 + - Name: operation + Entry: 7 + Data: 18|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 10 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 0 + - Name: cooldownLowerLimit + Entry: 4 + Data: 0 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 20|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: DisruptionAttack + - Name: shownInUI + Entry: 5 + Data: true + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 10 + Data: 3 + - Name: operation + Entry: 7 + Data: 21|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 22|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 1 + Data: Disruption + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 25 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 4 + - Name: cooldownLowerLimit + Entry: 4 + Data: 1 + - Name: cooldownReductionType + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material.meta b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound.meta similarity index 77% rename from Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material.meta rename to Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound.meta index d68ecc2cb..94735c3ad 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Material.meta +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb706d61f651d684c9203dc86e5f7331 +guid: a53311556b813864cb88c575d8e23ca1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset new file mode 100644 index 000000000..90a251640 --- /dev/null +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + 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: fd6893a98c17a0e47af8bd555a67190b, type: 3} + m_Name: ArmorPiercingRound_ContentData + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Characters.Inventory.ContentData + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: itemClass + Entry: 7 + Data: 0|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Cielonos.MainGame.Inventory.Collections.ArmorPiercingRound, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: dropSettings + Entry: 7 + Data: 1|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Single, + mscorlib]], mscorlib + - Name: comparer + Entry: 7 + Data: 2|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + itemType: 2 + itemRarity: 1 + tags: [] + institutions: + - SkodaDynamics + displayNameKey: Passive_ArmorPiercingRound_Name + descriptionKey: Passive_ArmorPiercingRound_Desc + rectIcon: {fileID: 0} + squareIcon: {fileID: 21300000, guid: a685aa7ba5f7a074f8a84237bbab1032, type: 3} + dropWeight: 1 diff --git a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset.meta b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset.meta new file mode 100644 index 000000000..110b8e928 --- /dev/null +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_ContentData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f5e59bcd7f03e94888a4128a5cb032f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset new file mode 100644 index 000000000..bc0acf8d8 --- /dev/null +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + 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: 3bf7ef748e2ae3a4085a6efa5628b897, type: 3} + m_Name: ArmorPiercingRound_PassiveAttributeData + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.AttributeData + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + itemAttributes: + _duplicateStrategy: 0 + _entries: + - key: ArmorReduction + value: 5 + keyColumnWidth: 0.5 + chaAttrNumericChange: + _duplicateStrategy: 0 + _entries: [] + keyColumnWidth: 0.5 + chaAttrPercentageChangeOfAccumulation: + _duplicateStrategy: 0 + _entries: [] + keyColumnWidth: 0.5 + chaAttrPercentageChangeOfMultiplication: + _duplicateStrategy: 0 + _entries: [] + keyColumnWidth: 0.5 diff --git a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset.meta b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset.meta new file mode 100644 index 000000000..6e65fe1ac --- /dev/null +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/ArmorPiercingRound/ArmorPiercingRound_PassiveAttributeData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fe4d1839f6d29f47a6e1cf3b97b4566 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/Ascension/Ascension_PassiveAttributeData.asset b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/Ascension/Ascension_PassiveAttributeData.asset index 0f2e26048..ceefd881f 100644 --- a/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/Ascension/Ascension_PassiveAttributeData.asset +++ b/Assets/Prefabs/MainGame/Items/PassiveEquipments/Collection/Ascension/Ascension_PassiveAttributeData.asset @@ -42,7 +42,7 @@ MonoBehaviour: attributeValue: 0 - attributeKey: CooldownReduction useManualInput: 0 - attributeValue: 0.9 + attributeValue: 0 - attributeKey: MovementSpeed useManualInput: 0 attributeValue: 0 diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/FusionInjector/FusionInjector_FunctionData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/FusionInjector/FusionInjector_FunctionData.asset index f319ff7f1..75898518f 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/FusionInjector/FusionInjector_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/FusionInjector/FusionInjector_FunctionData.asset @@ -49,9 +49,15 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: true + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 10 Data: 1 @@ -67,19 +73,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 10 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 15 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 5 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 1 - Name: @@ -94,3 +103,76 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: Shoot + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 10 + Data: 1 + - Name: operation + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 20 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 15 + - Name: cooldownLowerLimit + Entry: 4 + Data: 5 + - Name: cooldownReductionType + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/IceCone/IceCone_FunctionData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/IceCone/IceCone_FunctionData.asset index 0bb44e323..4746c7a56 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/IceCone/IceCone_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/IceCone/IceCone_FunctionData.asset @@ -49,9 +49,15 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: true + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 10 Data: 1 @@ -67,19 +73,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 10 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 15 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 5 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 1 - Name: @@ -94,3 +103,76 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: Shoot + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 10 + Data: 1 + - Name: operation + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 50 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 20 + - Name: cooldownLowerLimit + Entry: 4 + Data: 5 + - Name: cooldownReductionType + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/Scanner/Scanner_FunctionData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/Scanner/Scanner_FunctionData.asset index be478b0d3..ec814809d 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/Scanner/Scanner_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/Scanner/Scanner_FunctionData.asset @@ -49,9 +49,15 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: true + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 10 Data: 1 @@ -67,19 +73,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 10 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 15 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 5 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 1 - Name: @@ -94,3 +103,76 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: Scan + - Name: shownInUI + Entry: 5 + Data: true + - Name: isMain + Entry: 5 + Data: false + - Name: icon + Entry: 10 + Data: 1 + - Name: operation + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 25 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 30 + - Name: cooldownLowerLimit + Entry: 4 + Data: 10 + - Name: cooldownReductionType + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_AttackData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_AttackData.asset similarity index 99% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_AttackData.asset rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_AttackData.asset index 08a351d75..44380a41c 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_AttackData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_AttackData.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51ca23d227a53a543a6f13a8f91aa0c9, type: 3} - m_Name: VoidAnchor_AttackData + m_Name: ThermalDetonator_AttackData m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.AttackData serializationData: SerializedFormat: 2 diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_AttackData.asset.meta b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_AttackData.asset.meta similarity index 100% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_AttackData.asset.meta rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_AttackData.asset.meta diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_ContentData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_ContentData.asset similarity index 97% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_ContentData.asset rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_ContentData.asset index 823ba79e7..6367e3a2b 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_ContentData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_ContentData.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fd6893a98c17a0e47af8bd555a67190b, type: 3} - m_Name: VoidAnchor_ContentData + m_Name: ThermalDetonator_ContentData m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.ContentData serializationData: SerializedFormat: 2 diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_ContentData.asset.meta b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_ContentData.asset.meta similarity index 100% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_ContentData.asset.meta rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_ContentData.asset.meta diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_FunctionData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_FunctionData.asset similarity index 54% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_FunctionData.asset rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_FunctionData.asset index cce91342c..ce3225726 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_FunctionData.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 587200640af0a9042a1eb27d6c1f5330, type: 3} - m_Name: VoidAnchor_FunctionData + m_Name: ThermalDetonator_FunctionData m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.FunctionData serializationData: SerializedFormat: 2 @@ -48,9 +48,15 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 6 Data: @@ -66,19 +72,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 0 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 15 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 10 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 1 - Name: @@ -93,3 +102,76 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: Use + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 0 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 15 + - Name: cooldownLowerLimit + Entry: 4 + Data: 10 + - Name: cooldownReductionType + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_FunctionData.asset.meta b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_FunctionData.asset.meta similarity index 100% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_FunctionData.asset.meta rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_FunctionData.asset.meta diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_VFXData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_VFXData.asset similarity index 99% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_VFXData.asset rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_VFXData.asset index 86d481202..c46a8a86d 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_VFXData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_VFXData.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 481d1ee7a49eec24f8ad583709af5a82, type: 3} - m_Name: VoidAnchor_VFXData + m_Name: ThermalDetonator_VFXData m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.VFXData serializationData: SerializedFormat: 2 diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_VFXData.asset.meta b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_VFXData.asset.meta similarity index 100% rename from Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/VoidAnchor_VFXData.asset.meta rename to Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/ThermalDetonator/ThermalDetonator_VFXData.asset.meta diff --git a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/VoidAnchor/VoidAnchor_FunctionData.asset b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/VoidAnchor/VoidAnchor_FunctionData.asset index 5141fb633..29c369407 100644 --- a/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/VoidAnchor/VoidAnchor_FunctionData.asset +++ b/Assets/Prefabs/MainGame/Items/SupportEquipments/Collection/VoidAnchor/VoidAnchor_FunctionData.asset @@ -48,9 +48,15 @@ MonoBehaviour: - Name: parentData Entry: 10 Data: 0 + - Name: unitName + Entry: 6 + Data: - Name: shownInUI Entry: 5 Data: false + - Name: isMain + Entry: 5 + Data: false - Name: icon Entry: 6 Data: @@ -66,19 +72,22 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: tags + Entry: 6 + Data: - Name: energyCost Entry: 4 Data: 0 - Name: ammoCost Entry: 3 Data: 0 - - Name: interval + - Name: cooldown Entry: 4 Data: 1 - - Name: intervalLowerLimit + - Name: cooldownLowerLimit Entry: 4 Data: 1 - - Name: intervalReductionType + - Name: cooldownReductionType Entry: 3 Data: 0 - Name: @@ -93,3 +102,76 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: functionUnitList + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|Cielonos.MainGame.Inventory.FunctionData+FunctionUnit, Assembly-CSharp + - Name: parentData + Entry: 10 + Data: 0 + - Name: unitName + Entry: 1 + Data: Use + - Name: shownInUI + Entry: 5 + Data: false + - Name: isMain + Entry: 5 + Data: true + - Name: icon + Entry: 6 + Data: + - Name: operation + Entry: 7 + Data: 6|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: tags + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: energyCost + Entry: 4 + Data: 25 + - Name: ammoCost + Entry: 3 + Data: 0 + - Name: cooldown + Entry: 4 + Data: 10 + - Name: cooldownLowerLimit + Entry: 4 + Data: 2 + - Name: cooldownReductionType + Entry: 3 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/Prefabs/MainGame/UI/PlayerCanvas/MainWeaponFunctionIcon.prefab b/Assets/Prefabs/MainGame/UI/PlayerCanvas/MainWeaponFunctionIcon.prefab index 2239bbe27..aee86d308 100644 --- a/Assets/Prefabs/MainGame/UI/PlayerCanvas/MainWeaponFunctionIcon.prefab +++ b/Assets/Prefabs/MainGame/UI/PlayerCanvas/MainWeaponFunctionIcon.prefab @@ -88,7 +88,7 @@ GameObject: - component: {fileID: 5835926715798068910} - component: {fileID: 4159506999441037784} m_Layer: 5 - m_Name: TimerFrame + m_Name: Frame m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -134,7 +134,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.2} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -172,8 +172,8 @@ MonoBehaviour: _maxDistance: 128 _reuseDistanceMap: 0 _falloffMode: 0 - _expFalloffEnergy: 2 - _expFalloffPower: 2 + _expFalloffEnergy: 1 + _expFalloffPower: 1.25 _expFalloffOffset: 0 _falloffCurve: serializedVersion: 2 @@ -201,7 +201,7 @@ MonoBehaviour: m_RotationOrder: 4 _falloffCurveGamma: 2.2 _fillMode: 0 - _color: {r: 1, g: 1, b: 1, a: 1} + _color: {r: 2.5207431, g: 2.5207431, b: 2.5207431, a: 1.4142135} _gradientTexture: {fileID: 0} _gradient: serializedVersion: 2 @@ -236,7 +236,7 @@ MonoBehaviour: _gradientOffset: 0 _gradientGamma: 1 _gradientReverse: 0 - _blur: 16 + _blur: 4.8 _noiseScale: 1 _additive: 1 _sourceAlpha: 1 @@ -272,10 +272,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 731673013393171816} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -50} - m_SizeDelta: {x: 50, y: 20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4989292147774878156 CanvasRenderer: @@ -305,17 +305,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 300/200 + m_text: 300 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_sharedMaterial: {fileID: -8919388740985524052, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294967176 + m_fontColor: {r: 0.53333336, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -332,12 +332,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 13.75 + m_fontSize: 20 m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 16 + m_fontSizeMin: 8 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -377,7 +377,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3150180972119515548 +--- !u!1 &1930739069218887556 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -385,50 +385,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6663965170318581280} - - component: {fileID: 8236163163766835478} - - component: {fileID: 3264228106627665596} + - component: {fileID: 37592404733920052} + - component: {fileID: 758797649600774674} + - component: {fileID: 289009004714267967} m_Layer: 5 - m_Name: OperationText + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6663965170318581280 +--- !u!224 &37592404733920052 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00019631287} + m_GameObject: {fileID: 1930739069218887556} + 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: 731673013393171816} + m_Father: {fileID: 316283453569668576} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -30} - m_SizeDelta: {x: 50, y: 20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8236163163766835478 +--- !u!222 &758797649600774674 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} + m_GameObject: {fileID: 1930739069218887556} m_CullTransparentMesh: 1 ---- !u!114 &3264228106627665596 +--- !u!114 &289009004714267967 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} + m_GameObject: {fileID: 1930739069218887556} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -442,10 +442,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Q+L + m_text: 120.0 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 538d28bfaad57dc47b726847ab356ae6, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -469,12 +469,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 20 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 16 + m_fontSizeMin: 8 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -514,7 +514,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3630945596583633595 +--- !u!1 &3955006171053148922 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -522,9 +522,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7855874393868878643} - - component: {fileID: 4127102497803563891} - - component: {fileID: 4400505302724168968} + - component: {fileID: 4520370737915613483} + - component: {fileID: 6360055272961289082} + - component: {fileID: 163625082554669007} m_Layer: 5 m_Name: BlurBG m_TagString: Untagged @@ -532,14 +532,14 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7855874393868878643 +--- !u!224 &4520370737915613483 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3630945596583633595} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3955006171053148922} + 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 @@ -551,36 +551,36 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4127102497803563891 +--- !u!222 &6360055272961289082 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3630945596583633595} + m_GameObject: {fileID: 3955006171053148922} m_CullTransparentMesh: 1 ---- !u!114 &4400505302724168968 +--- !u!114 &163625082554669007 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3630945596583633595} + m_GameObject: {fileID: 3955006171053148922} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} + m_Script: {fileID: 11500000, guid: be9dc56d305de9a43b44e6f120dafaba, type: 3} m_Name: - m_EditorClassIdentifier: LeTai.Asset.TranslucentImage::LeTai.Asset.TranslucentImage.TranslucentImage - m_Material: {fileID: 2100000, guid: 5e15fc327efa72d41bcc7921b6ca37a0, type: 2} - m_Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + m_EditorClassIdentifier: JeffGrawAssets.FlexibleUI.Runtime::JeffGrawAssets.FlexibleUI.BlurredImage + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4ac32d9310793f44f8ec46e0b0a90c19, type: 3} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -588,20 +588,41 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 25 - _source: {fileID: 0} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 + m_PixelsPerUnitMultiplier: 1 + _common: + blurReferencesFrom: 0 + cameraReference: {fileID: 0} + featureNumber: 0 + blurStrength: 1 + unrankedLayer: 0 + priority: 0 + blurPreset: {fileID: 11400000, guid: 5e51158b88ffa23438827427d4bbb0d1, type: 2} + blurInstanceSettings: + downscaleSections: + - algorithmIdx: 3 + iterations: 2 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + blurSections: + - algorithmIdx: 2 + iterations: 4 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + referenceResolution: 1080 + hqResample: 0 + blurAdditionalDistancePerIteration: 1 + ditherStrength: 0.25 + brightness: 0 + contrast: 0 + vibrancy: -1 + tint: {r: 0, g: 0, b: 0, a: 0} + _alphaBlend: 255 + _sourceImageFade: 0 + additionalBlurPadding: 0 + tryBatchWithSimilar: 0 + fillEntireRenderTexture: 0 --- !u!1 &6700856703356688415 GameObject: m_ObjectHideFlags: 0 @@ -633,16 +654,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7855874393868878643} + - {fileID: 4520370737915613483} - {fileID: 7323255282922851536} - {fileID: 7631189459700003741} + - {fileID: 316283453569668576} - {fileID: 731673013393171816} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2068372279596349448 CanvasRenderer: @@ -684,15 +706,14 @@ MonoBehaviour: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] - SerializationNodes: - - Name: functionUnit - Entry: 6 - Data: + SerializationNodes: [] rectTransform: {fileID: 6672170792524579150} canvasGroup: {fileID: 296117830655928654} frame: {fileID: 5835926715798068910} iconImage: {fileID: 6811689867027032270} - timer: {fileID: 0} + timerImage: {fileID: 7668043499301785357} + timerText: {fileID: 289009004714267967} + costText: {fileID: 4547699104054309808} --- !u!1 &8041244956148306746 GameObject: m_ObjectHideFlags: 0 @@ -702,14 +723,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 731673013393171816} - - component: {fileID: 707356967785745833} m_Layer: 5 m_Name: Texts m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &731673013393171816 RectTransform: m_ObjectHideFlags: 0 @@ -722,38 +742,87 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6663965170318581280} - {fileID: 4275045189925584267} m_Father: {fileID: 6672170792524579150} 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: 50.000008} - m_SizeDelta: {x: 50, y: 60} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 90} + m_SizeDelta: {x: 75, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &707356967785745833 +--- !u!1 &8768892574109757482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 316283453569668576} + - component: {fileID: 7057739919518516004} + - component: {fileID: 7668043499301785357} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &316283453569668576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8768892574109757482} + 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: + - {fileID: 37592404733920052} + m_Father: {fileID: 6672170792524579150} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -2, y: -2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7057739919518516004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8768892574109757482} + m_CullTransparentMesh: 1 +--- !u!114 &7668043499301785357 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8041244956148306746} + m_GameObject: {fileID: 8768892574109757482} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.VerticalLayoutGroup - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 7 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c0c96194f26c3ad48894a8f410129020, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 0 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/MainGame/UI/PlayerCanvas/SupportEquipmentIcon.prefab b/Assets/Prefabs/MainGame/UI/PlayerCanvas/SupportEquipmentIcon.prefab index 1371c9e87..67bbea6dc 100644 --- a/Assets/Prefabs/MainGame/UI/PlayerCanvas/SupportEquipmentIcon.prefab +++ b/Assets/Prefabs/MainGame/UI/PlayerCanvas/SupportEquipmentIcon.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_SizeDelta: {x: -2, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5383810721295439943 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: e6494be27789f254cad2d36b09178f59, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -349,8 +349,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -50} - m_SizeDelta: {x: 50, y: 20} + m_AnchoredPosition: {x: 42.5, y: -40} + m_SizeDelta: {x: 85, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4989292147774878156 CanvasRenderer: @@ -380,10 +380,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 300/200 + m_text: 300 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d1840e4d5c5355a438fd745078e16187, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -407,12 +407,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 13.75 + m_fontSize: 20 m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 10 - m_fontSizeMax: 16 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -527,143 +527,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3150180972119515548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6663965170318581280} - - component: {fileID: 8236163163766835478} - - component: {fileID: 3264228106627665596} - m_Layer: 5 - m_Name: OperationText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6663965170318581280 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00019631287} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 731673013393171816} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -30} - m_SizeDelta: {x: 50, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8236163163766835478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} - m_CullTransparentMesh: 1 ---- !u!114 &3264228106627665596 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3150180972119515548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Q+L - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 16 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3630945596583633595 GameObject: m_ObjectHideFlags: 0 @@ -674,7 +537,7 @@ GameObject: m_Component: - component: {fileID: 7855874393868878643} - component: {fileID: 4127102497803563891} - - component: {fileID: 4400505302724168968} + - component: {fileID: 2901009548694725193} m_Layer: 5 m_Name: BlurBG m_TagString: Untagged @@ -699,7 +562,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -2, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4127102497803563891 CanvasRenderer: @@ -709,7 +572,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3630945596583633595} m_CullTransparentMesh: 1 ---- !u!114 &4400505302724168968 +--- !u!114 &2901009548694725193 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -718,19 +581,19 @@ MonoBehaviour: m_GameObject: {fileID: 3630945596583633595} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} + m_Script: {fileID: 11500000, guid: be9dc56d305de9a43b44e6f120dafaba, type: 3} m_Name: - m_EditorClassIdentifier: LeTai.Asset.TranslucentImage::LeTai.Asset.TranslucentImage.TranslucentImage - m_Material: {fileID: 2100000, guid: 5e15fc327efa72d41bcc7921b6ca37a0, type: 2} - m_Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + m_EditorClassIdentifier: JeffGrawAssets.FlexibleUI.Runtime::JeffGrawAssets.FlexibleUI.BlurredImage + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4ac32d9310793f44f8ec46e0b0a90c19, type: 3} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -738,20 +601,41 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 12 - _source: {fileID: 0} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 + m_PixelsPerUnitMultiplier: 1 + _common: + blurReferencesFrom: 0 + cameraReference: {fileID: 0} + featureNumber: 0 + blurStrength: 1 + unrankedLayer: 0 + priority: 0 + blurPreset: {fileID: 0} + blurInstanceSettings: + downscaleSections: + - algorithmIdx: 3 + iterations: 2 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + blurSections: + - algorithmIdx: 2 + iterations: 4 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + referenceResolution: 1080 + hqResample: 0 + blurAdditionalDistancePerIteration: 1 + ditherStrength: 0.25 + brightness: 0 + contrast: 0 + vibrancy: 0 + tint: {r: 0, g: 0, b: 0, a: 0} + _alphaBlend: 255 + _sourceImageFade: 0 + additionalBlurPadding: 0 + tryBatchWithSimilar: 0 + fillEntireRenderTexture: 0 --- !u!1 &6031457754085950924 GameObject: m_ObjectHideFlags: 0 @@ -827,7 +711,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6552084762070166258 +--- !u!1 &6440622248162029605 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -835,9 +719,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8962718563061392606} - - component: {fileID: 6502012256584818365} - - component: {fileID: 5558358695431993510} + - component: {fileID: 9052133103245459313} + - component: {fileID: 735261732782229533} + - component: {fileID: 9217640881321828208} m_Layer: 5 m_Name: Timer m_TagString: Untagged @@ -845,18 +729,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8962718563061392606 +--- !u!224 &9052133103245459313 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6552084762070166258} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6440622248162029605} + 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_Children: + - {fileID: 5390978527145884061} m_Father: {fileID: 6672170792524579150} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -864,21 +749,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -2, y: -2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6502012256584818365 +--- !u!222 &735261732782229533 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6552084762070166258} + m_GameObject: {fileID: 6440622248162029605} m_CullTransparentMesh: 1 ---- !u!114 &5558358695431993510 +--- !u!114 &9217640881321828208 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6552084762070166258} + m_GameObject: {fileID: 6440622248162029605} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -892,14 +777,14 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4ac32d9310793f44f8ec46e0b0a90c19, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c0c96194f26c3ad48894a8f410129020, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 1 + m_FillMethod: 4 m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 + m_FillClockwise: 0 + m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 --- !u!1 &6700856703356688415 @@ -937,7 +822,7 @@ RectTransform: - {fileID: 7855874393868878643} - {fileID: 7323255282922851536} - {fileID: 7631189459700003741} - - {fileID: 8962718563061392606} + - {fileID: 9052133103245459313} - {fileID: 3549151289926807660} - {fileID: 5920784134659968556} - {fileID: 735989625237935737} @@ -947,7 +832,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} + m_SizeDelta: {x: 85, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2068372279596349448 CanvasRenderer: @@ -989,16 +874,15 @@ MonoBehaviour: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] - SerializationNodes: - - Name: functionUnit - Entry: 6 - Data: + SerializationNodes: [] rectTransform: {fileID: 6672170792524579150} canvasGroup: {fileID: 296117830655928654} supportEquipment: {fileID: 0} frame: {fileID: 5835926715798068910} iconImage: {fileID: 6811689867027032270} - timer: {fileID: 5558358695431993510} + timerImage: {fileID: 9217640881321828208} + timerText: {fileID: 4122024236172233886} + costText: {fileID: 4547699104054309808} --- !u!223 &1497936154529666453 Canvas: m_ObjectHideFlags: 0 @@ -1017,7 +901,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 7 + m_AdditionalShaderChannelsFlag: 31 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 10 @@ -1121,14 +1005,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 731673013393171816} - - component: {fileID: 707356967785745833} m_Layer: 5 m_Name: Texts m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &731673013393171816 RectTransform: m_ObjectHideFlags: 0 @@ -1141,38 +1024,148 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6663965170318581280} - {fileID: 4275045189925584267} m_Father: {fileID: 6672170792524579150} 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: 50.000008} - m_SizeDelta: {x: 50, y: 60} + m_AnchoredPosition: {x: 0, y: 67.5} + m_SizeDelta: {x: 85, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &707356967785745833 +--- !u!1 &8445402703647316760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5390978527145884061} + - component: {fileID: 3701968063319087225} + - component: {fileID: 4122024236172233886} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5390978527145884061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8445402703647316760} + 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: 9052133103245459313} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3701968063319087225 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8445402703647316760} + m_CullTransparentMesh: 1 +--- !u!114 &4122024236172233886 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8041244956148306746} + m_GameObject: {fileID: 8445402703647316760} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.VerticalLayoutGroup - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 7 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 120.0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 21262bfde877c70478b3fcaf0d725c46, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 538d28bfaad57dc47b726847ab356ae6, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 8 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Items/Extender.meta b/Assets/Resources/Items/Extender.meta deleted file mode 100644 index 6cf71e4b0..000000000 --- a/Assets/Resources/Items/Extender.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae7479aaed14d3240bcffd1ef9442771 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab b/Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab new file mode 100644 index 000000000..ea1710ce0 --- /dev/null +++ b/Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5750982105846941114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4246848515158293717} + - component: {fileID: 8909628142850051596} + m_Layer: 0 + m_Name: ArmorPiercingRound + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4246848515158293717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5750982105846941114} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8909628142850051596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5750982105846941114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46a4b90939f53e04c8b0211785d581d5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.Collections.ArmorPiercingRound + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: passiveAttributeSm + Entry: 6 + Data: + - Name: comboSm + Entry: 6 + Data: + - Name: functionSm + Entry: 6 + Data: + - Name: ammoSm + Entry: 6 + Data: + - Name: overloadSm + Entry: 6 + Data: + - Name: auraSm + Entry: 6 + Data: + - Name: viewObjects + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemViewObject, + Assembly-CSharp]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + fullBodyFuncAnims: {fileID: 0} + upperBodyFuncAnims: {fileID: 0} + contentData: {fileID: 11400000, guid: 1f5e59bcd7f03e94888a4128a5cb032f, type: 2} + viewObjectData: {fileID: 0} + vfxData: {fileID: 0} + passiveAttributeData: {fileID: 11400000, guid: 7fe4d1839f6d29f47a6e1cf3b97b4566, type: 2} + upgradeData: {fileID: 0} + comboData: {fileID: 0} + attackData: {fileID: 0} + functionData: {fileID: 0} + ammoData: {fileID: 0} + blockData: {fileID: 0} + overloadData: {fileID: 0} + feedbackSc: {fileID: 0} + extenders: [] diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef.meta b/Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab.meta similarity index 59% rename from Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef.meta rename to Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab.meta index a00429dc4..89ca24636 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/Editor/LeTai.TranslucentImage.UniversalRP.Editor.asmdef.meta +++ b/Assets/Resources/Items/PassiveEquipment/ArmorPiercingRound.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: eba807230e676224b8e8e5b8859b2e7c -AssemblyDefinitionImporter: +guid: 95c06633bdd70a447af0e03eb3e95480 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab b/Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab new file mode 100644 index 000000000..ae422e9e1 --- /dev/null +++ b/Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7629722813879712105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4022818361804729044} + - component: {fileID: 257818111488745502} + m_Layer: 0 + m_Name: PhotonDissociator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4022818361804729044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629722813879712105} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &257818111488745502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629722813879712105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dfcb853ac3666fc45a65e43107958eaf, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.Collections.PhotonDissociator + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: passiveAttributeSm + Entry: 6 + Data: + - Name: comboSm + Entry: 6 + Data: + - Name: functionSm + Entry: 6 + Data: + - Name: ammoSm + Entry: 6 + Data: + - Name: overloadSm + Entry: 6 + Data: + - Name: auraSm + Entry: 6 + Data: + - Name: viewObjects + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemViewObject, + Assembly-CSharp]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: hostType + Entry: 7 + Data: 2|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Cielonos.MainGame.Inventory.Collections.Polychrome, Assembly-CSharp + - Name: + Entry: 8 + Data: + fullBodyFuncAnims: {fileID: 0} + upperBodyFuncAnims: {fileID: 0} + contentData: {fileID: 0} + viewObjectData: {fileID: 0} + vfxData: {fileID: 0} + passiveAttributeData: {fileID: 0} + upgradeData: {fileID: 0} + comboData: {fileID: 0} + attackData: {fileID: 0} + functionData: {fileID: 0} + ammoData: {fileID: 0} + blockData: {fileID: 0} + overloadData: {fileID: 0} + feedbackSc: {fileID: 0} + extenders: [] diff --git a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef.meta b/Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab.meta similarity index 59% rename from Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef.meta rename to Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab.meta index 7582a956c..2b02b885e 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/TranslucentImage/Script/URP/LeTai.TranslucentImage.UniversalRP.asmdef.meta +++ b/Assets/Resources/Items/PassiveEquipment/PhotonDissociator.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: e646286fd75dc0f44bb2f84ffb34408d -AssemblyDefinitionImporter: +guid: 280605898f30990428e66ff104649935 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab b/Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab new file mode 100644 index 000000000..049470ddc --- /dev/null +++ b/Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1145534770752609673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8151807826226963493} + - component: {fileID: 4488889994479194879} + m_Layer: 0 + m_Name: PhotonPolarizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8151807826226963493 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145534770752609673} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4488889994479194879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1145534770752609673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6b2bf502e7cd5c4ca858a7492f332a9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.Collections.PhotonPolarizer + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: passiveAttributeSm + Entry: 6 + Data: + - Name: comboSm + Entry: 6 + Data: + - Name: functionSm + Entry: 6 + Data: + - Name: ammoSm + Entry: 6 + Data: + - Name: overloadSm + Entry: 6 + Data: + - Name: auraSm + Entry: 6 + Data: + - Name: viewObjects + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemViewObject, + Assembly-CSharp]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: hostType + Entry: 7 + Data: 2|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Cielonos.MainGame.Inventory.Collections.Polychrome, Assembly-CSharp + - Name: + Entry: 8 + Data: + fullBodyFuncAnims: {fileID: 0} + upperBodyFuncAnims: {fileID: 0} + contentData: {fileID: 0} + viewObjectData: {fileID: 0} + vfxData: {fileID: 0} + passiveAttributeData: {fileID: 0} + upgradeData: {fileID: 0} + comboData: {fileID: 0} + attackData: {fileID: 0} + functionData: {fileID: 0} + ammoData: {fileID: 0} + blockData: {fileID: 0} + overloadData: {fileID: 0} + feedbackSc: {fileID: 0} + extenders: [] diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor.meta b/Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab.meta similarity index 57% rename from Assets/OtherPlugins/Le Tai's Asset/Common/Editor.meta rename to Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab.meta index 03b6da5ee..b3f473bc9 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Editor.meta +++ b/Assets/Resources/Items/PassiveEquipment/PhotonPolarizer.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: b6c339e6d17f1c9428f17088b84f1862 -folderAsset: yes -DefaultImporter: +guid: 03e1c9afe907f4040b65351e8f09716c +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index 4881b0ae1..a12078e1f 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -337,15 +337,15 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 79107602} - - component: {fileID: 79107603} - component: {fileID: 79107604} + - component: {fileID: 79107605} m_Layer: 5 - m_Name: Displayer + m_Name: MainDisplayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &79107602 RectTransform: m_ObjectHideFlags: 0 @@ -353,48 +353,24 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 79107601} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000001397} + 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: - - {fileID: 219461911} - - {fileID: 2013189479} + - {fileID: 1274178558} + - {fileID: 906471636} + - {fileID: 174067778} + - {fileID: 1369151019} - {fileID: 380878337} - {fileID: 2029635273} m_Father: {fileID: 503309719} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &79107603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 79107601} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e20bf42aab841f646b3387148f1fceb2, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Cielonos.UI.MainWeaponDisplayer - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - rectTransform: {fileID: 79107602} - canvasGroup: {fileID: 79107604} - rectIcon: {fileID: 380878338} - weaponNameText: {fileID: 2029635274} - frame: {fileID: 2013189480} --- !u!225 &79107604 CanvasGroup: m_ObjectHideFlags: 0 @@ -407,6 +383,34 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &79107605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79107601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 624797d1380cee24e9cfd1c1a1b8ea90, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.UI.MainWeaponFunctionIcon + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + rectTransform: {fileID: 79107602} + canvasGroup: {fileID: 79107604} + frame: {fileID: 906471638} + iconImage: {fileID: 380878338} + timerImage: {fileID: 0} + timerText: {fileID: 0} + costText: {fileID: 0} --- !u!1 &84582971 GameObject: m_ObjectHideFlags: 0 @@ -769,8 +773,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157462138} serializedVersion: 2 - m_LocalRotation: {x: 0.041604012, y: 0.7120454, z: -0.6996196, w: 0.042342935} - m_LocalPosition: {x: -0.025034627, y: 13.898141, z: 0.20974834} + m_LocalRotation: {x: 0.04385202, y: 0.71185315, z: -0.69953614, w: 0.04462414} + m_LocalPosition: {x: -0.02615419, y: 13.898172, z: 0.20778869} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1026,7 +1030,7 @@ GameObject: - component: {fileID: 174067780} - component: {fileID: 174067779} m_Layer: 5 - m_Name: Frame (1) + m_Name: Corner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1040,11 +1044,11 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 174067777} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000294609} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2013189479} + m_Father: {fileID: 79107602} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1243,7 +1247,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 31 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 100 @@ -1318,171 +1322,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1 &219461910 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 219461911} - - component: {fileID: 219461914} - - component: {fileID: 219461913} - - component: {fileID: 219461915} - m_Layer: 5 - m_Name: SwitchLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &219461911 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219461910} - 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: 79107602} - 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.1897, y: 41.5} - m_SizeDelta: {x: 287.5, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &219461913 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219461910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &219461914 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219461910} - m_CullTransparentMesh: 1 ---- !u!114 &219461915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219461910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1bac190db134f274a9277da474af4a3d, type: 3} - m_Name: - m_EditorClassIdentifier: ChocDino.UIFX::ChocDino.UIFX.GlowFilter - _strength: 0.5 - _renderSpace: 0 - _expand: 1 - _sourceArea: 0 - _edgeSide: 2 - _distanceShape: 2 - _maxDistance: 128 - _reuseDistanceMap: 0 - _falloffMode: 0 - _expFalloffEnergy: 2 - _expFalloffPower: 2 - _expFalloffOffset: 0 - _falloffCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: -1 - outSlope: -1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1 - outSlope: -1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - _falloffCurveGamma: 2.2 - _fillMode: 0 - _color: {r: 1, g: 1, b: 1, a: 1} - _gradientTexture: {fileID: 0} - _gradient: - serializedVersion: 2 - key0: {r: 0.03116761, g: 0.9716981, b: 0.5848317, a: 1} - key1: {r: 0.3635457, g: 0.4478632, b: 0.8679245, a: 1} - key2: {r: 0.8301887, g: 0.4025632, b: 0.829066, a: 0} - key3: {r: 0.8490566, g: 0.1874332, b: 0.5700046, a: 0} - key4: {r: 0.8207547, g: 0.7230087, b: 0.1966714, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 16384 - ctime2: 32768 - ctime3: 49151 - ctime4: 65535 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 5 - m_NumAlphaKeys: 2 - _gradientOffset: 0 - _gradientGamma: 1 - _gradientReverse: 0 - _blur: 16 - _noiseScale: 0 - _additive: 1 - _sourceAlpha: 1 --- !u!1 &245466180 GameObject: m_ObjectHideFlags: 0 @@ -2022,10 +1861,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 79107602} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 85} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &380878338 MonoBehaviour: @@ -2047,7 +1886,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df563e4fcb7aff04d84722b0b480b277, type: 3} + m_Sprite: {fileID: 21300000, guid: 068170e828fa0c340a437796390cdfb2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2238,15 +2077,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1205456455} + - {fileID: 704243378} - {fileID: 79107602} - {fileID: 555776724} m_Father: {fileID: 197219491} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -180, y: 75} - m_SizeDelta: {x: 290, y: 85} + m_AnchoredPosition: {x: -240, y: 75} + m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &503309720 CanvasGroup: @@ -2280,13 +2119,17 @@ MonoBehaviour: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] - SerializationNodes: [] + SerializationNodes: + - Name: functionIconDict + Entry: 6 + Data: rectTransform: {fileID: 503309719} canvasGroup: {fileID: 503309720} mainWeapon: {fileID: 0} functionIconPrefab: {fileID: 6700856703356688415, guid: ede98da7076bed447a71c87efc5ee216, type: 3} functionIconContainer: {fileID: 555776724} - displayer: {fileID: 79107603} + displayer: {fileID: 0} + mainFunctionIcon: {fileID: 704243377} functionIcons: [] --- !u!1 &506893527 GameObject: @@ -2730,37 +2573,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 96c5704d0681e35408630c488fc0c234, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 - _source: {fileID: 7582698285514830837} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 --- !u!222 &552179408 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2830,8 +2642,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 555776723} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + 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: [] @@ -2839,8 +2651,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -70, y: 25} - m_SizeDelta: {x: -140, y: 40} + m_AnchoredPosition: {x: -50, y: -62.5} + m_SizeDelta: {x: -100, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &555776725 MonoBehaviour: @@ -2856,10 +2668,10 @@ MonoBehaviour: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup m_Padding: m_Left: 0 - m_Right: 0 + m_Right: 10 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 5 m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -2867,7 +2679,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_ReverseArrangement: 1 --- !u!1 &565311427 GameObject: m_ObjectHideFlags: 0 @@ -3283,7 +3095,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &629426291 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3496,6 +3308,139 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &704243376 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 503309719} + m_Modifications: + - target: {fileID: 105167646552314933, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 105167646552314933, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + - target: {fileID: 731673013393171816, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 731673013393171816, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000039101 + objectReference: {fileID: 0} + - target: {fileID: 731673013393171816, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchoredPosition.y + value: 115.00001 + objectReference: {fileID: 0} + - target: {fileID: 4547699104054309808, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: d1840e4d5c5355a438fd745078e16187, type: 2} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchoredPosition.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_AnchoredPosition.y + value: 50.00001 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6700856703356688415, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + propertyPath: m_Name + value: MainFunction + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ede98da7076bed447a71c87efc5ee216, type: 3} +--- !u!114 &704243377 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 105167646552314933, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + m_PrefabInstance: {fileID: 704243376} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 624797d1380cee24e9cfd1c1a1b8ea90, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cielonos.UI.MainWeaponFunctionIcon +--- !u!224 &704243378 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6672170792524579150, guid: ede98da7076bed447a71c87efc5ee216, type: 3} + m_PrefabInstance: {fileID: 704243376} + m_PrefabAsset: {fileID: 0} --- !u!1001 &720588586 PrefabInstance: m_ObjectHideFlags: 0 @@ -3518,12 +3463,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1497936154529666453, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_AdditionalShaderChannelsFlag - value: 7 + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 4122024236172233886, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} + propertyPath: m_fontSize + value: 20 objectReference: {fileID: 0} - target: {fileID: 4400505302724168968, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: _source value: - objectReference: {fileID: 7582698285514830837} + objectReference: {fileID: 0} - target: {fileID: 6031457754085950924, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_IsActive value: 0 @@ -4307,37 +4256,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} m_Name: m_EditorClassIdentifier: LeTai.Asset.TranslucentImage::LeTai.Asset.TranslucentImage.TranslucentImage - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5f376008115038c44912b3289fa88ea8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 - _source: {fileID: 7582698285514830837} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 --- !u!222 &823124790 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4535,6 +4453,171 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &906471635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 906471636} + - component: {fileID: 906471639} + - component: {fileID: 906471638} + - component: {fileID: 906471637} + m_Layer: 5 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &906471636 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906471635} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000294609} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 79107602} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &906471637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906471635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bac190db134f274a9277da474af4a3d, type: 3} + m_Name: + m_EditorClassIdentifier: ChocDino.UIFX::ChocDino.UIFX.GlowFilter + _strength: 0 + _renderSpace: 0 + _expand: 1 + _sourceArea: 0 + _edgeSide: 2 + _distanceShape: 2 + _maxDistance: 128 + _reuseDistanceMap: 0 + _falloffMode: 0 + _expFalloffEnergy: 1 + _expFalloffPower: 1.25 + _expFalloffOffset: 0 + _falloffCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _falloffCurveGamma: 2.2 + _fillMode: 0 + _color: {r: 1.4142135, g: 1.4142135, b: 1.4142135, a: 1.4142135} + _gradientTexture: {fileID: 0} + _gradient: + serializedVersion: 2 + key0: {r: 0.03116761, g: 0.9716981, b: 0.5848317, a: 1} + key1: {r: 0.3635457, g: 0.4478632, b: 0.8679245, a: 1} + key2: {r: 0.8301887, g: 0.4025632, b: 0.829066, a: 0} + key3: {r: 0.8490566, g: 0.1874332, b: 0.5700046, a: 0} + key4: {r: 0.8207547, g: 0.7230087, b: 0.1966714, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 32768 + ctime3: 49151 + ctime4: 65535 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 5 + m_NumAlphaKeys: 2 + _gradientOffset: 0 + _gradientGamma: 1 + _gradientReverse: 0 + _blur: 4.8 + _noiseScale: 1 + _additive: 1 + _sourceAlpha: 1 +--- !u!114 &906471638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906471635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.2509804} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3a6417eb1905a5a4894af7cb736f81b9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &906471639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 906471635} + m_CullTransparentMesh: 1 --- !u!1 &910815509 GameObject: m_ObjectHideFlags: 0 @@ -6506,10 +6589,14 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 628242479411463374, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} + - target: {fileID: 4122024236172233886, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4400505302724168968, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: _source value: - objectReference: {fileID: 7582698285514830837} + objectReference: {fileID: 0} - target: {fileID: 6672170792524579150, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6774,94 +6861,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205076648} m_CullTransparentMesh: 1 ---- !u!1 &1205456454 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1205456455} - - component: {fileID: 1205456457} - - component: {fileID: 1205456458} - m_Layer: 5 - m_Name: BlurBG (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1205456455 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1205456454} - 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: 503309719} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1205456457 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1205456454} - m_CullTransparentMesh: 1 ---- !u!114 &1205456458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1205456454} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} - m_Name: - m_EditorClassIdentifier: LeTai.Asset.TranslucentImage::LeTai.Asset.TranslucentImage.TranslucentImage - m_Material: {fileID: 2100000, guid: 5e15fc327efa72d41bcc7921b6ca37a0, type: 2} - m_Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e16c7aea118d68498053518146c9cf9, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 25 - _source: {fileID: 7582698285514830837} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 --- !u!1 &1229012607 GameObject: m_ObjectHideFlags: 0 @@ -7311,6 +7310,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 33bd71b84e3b907468514ad946229fbc, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Effects.Feedback.TimeScaleShaker +--- !u!1 &1274178557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1274178558} + - component: {fileID: 1274178560} + - component: {fileID: 1274178559} + m_Layer: 5 + m_Name: BlurBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1274178558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274178557} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000294609} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 79107602} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1274178559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274178557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be9dc56d305de9a43b44e6f120dafaba, type: 3} + m_Name: + m_EditorClassIdentifier: JeffGrawAssets.FlexibleUI.Runtime::JeffGrawAssets.FlexibleUI.BlurredImage + m_Material: {fileID: 1545779996} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 + _common: + blurReferencesFrom: 0 + cameraReference: {fileID: 5176838972435409975} + featureNumber: 0 + blurStrength: 1 + unrankedLayer: 0 + priority: 0 + blurPreset: {fileID: 11400000, guid: 5e51158b88ffa23438827427d4bbb0d1, type: 2} + blurInstanceSettings: + downscaleSections: + - algorithmIdx: 3 + iterations: 2 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + blurSections: + - algorithmIdx: 2 + iterations: 4 + horizontalSamplesPerSide: 2 + verticalSamplesPerSide: 2 + sampleDistance: 1.5 + referenceResolution: 1080 + hqResample: 0 + blurAdditionalDistancePerIteration: 1 + ditherStrength: 0.25 + brightness: 0 + contrast: 0 + vibrancy: -1 + tint: {r: 0, g: 0, b: 0, a: 0} + _alphaBlend: 255 + _sourceImageFade: 0 + additionalBlurPadding: 0 + tryBatchWithSimilar: 0 + fillEntireRenderTexture: 0 +--- !u!222 &1274178560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274178557} + m_CullTransparentMesh: 1 --- !u!1 &1278559156 GameObject: m_ObjectHideFlags: 0 @@ -7799,7 +7907,7 @@ GameObject: - component: {fileID: 1369151021} - component: {fileID: 1369151020} m_Layer: 5 - m_Name: Frame (2) + m_Name: Corner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7813,11 +7921,11 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369151018} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: -0.000294609} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2013189479} + m_Father: {fileID: 79107602} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -9087,12 +9195,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1497936154529666453, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_AdditionalShaderChannelsFlag - value: 7 + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 4122024236172233886, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} + propertyPath: m_fontSize + value: 20 objectReference: {fileID: 0} - target: {fileID: 4400505302724168968, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: _source value: - objectReference: {fileID: 7582698285514830837} + objectReference: {fileID: 0} - target: {fileID: 6031457754085950924, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_IsActive value: 0 @@ -9191,6 +9303,45 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6672170792524579150, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} m_PrefabInstance: {fileID: 1513016077} m_PrefabAsset: {fileID: 0} +--- !u!21 &1545779996 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DefaultBlurredImage + m_Shader: {fileID: 4800000, guid: 0bc497fc7237fb94a98a758638ed8902, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1553802792 GameObject: m_ObjectHideFlags: 0 @@ -10364,7 +10515,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1769843352 RectTransform: m_ObjectHideFlags: 0 @@ -11255,173 +11406,6 @@ MonoBehaviour: rectTransform: {fileID: 1984234009} canvasGroup: {fileID: 1984234012} infoUnitPrefab: {fileID: 6592938141123029458, guid: 2b9201e1ef9fd6b4881587613d783588, type: 3} ---- !u!1 &2013189478 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2013189479} - - component: {fileID: 2013189481} - - component: {fileID: 2013189480} - - component: {fileID: 2013189482} - m_Layer: 5 - m_Name: Frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2013189479 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013189478} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000294609} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 174067778} - - {fileID: 1369151019} - m_Father: {fileID: 79107602} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.0000076293945, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2013189480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013189478} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.101960786} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3a6417eb1905a5a4894af7cb736f81b9, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2013189481 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013189478} - m_CullTransparentMesh: 1 ---- !u!114 &2013189482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013189478} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1bac190db134f274a9277da474af4a3d, type: 3} - m_Name: - m_EditorClassIdentifier: ChocDino.UIFX::ChocDino.UIFX.GlowFilter - _strength: 0 - _renderSpace: 0 - _expand: 1 - _sourceArea: 0 - _edgeSide: 2 - _distanceShape: 2 - _maxDistance: 128 - _reuseDistanceMap: 0 - _falloffMode: 0 - _expFalloffEnergy: 1 - _expFalloffPower: 1 - _expFalloffOffset: 0 - _falloffCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: -1 - outSlope: -1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1 - outSlope: -1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - _falloffCurveGamma: 2.2 - _fillMode: 0 - _color: {r: 0.5999998, g: 0.39999998, b: 1, a: 1} - _gradientTexture: {fileID: 0} - _gradient: - serializedVersion: 2 - key0: {r: 0.03116761, g: 0.9716981, b: 0.5848317, a: 1} - key1: {r: 0.3635457, g: 0.4478632, b: 0.8679245, a: 1} - key2: {r: 0.8301887, g: 0.4025632, b: 0.829066, a: 0} - key3: {r: 0.8490566, g: 0.1874332, b: 0.5700046, a: 0} - key4: {r: 0.8207547, g: 0.7230087, b: 0.1966714, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 16384 - ctime2: 32768 - ctime3: 49151 - ctime4: 65535 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 5 - m_NumAlphaKeys: 2 - _gradientOffset: 0 - _gradientGamma: 1 - _gradientReverse: 0 - _blur: 4.8 - _noiseScale: 1 - _additive: 1 - _sourceAlpha: 1 --- !u!1 &2015727554 GameObject: m_ObjectHideFlags: 0 @@ -11798,12 +11782,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1497936154529666453, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_AdditionalShaderChannelsFlag - value: 7 + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 4122024236172233886, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} + propertyPath: m_fontSize + value: 20 objectReference: {fileID: 0} - target: {fileID: 4400505302724168968, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: _source value: - objectReference: {fileID: 7582698285514830837} + objectReference: {fileID: 0} - target: {fileID: 6031457754085950924, guid: 96d7f6c6213c88b4a927a6cb6aaf96ae, type: 3} propertyPath: m_IsActive value: 0 @@ -11929,7 +11917,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2029635273 RectTransform: m_ObjectHideFlags: 0 @@ -13328,7 +13316,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7221211412473590907} serializedVersion: 2 - m_LocalRotation: {x: -0.008338869, y: 0.0387301, z: 0.26741445, w: 0.9627668} + m_LocalRotation: {x: 0.04781273, y: 0.13055375, z: 0.28692162, w: 0.947811} m_LocalPosition: {x: 0.000000014901161, y: 0.2573493, z: 0.00000008661303} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -13344,7 +13332,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3319674495685088495} serializedVersion: 2 - m_LocalRotation: {x: -0.6168403, y: 0.36541808, z: 0.38051474, w: 0.58411145} + m_LocalRotation: {x: -0.5020658, y: 0.49923357, z: 0.47067088, w: 0.5264645} m_LocalPosition: {x: -0.027396753, y: 0.16675851, z: 0.0010840573} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -14141,7 +14129,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7042227719721289364} serializedVersion: 2 - m_LocalRotation: {x: -0.5331908, y: -0.036786158, z: -0.015425535, w: 0.84505415} + m_LocalRotation: {x: -0.60357046, y: -0.035949722, z: -0.01950249, w: 0.79626} m_LocalPosition: {x: 0.000000016298147, y: 0.03885748, z: 0.000000162283} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -15088,7 +15076,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7844812289182461571} serializedVersion: 2 - m_LocalRotation: {x: 0.9836046, y: -0.13095914, z: 0.08900948, w: -0.08630761} + m_LocalRotation: {x: 0.9683769, y: -0.1664558, z: 0.1439415, w: 0.11755707} m_LocalPosition: {x: -0.106367506, y: 0.04975005, z: 0.009382512} m_LocalScale: {x: 1.0000014, y: 1.0000006, z: 1.0000006} m_ConstrainProportionsScale: 0 @@ -15150,7 +15138,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5702025386808075247} serializedVersion: 2 - m_LocalRotation: {x: 0.013689712, y: 0.9531672, z: -0.3021309, w: 0.001391232} + m_LocalRotation: {x: 0.013689578, y: 0.9532043, z: -0.302014, w: 0.0013928711} m_LocalPosition: {x: -0.0000000023283035, y: 0.1350647, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -15203,7 +15191,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 48256218780401782} serializedVersion: 2 - m_LocalRotation: {x: 0.59351844, y: -0.03608908, z: -0.018913293, w: -0.8037884} + m_LocalRotation: {x: 0.60356635, y: -0.0359498, z: -0.01950241, w: -0.79626316} m_LocalPosition: {x: -0.0000000069849184, y: 0.03885742, z: 0.00000004237519} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -16400,6 +16388,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -17684,6 +17673,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -23744,7 +23734,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 746385490261684301} serializedVersion: 2 - m_LocalRotation: {x: 0.015104799, y: -0.1077571, z: -0.12643896, w: 0.98598856} + m_LocalRotation: {x: 0.01523426, y: -0.37531206, z: -0.39265454, w: 0.83948267} m_LocalPosition: {x: -0.000000020489095, y: 0.2573493, z: 0.00000018067665} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -23867,7 +23857,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 981859268219049014} serializedVersion: 2 - m_LocalRotation: {x: -0.6264746, y: -0.039556384, z: -0.023803411, w: 0.7780735} + m_LocalRotation: {x: -0.29629767, y: -0.042002823, z: -0.004148512, w: 0.95416266} m_LocalPosition: {x: -0.0000000013969841, y: 0.033887655, z: 0.00000010035002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -24139,7 +24129,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2100160008256187041} serializedVersion: 2 - m_LocalRotation: {x: -0.5737201, y: -0.03984511, z: -0.019832253, w: 0.8178413} + m_LocalRotation: {x: -0.6593192, y: -0.038297545, z: -0.025264706, w: 0.75046194} m_LocalPosition: {x: 0.00000000698492, y: 0.04517272, z: 0.000000033061955} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -29332,7 +29322,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1979517611748284342} serializedVersion: 2 - m_LocalRotation: {x: -0.25082624, y: -0.0299948, z: -0.088714674, w: 0.9634917} + m_LocalRotation: {x: -0.31546807, y: -0.10420824, z: -0.345154, w: 0.8777752} m_LocalPosition: {x: 0.009598533, y: 0.09659851, z: -0.00032032476} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -34414,7 +34404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4624933114470948350} serializedVersion: 2 - m_LocalRotation: {x: -0.008419409, y: 0.16987698, z: -0.043150187, w: 0.9844842} + m_LocalRotation: {x: -0.023985032, y: -0.35650456, z: 0.06699527, w: 0.9315797} m_LocalPosition: {x: 1.323489e-23, y: 0.070663825, z: -4.4408926e-16} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -34873,7 +34863,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7171492203372693641} serializedVersion: 2 - m_LocalRotation: {x: -0.50801826, y: 0.11033565, z: -0.0912476, w: 0.84936297} + m_LocalRotation: {x: -0.48010573, y: -0.018790659, z: -0.086854346, w: 0.872698} m_LocalPosition: {x: 0.000000005587928, y: 0.56238115, z: -0.000000007450578} m_LocalScale: {x: 0.9999999, y: 0.99999976, z: 0.9999998} m_ConstrainProportionsScale: 0 @@ -35085,7 +35075,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2525908065202250393} serializedVersion: 2 - m_LocalRotation: {x: 0.1507428, y: -0.13335824, z: -0.031244025, w: 0.97903836} + m_LocalRotation: {x: 0.23626721, y: -0.030683381, z: -0.021842293, w: 0.97095793} m_LocalPosition: {x: 0.000000009313213, y: 0.5179995, z: 0.000000003259628} m_LocalScale: {x: 1, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 @@ -35770,6 +35760,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -36489,7 +36480,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8758005403840528289} serializedVersion: 2 - m_LocalRotation: {x: 0.011271842, y: 0.06264527, z: -0.21418616, w: -0.97471684} + m_LocalRotation: {x: 0.010134056, y: 0.059312195, z: -0.31946802, w: -0.94568473} m_LocalPosition: {x: -0.000000059604638, y: 0.043039627, z: -0.00000009126965} m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -36536,7 +36527,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8037889827979424644} serializedVersion: 2 - m_LocalRotation: {x: 0.26939517, y: -0.03253365, z: -0.10204111, w: -0.9570556} + m_LocalRotation: {x: 0.31546667, y: -0.104208395, z: -0.3451548, w: -0.8777754} m_LocalPosition: {x: -0.009598527, y: 0.096598506, z: -0.00032055017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -36616,7 +36607,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3866290918566464698} serializedVersion: 2 - m_LocalRotation: {x: 0.21876073, y: -0.06167595, z: 0.02753514, w: 0.973438} + m_LocalRotation: {x: 0.21022116, y: 0.040499255, z: 0.021456257, w: 0.976579} m_LocalPosition: {x: 1.4994356e-16, y: 0.11235084, z: -4.6566134e-10} m_LocalScale: {x: 1, y: 0.9999999, z: 1} m_ConstrainProportionsScale: 0 @@ -36651,7 +36642,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7320000332261335212} serializedVersion: 2 - m_LocalRotation: {x: -0.028144132, y: 0.042480104, z: -0.39679816, w: -0.91649044} + m_LocalRotation: {x: -0.024044095, y: 0.04344311, z: -0.31478083, w: -0.9478648} m_LocalPosition: {x: 0.000000013038514, y: 0.028132085, z: 0.000000085681705} m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -36796,7 +36787,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7590390181679652200} serializedVersion: 2 - m_LocalRotation: {x: -0.40141952, y: -0.04382637, z: -0.013077648, w: 0.91475165} + m_LocalRotation: {x: -0.69479305, y: -0.039646238, z: -0.03466919, w: 0.7172788} m_LocalPosition: {x: 0.000000016298147, y: 0.030793423, z: -0.0000000041909525} m_LocalScale: {x: 1, y: 1, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -36819,7 +36810,6 @@ GameObject: - component: {fileID: 272102230051645971} - component: {fileID: 7582698285514830839} - component: {fileID: 7582698285514830836} - - component: {fileID: 7582698285514830837} - component: {fileID: 7582698285514830838} m_Layer: 6 m_Name: PlayerMainCamera @@ -37059,7 +37049,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4786406323819378407} serializedVersion: 2 - m_LocalRotation: {x: -0.034128305, y: -0.07356628, z: -0.13717556, w: -0.9872215} + m_LocalRotation: {x: 0.22154503, y: -0.10419388, z: -0.19675449, w: -0.9493941} m_LocalPosition: {x: 0.030291557, y: 0.1017932, z: -0.0031809409} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -37075,7 +37065,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4286222201851993595} serializedVersion: 2 - m_LocalRotation: {x: -0.6715656, y: -0.039493952, z: -0.026493162, w: 0.7394174} + m_LocalRotation: {x: -0.36881262, y: -0.043389753, z: -0.007191509, w: 0.9284626} m_LocalPosition: {x: 4.6566134e-10, y: 0.029992372, z: 0.0000000062864287} m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -52400,7 +52390,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5420537705908574891} serializedVersion: 2 - m_LocalRotation: {x: -0.08064347, y: -0.02876145, z: -0.05915066, w: 0.99457055} + m_LocalRotation: {x: -0.3225083, y: -0.08791127, z: -0.35531402, w: 0.872933} m_LocalPosition: {x: 0.026060369, y: 0.08771448, z: -0.005112694} m_LocalScale: {x: 0.99999994, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -52416,7 +52406,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3364051513946841773} serializedVersion: 2 - m_LocalRotation: {x: -0.48795038, y: -0.12155875, z: 0.086831324, w: 0.8599932} + m_LocalRotation: {x: -0.49181935, y: -0.033022758, z: 0.0859434, w: 0.86581576} m_LocalPosition: {x: 0.000000006519249, y: 0.56238115, z: -0.000000007450578} m_LocalScale: {x: 0.99999994, y: 1, z: 0.9999999} m_ConstrainProportionsScale: 0 @@ -62065,7 +62055,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1616460473305846754} serializedVersion: 2 - m_LocalRotation: {x: 0.7672394, y: -0.035320006, z: -0.032452878, w: -0.63956475} + m_LocalRotation: {x: 0.6593208, y: -0.03829752, z: -0.025265075, w: -0.75046057} m_LocalPosition: {x: -0.0000000055879346, y: 0.045172896, z: 0.000000054948046} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -62914,7 +62904,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3599481549483116497} serializedVersion: 2 - m_LocalRotation: {x: 0.98519856, y: 0.13668162, z: -0.08093565, w: -0.06443123} + m_LocalRotation: {x: 0.98787683, y: 0.10693409, z: -0.055226598, w: 0.09805366} m_LocalPosition: {x: 0.106367506, y: 0.04975005, z: 0.009382462} m_LocalScale: {x: 1.0000014, y: 1.0000006, z: 1.0000005} m_ConstrainProportionsScale: 0 @@ -62946,7 +62936,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2452734139708599215} serializedVersion: 2 - m_LocalRotation: {x: 0.47969085, y: 0.014210463, z: -0.08938771, w: -0.87275696} + m_LocalRotation: {x: 0.32250518, y: -0.0879114, z: -0.35531414, w: -0.87293404} m_LocalPosition: {x: -0.026060365, y: 0.08771448, z: -0.005112918} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -68214,7 +68204,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4768078771177479510} serializedVersion: 2 - m_LocalRotation: {x: -0.37453273, y: -0.13734622, z: 0.32849565, w: 0.8561261} + m_LocalRotation: {x: -0.5722613, y: -0.28645313, z: 0.12506974, w: 0.7581683} m_LocalPosition: {x: -0.029908959, y: 0.030986566, z: -0.008053159} m_LocalScale: {x: 1, y: 0.9999999, z: 1} m_ConstrainProportionsScale: 0 @@ -68256,6 +68246,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -71059,6 +71050,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -72164,7 +72156,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7500986901620979362} serializedVersion: 2 - m_LocalRotation: {x: -0.66829646, y: -0.042611837, z: -0.034562618, w: 0.7418689} + m_LocalRotation: {x: -0.39338672, y: -0.0457422, z: -0.014686555, w: 0.91811705} m_LocalPosition: {x: 6.9849204e-10, y: 0.022451894, z: -0.000000012456441} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999998} m_ConstrainProportionsScale: 0 @@ -72179,7 +72171,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8544044503893440247} serializedVersion: 2 - m_LocalRotation: {x: -0.552781, y: 0.19417475, z: -0.18182649, w: 0.78972685} + m_LocalRotation: {x: -0.62790257, y: 0.1480469, z: 0.079001956, w: 0.75998634} m_LocalPosition: {x: 0.0000000055879346, y: 0.09417637, z: -0.00000009499492} m_LocalScale: {x: 1, y: 0.9999999, z: 0.9999998} m_ConstrainProportionsScale: 0 @@ -72303,7 +72295,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2798523362088558492} serializedVersion: 2 - m_LocalRotation: {x: -0.20619237, y: -0.06660995, z: -0.08301471, w: 0.9727058} + m_LocalRotation: {x: -0.22154555, y: -0.10419294, z: -0.19675411, w: 0.94939417} m_LocalPosition: {x: -0.030291557, y: 0.10179321, z: -0.0031807057} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -72319,7 +72311,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8025460715156485174} serializedVersion: 2 - m_LocalRotation: {x: 0.032096792, y: 0.041164797, z: -0.47719663, w: 0.8772449} + m_LocalRotation: {x: 0.024043797, y: 0.043444656, z: -0.31478152, w: 0.94786453} m_LocalPosition: {x: -0.00000007357449, y: 0.028132211, z: 0.00000037439176} m_LocalScale: {x: 1, y: 1, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -72424,7 +72416,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562201231930335811} serializedVersion: 2 - m_LocalRotation: {x: 0.64495397, y: -0.040844694, z: -0.030839264, w: -0.76250577} + m_LocalRotation: {x: 0.6947901, y: -0.039646223, z: -0.034669437, w: -0.7172816} m_LocalPosition: {x: 0.000000007916241, y: 0.03079354, z: -0.00000005750919} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} m_ConstrainProportionsScale: 0 @@ -72645,7 +72637,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 703528799837206004} serializedVersion: 2 - m_LocalRotation: {x: 0.08464704, y: 0.08801357, z: -0.039125096, w: 0.9917449} + m_LocalRotation: {x: -0.03774314, y: 0.026349928, z: 0.02793007, w: 0.9985495} m_LocalPosition: {x: -0.000000024214387, y: 0.28226882, z: 0.000000009313229} m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -72746,7 +72738,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426164585323811173} serializedVersion: 2 - m_LocalRotation: {x: -0.5940968, y: -0.4045304, z: -0.42888686, w: 0.5472296} + m_LocalRotation: {x: -0.45378113, y: -0.539892, z: -0.4781546, w: 0.523419} m_LocalPosition: {x: 0.027396753, y: 0.16675851, z: 0.0010840442} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -73844,7 +73836,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3464581255126517465} serializedVersion: 2 - m_LocalRotation: {x: 0.10737033, y: -0.09090082, z: -0.096410125, w: 0.9853496} + m_LocalRotation: {x: 0.038700487, y: -0.22615436, z: 0.1925765, w: 0.9540811} m_LocalPosition: {x: -0.000000009313225, y: 0.28226873, z: -0.00000008381906} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -74277,8 +74269,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5327291320013022961} serializedVersion: 2 - m_LocalRotation: {x: -0.09633743, y: -0.3720598, z: -0.045637522, w: 0.9220671} - m_LocalPosition: {x: -0.023183458, y: 1.0622324, z: 0.0204212} + m_LocalRotation: {x: -0.065068565, y: 0.38750583, z: 0.034455866, w: 0.9189223} + m_LocalPosition: {x: -0.018571565, y: 1.0554674, z: -0.036221996} m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 m_Children: @@ -74312,7 +74304,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4282499749702318053} serializedVersion: 2 - m_LocalRotation: {x: -0.54698515, y: -0.04193298, z: -0.01934561, w: 0.8358676} + m_LocalRotation: {x: -0.66641414, y: -0.039650097, z: -0.027121127, w: 0.7440327} m_LocalPosition: {x: 0.0000000037252907, y: 0.040037047, z: -0.000000048195954} m_LocalScale: {x: 1, y: 0.9999999, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -74442,6 +74434,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -75540,37 +75533,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 196bb08d6c2d3c9499c04e1281fd4ad3, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 96c5704d0681e35408630c488fc0c234, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 - _source: {fileID: 7582698285514830837} - _foregroundOpacity: 0 - _vibrancy: 1 - _brightness: 0 - _flatten: 0 - paraformConfig: - isCornersLinked: 0 - cornerRadii: {x: 64, y: 64, z: 64, w: 64} - cornerCurvature: 1.5 - filletCurvature: 2.5 - bevelWidth: 64 - ringThickness: 0 - elevation: 100 --- !u!1 &5504136654401173528 GameObject: m_ObjectHideFlags: 0 @@ -75697,6 +75659,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -76888,7 +76851,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1716922966899554294} serializedVersion: 2 - m_LocalRotation: {x: 0.72296727, y: -0.038093448, z: -0.030951366, w: -0.6891366} + m_LocalRotation: {x: 0.6664188, y: -0.039650045, z: -0.027121987, w: -0.74402845} m_LocalPosition: {x: -0.00000001164153, y: 0.040036976, z: -0.00000004842879} m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 @@ -77602,7 +77565,7 @@ MonoBehaviour: baseTransform: {fileID: 5796568687461294080} Hips: {fileID: 5233439127776133877} ScaleReferenceMode: 3 - finalScaleReference: 1.0713066 + finalScaleReference: 1.0679241 finalScaleReferenceSqrt: 0.1 customScaleReferenceValue: 0.5 DelayedInitialization: 0 @@ -77986,7 +77949,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8900166733022790008} serializedVersion: 2 - m_LocalRotation: {x: 0.4096792, y: -0.04569742, z: -0.015826391, w: -0.91094685} + m_LocalRotation: {x: 0.39338654, y: -0.045742456, z: -0.014686914, w: -0.9181171} m_LocalPosition: {x: -0.000000012805685, y: 0.022451827, z: 0.000000059139005} m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} m_ConstrainProportionsScale: 0 @@ -79028,7 +78991,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 908110196348297303} serializedVersion: 2 - m_LocalRotation: {x: 0.36607003, y: -0.04198876, z: -0.008148611, w: -0.9296038} + m_LocalRotation: {x: 0.29629716, y: -0.042002883, z: -0.004148572, w: -0.9541627} m_LocalPosition: {x: 0.0000000018626449, y: 0.033887587, z: 0.00000009988437} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -79115,7 +79078,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 791070421893191297} serializedVersion: 2 - m_LocalRotation: {x: 0.19812356, y: -0.05285623, z: 0.25428075, w: -0.9451426} + m_LocalRotation: {x: 0.5722598, y: -0.28645197, z: 0.12507208, w: -0.7581696} m_LocalPosition: {x: 0.029908966, y: 0.030986622, z: -0.008053283} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -79229,7 +79192,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6700497712217468539} serializedVersion: 2 - m_LocalRotation: {x: -0.47529972, y: -0.21868727, z: 0.21620032, w: 0.8243321} + m_LocalRotation: {x: -0.45108768, y: -0.092285596, z: 0.09723296, w: 0.8823543} m_LocalPosition: {x: 0.000000009313225, y: 0.094176374, z: -0.00000008940698} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999998} m_ConstrainProportionsScale: 0 @@ -79292,7 +79255,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5339936526328796785} serializedVersion: 2 - m_LocalRotation: {x: -0.25443393, y: -0.059362948, z: -0.091844216, w: 0.9608872} + m_LocalRotation: {x: -0.3938045, y: -0.109770894, z: -0.2489942, w: 0.87799215} m_LocalPosition: {x: -0.007285389, y: 0.0999468, z: 0.0017986412} m_LocalScale: {x: 1, y: 1, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -80603,7 +80566,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3155971357199345552} serializedVersion: 2 - m_LocalRotation: {x: -0.014963865, y: 0.049134642, z: -0.0075933933, w: 0.9986512} + m_LocalRotation: {x: 0.04611434, y: -0.025520474, z: 0.0017032474, w: 0.9986087} m_LocalPosition: {x: -3.1415976e-16, y: 0.18085836, z: 0.0000000023283067} m_LocalScale: {x: 1, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -81179,7 +81142,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2190632898029845381} serializedVersion: 2 - m_LocalRotation: {x: 0.60376763, y: -0.035627484, z: -0.020550624, w: -0.7960986} + m_LocalRotation: {x: 0.26755542, y: -0.03761947, z: -0.0020040125, w: -0.96280575} m_LocalPosition: {x: -0.000000004889443, y: 0.029216407, z: -0.00000013597314} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -81800,7 +81763,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6319111502667635245} serializedVersion: 2 - m_LocalRotation: {x: 0.19116613, y: -0.06069643, z: -0.09464429, w: -0.97509694} + m_LocalRotation: {x: 0.3938026, y: -0.10977116, z: -0.24899532, w: -0.87799263} m_LocalPosition: {x: 0.007285394, y: 0.09994679, z: 0.0017984118} m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} m_ConstrainProportionsScale: 0 @@ -81893,6 +81856,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 @@ -82607,33 +82571,6 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 CustomBlends: {fileID: 0} ---- !u!114 &7582698285514830837 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2317150787485973026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ee01e66702087b4798e633ca34c7956, type: 3} - m_Name: - m_EditorClassIdentifier: LeTai.Asset.TranslucentImage::LeTai.Asset.TranslucentImage.TranslucentImageSource - blurConfig: {fileID: 11400000, guid: 45ac4b3d5f9dfc746a89d180929cc72e, type: 2} - downsample: 0 - blurRegion: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - maxUpdateRate: Infinity - cullPadding: 0 - preview: 0 - backgroundFill: - mode: 0 - color: {r: 1, g: 1, b: 1, a: 1} - skipCulling: 0 --- !u!124 &7582698285514830838 Behaviour: m_ObjectHideFlags: 0 @@ -82911,7 +82848,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 943616259276507241} serializedVersion: 2 - m_LocalRotation: {x: -0.010008092, y: 0.05891478, z: -0.3305069, w: 0.9419098} + m_LocalRotation: {x: -0.010137017, y: 0.05931326, z: -0.31946772, w: 0.9456848} m_LocalPosition: {x: 0.000000020489098, y: 0.043039605, z: -0.00000012479725} m_LocalScale: {x: 1, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 @@ -83007,7 +82944,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6632945049885216665} serializedVersion: 2 - m_LocalRotation: {x: 0.0933523, y: 0.17259008, z: -0.13643076, w: 0.9710225} + m_LocalRotation: {x: -0.026762474, y: -0.014382632, z: 0.041180808, w: 0.9986897} m_LocalPosition: {x: -7.114129e-16, y: 0.19675104, z: -0.0000000051222746} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -83460,7 +83397,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7959565191287590061} serializedVersion: 2 - m_LocalRotation: {x: 0.48903263, y: -0.04257834, z: -0.014606833, w: -0.8711032} + m_LocalRotation: {x: 0.36881235, y: -0.043389738, z: -0.007191657, w: -0.9284628} m_LocalPosition: {x: -0.0000000037252894, y: 0.029992312, z: -0.0000001136214} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999998} m_ConstrainProportionsScale: 0 @@ -83735,7 +83672,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 938657419852716132} serializedVersion: 2 - m_LocalRotation: {x: 0.15281534, y: 0.13195105, z: 0.0277971, w: 0.9790116} + m_LocalRotation: {x: 0.27309012, y: 0.05599881, z: -0.011729157, w: 0.96028554} m_LocalPosition: {x: 0.0000000037252852, y: 0.5179994, z: 9.313222e-10} m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -85241,7 +85178,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2632036771373730513} serializedVersion: 2 - m_LocalRotation: {x: -0.57798404, y: -0.03600018, z: -0.019056499, w: 0.81503093} + m_LocalRotation: {x: -0.26755643, y: -0.037619382, z: -0.002003998, w: 0.96280545} m_LocalPosition: {x: 0.000000005820767, y: 0.029216416, z: -0.00000013737011} m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 @@ -85320,7 +85257,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509322905366631092} serializedVersion: 2 - m_LocalRotation: {x: -0.013689712, y: 0.9531672, z: -0.30213082, w: -0.001391232} + m_LocalRotation: {x: -0.013719648, y: 0.94548464, z: -0.32537603, w: -0.0010556281} m_LocalPosition: {x: -0.0000000067520802, y: 0.13506474, z: 0.000000014901159} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -85540,6 +85477,7 @@ MonoBehaviour: rotationalInterpolation: 0.5 rootRotation: 0.5 updateMode: 10 + disableMode: 0 animationPoseRatio: 0 reductionSetting: simpleDistance: 0 diff --git a/Assets/Scripts/MainGame/AttackArea/Submodules/ReactionSubmodule.cs b/Assets/Scripts/MainGame/AttackArea/Submodules/ReactionSubmodule.cs index 25a7c18fa..204e363c4 100644 --- a/Assets/Scripts/MainGame/AttackArea/Submodules/ReactionSubmodule.cs +++ b/Assets/Scripts/MainGame/AttackArea/Submodules/ReactionSubmodule.cs @@ -146,7 +146,7 @@ namespace Cielonos.MainGame if (hasPerfectDodge && owner.timeSm.enablingTimer <= 0.2f && characterDodgeSm.isPerfectDodging) { firstDodgeSource = characterDodgeSm.dodgeSources.Find(source => source.isDuringPerfectDodge); - firstDodgeSource.PerfectDodge(); + firstDodgeSource.PerfectDodge(owner); perfectDodgeAction?.Invoke(dodger); // 触发完美闪避成功事件 @@ -155,7 +155,7 @@ namespace Cielonos.MainGame else { firstDodgeSource = characterDodgeSm.dodgeSources[0]; - firstDodgeSource.NormalDodge(); + firstDodgeSource.NormalDodge(owner); normalDodgeAction?.Invoke(dodger); // 触发普通闪避成功事件 diff --git a/Assets/Scripts/MainGame/Base/BuffSystem/BuffSubmodules.cs b/Assets/Scripts/MainGame/Base/BuffSystem/BuffSubmodules.cs index 0fcc59b4e..8829dd486 100644 --- a/Assets/Scripts/MainGame/Base/BuffSystem/BuffSubmodules.cs +++ b/Assets/Scripts/MainGame/Base/BuffSystem/BuffSubmodules.cs @@ -176,12 +176,18 @@ namespace Cielonos.MainGame.Buffs timeLeft = duration; } - public void StackDuration(TimeSubmodule other) + public void AddDuration(TimeSubmodule other) { duration += other.duration; timeLeft += other.duration; } + public void AddDuration(float additionalDuration) + { + duration += additionalDuration; + timeLeft += additionalDuration; + } + public class IntervalAction { diff --git a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/BlockSubmodule.cs b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/BlockSubmodule.cs index 5d54d29c8..a46d949fe 100644 --- a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/BlockSubmodule.cs +++ b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/BlockSubmodule.cs @@ -18,13 +18,21 @@ namespace Cielonos.MainGame.Characters [ShowInInspector] public bool isPerfectBlocking => blockSources.Any(source => source.hasPerfectBlock && source.isDuringPerfectBlock); - public float afterPerfectBlockTimer; - public float afterNormalBlockTimer; + public Timer afterPerfectBlockTimer; + public CharacterBase perfectBlockedTarget; + + public Timer afterNormalBlockTimer; + public CharacterBase normalBlockedTarget; public BlockSubmodule(ReactionSubcontroller owner) : base(owner) { blockSources = new List(); canBlock = true; + + this.afterPerfectBlockTimer = new Timer(1); + this.afterPerfectBlockTimer.onComplete.Add(new PrioritizedAction(() => perfectBlockedTarget = null)); + this.afterNormalBlockTimer = new Timer(1); + this.afterPerfectBlockTimer.onComplete.Add(new PrioritizedAction(() => normalBlockedTarget = null)); } public void ApplyBlock(BlockSource source, bool refreshPerfect = false) @@ -99,8 +107,8 @@ namespace Cielonos.MainGame.Characters blockSources.RemoveAll(source => source.blockTime <= 0); } - afterPerfectBlockTimer -= owner.owner.selfTimeSm.DeltaTime; - afterNormalBlockTimer -= owner.owner.selfTimeSm.DeltaTime; + afterPerfectBlockTimer.Update(owner.owner.selfTimeSm.DeltaTime); + afterNormalBlockTimer.Update(owner.owner.selfTimeSm.DeltaTime); } } @@ -121,11 +129,13 @@ namespace Cielonos.MainGame.Characters public GameObject perfectBlockEffect; public uint perfectBlockSound; public Action onPerfectBlock; + public Breakthrough.Type normalBlockType; public GameObject normalBlockEffect; public uint normalBlockSound; public Action onNormalBlock; + public float triggerTime; @@ -173,11 +183,11 @@ namespace Cielonos.MainGame.Characters } VFXObject.Spawn(perfectBlockEffect, sourceCharacter, blockEffectPosition, Quaternion.identity); - //pObj.GetComponent().Simulate(0.1f, true, true); - //pObj.GetComponent().Play();//TODO: 增加起点时间参数 - - sourceCharacter.reactionSc.blockSm.afterPerfectBlockTimer = blockBufferTime + 0.25f; onPerfectBlock?.Invoke(attackArea); + + BlockSubmodule blockSm = sourceCharacter.reactionSc.blockSm; + blockSm.perfectBlockedTarget = attackArea.creator; + blockSm.afterPerfectBlockTimer.Reset(blockBufferTime + 0.25f); } public void NormalBlock(AttackAreaBase attackArea, Vector3 blockEffectPosition) @@ -192,8 +202,11 @@ namespace Cielonos.MainGame.Characters } VFXObject.Spawn(normalBlockEffect, sourceCharacter, blockEffectPosition, Quaternion.identity); - sourceCharacter.reactionSc.blockSm.afterNormalBlockTimer = blockBufferTime + 0.25f; onNormalBlock?.Invoke(attackArea); + + BlockSubmodule blockSm = sourceCharacter.reactionSc.blockSm; + blockSm.normalBlockedTarget = attackArea.creator; + blockSm.afterPerfectBlockTimer.Reset(blockBufferTime + 0.25f); } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/DodgeSubmodule.cs b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/DodgeSubmodule.cs index 89fc9e7da..50d34f666 100644 --- a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/DodgeSubmodule.cs +++ b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Reaction/DodgeSubmodule.cs @@ -12,18 +12,25 @@ namespace Cielonos.MainGame.Characters { public List dodgeSources; public bool canDodge; + [ShowInInspector] public bool isDodging => dodgeSources.Count > 0; + public Timer afterNormalDodgeTimer; + public CharacterBase normalDodgedTarget; + [ShowInInspector] public bool isPerfectDodging => dodgeSources.Any(source => source.hasPerfectDodge && source.isDuringPerfectDodge); - - public float afterPerfectDodgeTimer; - public float afterNormalDodgeTimer; + public Timer afterPerfectDodgeTimer; + public CharacterBase perfectDodgedTarget; public DodgeSubmodule(ReactionSubcontroller owner) : base(owner) { dodgeSources = new List(); canDodge = true; + this.afterNormalDodgeTimer = new Timer(1f); + this.afterNormalDodgeTimer.onComplete.Add(new PrioritizedAction(() => normalDodgedTarget = null)); + this.afterPerfectDodgeTimer = new Timer(1f); + this.afterPerfectDodgeTimer.onComplete.Add(new PrioritizedAction(() => perfectDodgedTarget = null)); } public void ApplyDodge(DodgeSource source, bool refreshPerfect = false) @@ -92,8 +99,8 @@ namespace Cielonos.MainGame.Characters dodgeSources.RemoveAll(source => source.dodgeTime <= 0); } - afterPerfectDodgeTimer -= owner.owner.selfTimeSm.DeltaTime; - afterNormalDodgeTimer -= owner.owner.selfTimeSm.DeltaTime; + afterPerfectDodgeTimer.Update(owner.owner.selfTimeSm.DeltaTime); + afterNormalDodgeTimer.Update(owner.owner.selfTimeSm.DeltaTime); } } @@ -109,8 +116,10 @@ namespace Cielonos.MainGame.Characters public bool isDuringPerfectDodge; public float perfectTime; public float dodgeTime; + public string perfectEffectName; public Action onPerfectDodge; + public string normalEffectName; public Action onNormalDodge; @@ -144,6 +153,7 @@ namespace Cielonos.MainGame.Characters this.perfectTime = perfectTime; this.hasPerfectDodge = true; this.isDuringPerfectDodge = true; + this._isTriggered = false; } @@ -164,7 +174,7 @@ namespace Cielonos.MainGame.Characters return defaultDodge; } - public void PerfectDodge() + public void PerfectDodge(AttackAreaBase attackArea) { if(_isTriggered) return; _isTriggered = true; @@ -176,10 +186,13 @@ namespace Cielonos.MainGame.Characters sourceCharacter.feedbackSc.PlayFeedback("PerfectDodge"); } - sourceCharacter.reactionSc.dodgeSm.afterPerfectDodgeTimer = dodgeBufferTime + 0.25f; + DodgeSubmodule dodgeSm = sourceCharacter.reactionSc.dodgeSm; + dodgeSm.perfectDodgedTarget = attackArea?.creator; + dodgeSm.afterPerfectDodgeTimer.Reset(dodgeBufferTime + 0.5f); + Debug.Log($"Perfect Dodge triggered by {sourceCharacter.name} against {attackArea?.creator?.name}"); } - public void NormalDodge() + public void NormalDodge(AttackAreaBase attackArea) { if(_isTriggered) return; _isTriggered = true; @@ -191,7 +204,9 @@ namespace Cielonos.MainGame.Characters sourceCharacter.feedbackSc.PlayFeedback("NormalDodge"); } - sourceCharacter.reactionSc.dodgeSm.afterNormalDodgeTimer = dodgeBufferTime + 0.25f; + DodgeSubmodule dodgeSm = sourceCharacter.reactionSc.dodgeSm; + dodgeSm.normalDodgedTarget = attackArea?.creator; + dodgeSm.afterNormalDodgeTimer.Reset(dodgeBufferTime + 0.5f); } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Render/RenderSubcontrollerBase.cs b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Render/RenderSubcontrollerBase.cs index 34751faa8..4ca5fb18e 100644 --- a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Render/RenderSubcontrollerBase.cs +++ b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/Render/RenderSubcontrollerBase.cs @@ -166,6 +166,8 @@ namespace Cielonos.MainGame.Characters public void SpawnShatters(Breakthrough.Type type, Vector3 direction) { + if(particleEffects["Shatters"] == null) return; + Color shatterColor = MainGameManager.BaseCollection.outlineColorCollection[type] * Mathf.Pow(2, 4); var main = particleEffects["Shatters"].main; main.startColor = shatterColor; diff --git a/Assets/Scripts/MainGame/Characters/Base/Submodules/SelfTimeSubmodule.cs b/Assets/Scripts/MainGame/Characters/Base/Submodules/SelfTimeSubmodule.cs index 627161520..412ff2648 100644 --- a/Assets/Scripts/MainGame/Characters/Base/Submodules/SelfTimeSubmodule.cs +++ b/Assets/Scripts/MainGame/Characters/Base/Submodules/SelfTimeSubmodule.cs @@ -280,6 +280,7 @@ namespace Cielonos.MainGame.Characters /// public override void Reset(float newDuration = -1f) { + isCompleted = false; currentTime = 0f; duration = newDuration >= 0f ? newDuration : originalDuration; } diff --git a/Assets/Scripts/MainGame/Characters/Player/Inventory/PlayerInventorySubcontroller.cs b/Assets/Scripts/MainGame/Characters/Player/Inventory/PlayerInventorySubcontroller.cs index 67779f68b..6227acbc1 100644 --- a/Assets/Scripts/MainGame/Characters/Player/Inventory/PlayerInventorySubcontroller.cs +++ b/Assets/Scripts/MainGame/Characters/Player/Inventory/PlayerInventorySubcontroller.cs @@ -27,9 +27,8 @@ namespace Cielonos.MainGame.Characters backpackSm ??= new BackpackSubmodule(this); equipmentSm ??= new EquipmentSubmodule(this); - - backpackSm.ObtainItem(); //backpackSm.ObtainItem(); + backpackSm.ObtainItem(); backpackSm.ObtainItem(); backpackSm.ObtainItem(); backpackSm.ObtainItem(); @@ -37,6 +36,8 @@ namespace Cielonos.MainGame.Characters backpackSm.ObtainItem(); backpackSm.ObtainItem(); backpackSm.ObtainItem(); + backpackSm.ObtainItem(); + backpackSm.ObtainItem(); foreach (MainWeaponBase mainWeapon in backpackSm.mainWeapons) { diff --git a/Assets/Scripts/MainGame/GameRun/Map/MapManager.cs b/Assets/Scripts/MainGame/GameRun/Map/MapManager.cs index 0904683c1..aea5f3fec 100644 --- a/Assets/Scripts/MainGame/GameRun/Map/MapManager.cs +++ b/Assets/Scripts/MainGame/GameRun/Map/MapManager.cs @@ -107,7 +107,7 @@ namespace Cielonos.MainGame // 7. 淡入画面 yield return new WaitForSeconds(0.5f); - ScreenFader.Instance.FadeToClear().Play(); + ScreenFader.Instance?.FadeToClear().Play(); // 8. 恢复玩家输入 playerInput.inputActions.Player.Enable(); diff --git a/Assets/Scripts/MainGame/Items/Data/FunctionData.cs b/Assets/Scripts/MainGame/Items/Data/FunctionData.cs index 9869a20ba..8e9bc0386 100644 --- a/Assets/Scripts/MainGame/Items/Data/FunctionData.cs +++ b/Assets/Scripts/MainGame/Items/Data/FunctionData.cs @@ -1,62 +1,88 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using Cielonos.MainGame.Characters; using Sirenix.OdinInspector; using SLSUtilities.General; +using SoftCircuits.Collections; using UnityEngine; +using UnityEngine.Serialization; namespace Cielonos.MainGame.Inventory { [CreateAssetMenu(fileName = "FunctionData", menuName = "Cielonos/Items/FunctionData")] public partial class FunctionData : SerializedScriptableObject { - [DictionaryDrawerSettings(KeyLabel = "Function Unit", DisplayMode = DictionaryDisplayOptions.ExpandedFoldout)] + [ListDrawerSettings(ShowIndexLabels = false, ListElementLabelName = "unitName", CustomAddFunction = "AddFunctionUnit")] [Searchable] - public Dictionary functionUnits = new Dictionary(); + public List functionUnitList = new List(); [OnInspectorGUI("UpdateUnits")] public void UpdateUnits() { - foreach (var unit in functionUnits.Values) + foreach (var unit in functionUnitList) { unit.parentData = this; } } + + private FunctionUnit AddFunctionUnit() + { + FunctionUnit newUnit = new FunctionUnit + { + unitName = $"Function {functionUnitList.Count + 1}", + parentData = this + }; + return newUnit; + } } public partial class FunctionData { - public enum IntervalReductionType + public enum CooldownReductionType { None = 0, Cooldown = 1, AttackSpeed = 10 } - [Serializable] public class FunctionUnit { [ReadOnly] public FunctionData parentData; - + + [TitleGroup("Information")] + public string unitName; [TitleGroup("Information")] public bool shownInUI; [TitleGroup("Information")] + [HideIf("shownInUI")] + public bool isMain; + [TitleGroup("Information")] + [ShowIf("@shownInUI || isMain")] public Sprite icon; [TitleGroup("Information")] - public List operation; + public List operation = new List(); + [TitleGroup("Information")] + [ValueDropdown("Tags")] + public List tags = new List(); [TitleGroup("Costs")] public float energyCost; [TitleGroup("Costs")] public int ammoCost; - [TitleGroup("Interval")] - public float interval; - [TitleGroup("Interval")] - public float intervalLowerLimit; - [TitleGroup("Interval")] - public IntervalReductionType intervalReductionType; + [FormerlySerializedAs("interval")] [TitleGroup("Cooldown")] + public float cooldown; + [FormerlySerializedAs("intervalLowerLimit")] [TitleGroup("Cooldown")] + public float cooldownLowerLimit; + [FormerlySerializedAs("intervalReductionType")] [TitleGroup("Cooldown")] + public CooldownReductionType cooldownReductionType; + + public static List Tags = new() + { + "Disruption" + }; } } } \ No newline at end of file diff --git a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime.meta b/Assets/Scripts/MainGame/Items/Extenders/Polychrome.meta similarity index 77% rename from Assets/OtherPlugins/Le Tai's Asset/Common/Runtime.meta rename to Assets/Scripts/MainGame/Items/Extenders/Polychrome.meta index d12c69784..7d2c28df9 100644 --- a/Assets/OtherPlugins/Le Tai's Asset/Common/Runtime.meta +++ b/Assets/Scripts/MainGame/Items/Extenders/Polychrome.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 92b7ac701e5a3a5489ece9cf6f16a779 +guid: f9eeb85c7bb082046b999e5e098bca4e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs new file mode 100644 index 000000000..c86ea3527 --- /dev/null +++ b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +namespace Cielonos.MainGame.Inventory.Collections +{ + /// + /// 光子解离器 / Photon Dissociator + /// Polychrome的扩展器，重攻击拆分为3段，每段伤害为原来的50%。 + /// + public class PhotonDissociator : ExtenderBase + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs.meta b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs.meta new file mode 100644 index 000000000..14b34da5c --- /dev/null +++ b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonDissociator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dfcb853ac3666fc45a65e43107958eaf \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs new file mode 100644 index 000000000..bd0be4800 --- /dev/null +++ b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +namespace Cielonos.MainGame.Inventory.Collections +{ + /// + /// 光子偏振器 / Photon Polarizer + /// Polychrome的扩展器，可以使完美格挡弹开敌人，阻止敌人的连招 + /// + public class PhotonPolarizer : ExtenderBase + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs.meta b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs.meta new file mode 100644 index 000000000..5f293b686 --- /dev/null +++ b/Assets/Scripts/MainGame/Items/Extenders/Polychrome/PhotonPolarizer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b6b2bf502e7cd5c4ca858a7492f332a9 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs b/Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs index c9b30fa25..7c8bbed1d 100644 --- a/Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs +++ b/Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs @@ -20,7 +20,7 @@ namespace Cielonos.MainGame.Inventory.Collections RegisterFunctionsToAnimSc(); if(!player.inputSc.IsMoving) PlayTargetedAnimation("Equip"); viewObjects["Wand"].SetFadeAnim(0.5f); - PlayerCanvas.MainWeaponUIArea.displayer.SetFrameOutline(1); + //PlayerCanvas.MainWeaponUIArea.displayer.SetFrameOutline(1); } public override void OnPrimaryPress() diff --git a/Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs b/Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs index 3c8260ea8..4b163e591 100644 --- a/Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs +++ b/Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs @@ -4,6 +4,7 @@ using Cielonos.MainGame.Buffs.Character; using Cielonos.MainGame.Characters; using Cielonos.MainGame.Effects.Feedback; using Cielonos.MainGame.UI; +using SLSUtilities.Feedback; using SLSUtilities.General; using SLSUtilities.FunctionalAnimation; using SLSUtilities.WwiseAssistance; @@ -51,8 +52,6 @@ namespace Cielonos.MainGame.Inventory.Collections viewObjects["Katana"].SetFadeAnim(0.2f); viewObjects["Saya"].SetFadeAnim(0.2f); - PlayerCanvas.MainWeaponUIArea.displayer.SetFrameOutline(0.4f); - PlayTargetedAnimation("EquipBlock"); SetBlock(equipBlockData); player.selfTimeSm.AddLocalTimer(0.4f, () => @@ -105,7 +104,7 @@ namespace Cielonos.MainGame.Inventory.Collections return; } - if (player.inputSc.IsHoldingSpecialA && functionSm["LightAttack"].IsAvailable()) + /*if (player.inputSc.IsHoldingSpecialA && functionSm["LightAttack"].IsAvailable()) { CharacterBase target = CombatManager.EnemySm.GetBestEnemy(5); if (PlayTargetedAnimation("AttackRC", target, 1f, true)) @@ -114,7 +113,7 @@ namespace Cielonos.MainGame.Inventory.Collections functionSm["LightAttack"].Execute(); } return; - } + }*/ if (player.landMovementSc.isSprinting && functionSm["LightAttack"].IsAvailable() && fullBodyFuncAnimSm.CheckPlayability()) { @@ -153,30 +152,48 @@ namespace Cielonos.MainGame.Inventory.Collections } List availableEnemies = CombatManager.EnemySm.GetEnemiesInRadius(player.transform.position, 4); - - //完美格挡+反击 - if (player.reactionSc.blockSm.afterPerfectBlockTimer > 0) + BlockSubmodule blockSm = player.reactionSc.blockSm; + if (!blockSm.afterPerfectBlockTimer.isCompleted) { - Enemy target = CombatManager.EnemySm.GetBestEnemy(availableEnemies); - if (PlayTargetedAnimation("BlockParryAttack", target)) + Enemy blockedTarget = blockSm.perfectBlockedTarget as Enemy; + bool successPlayed; + if (blockedTarget != null && !availableEnemies.Contains(blockedTarget)) { - player.reactionSc.blockSm.afterPerfectBlockTimer = 0; - RemoveBlock(); + Debug.Log(blockedTarget.name); + float distance = Vector3.Distance(player.transform.position.Flatten(), blockedTarget.transform.position.Flatten()); + successPlayed = PlayTargetedAnimation(distance > 2f ? "DodgeParryAttack" : "BlockParryAttack", blockedTarget); + } + else + { + successPlayed = PlayTargetedAnimation("BlockParryAttack"); } - return; - } - - //完美闪避+反击 - if (player.reactionSc.dodgeSm.afterPerfectDodgeTimer > 0) - { - CharacterBase target = CombatManager.EnemySm.GetBestEnemy(12); - if (PlayTargetedAnimation("DodgeParryAttack", target)) + if(successPlayed) { - player.reactionSc.dodgeSm.afterPerfectDodgeTimer = 0; + blockSm.afterPerfectBlockTimer.Complete(); + RemoveBlock(); } + } - return; + DodgeSubmodule dodgeSm = player.reactionSc.dodgeSm; + if (!dodgeSm.afterPerfectDodgeTimer.isCompleted) + { + Enemy dodgedTarget = dodgeSm.perfectDodgedTarget as Enemy; + bool successPlayed; + if (dodgedTarget != null && !availableEnemies.Contains(dodgedTarget)) + { + float distance = Vector3.Distance(player.transform.position.Flatten(), dodgedTarget.transform.position.Flatten()); + successPlayed = PlayTargetedAnimation(distance > 2f ? "DodgeParryAttack" : "BlockParryAttack", dodgedTarget); + } + else + { + successPlayed = PlayTargetedAnimation("BlockParryAttack"); + } + + if(successPlayed) + { + dodgeSm.afterPerfectDodgeTimer.Complete(); + } } if (player.reactionSc.blockSm.HaveBlockSource(blockData.blockName)) @@ -202,46 +219,49 @@ namespace Cielonos.MainGame.Inventory.Collections return; } - if (player.inputSc.IsHoldingSpecialA && functionSm["HeavyAttack"].IsAvailable()) + if (player.inputSc.IsHoldingSpecialA) { - string suffix = techniqueScore switch + if (functionSm["DisruptionAttack"].IsAvailable()) { - < 1f => "A", - < 3f => "B", - >= 3f => "C", - _ => "A" - }; - - List disruptable = CombatManager.EnemySm.GetDisruptableEnemies(availableEnemies); - Enemy target = CombatManager.EnemySm.GetScoredEnemies(availableEnemies) - .ApplyScoreModifier(disruptable, 0f, 1f).BestEnemy(); - - if (PlayTargetedAnimation("DisruptionAttack" + suffix, target)) - { - if (disruptable.Count > 0) + string suffix = techniqueScore switch { - var timeScaleModifierClip = player.feedbackSc - .GetFeedbackData("DisruptionStartup") - .Clip("Time"); - float duration = fullBodyFuncAnimSm.collection["DisruptionAttack" + suffix] - .Interval(IntervalType.Startup).Duration * 2; - - timeScaleModifierClip.duration = duration; - player.feedbackSc.PlayFeedback("DisruptionStartup"); - } + < 1f => "A", + < 3f => "B", + >= 3f => "C", + _ => "A" + }; - if (suffix == "B") + List disruptable = CombatManager.EnemySm.GetDisruptableEnemies(availableEnemies); + Enemy target = CombatManager.EnemySm.GetScoredEnemies(availableEnemies) + .ApplyScoreModifier(disruptable, 0f, 1f).BestEnemy(); + + if (PlayTargetedAnimation("DisruptionAttack" + suffix, target)) { - ModifyTechniqueScore(-1, false); + if (disruptable.Count > 0) + { + FeedbackClip timeScaleModifierClip = player.feedbackSc.GetFeedbackData("DisruptionStartup") + .Clip("Time"); + float duration = fullBodyFuncAnimSm.collection["DisruptionAttack" + suffix] + .Interval(IntervalType.Startup).Duration * 2; + + timeScaleModifierClip.duration = duration; + player.feedbackSc.PlayFeedback("DisruptionStartup"); + } + + if (suffix == "B") + { + ModifyTechniqueScore(-1, false); + } + else if (suffix == "C") + { + ModifyTechniqueScore(-3, false); + } + + comboSm.main.Reset(); + functionSm["DisruptionAttack"].Execute(); } - else if (suffix == "C") - { - ModifyTechniqueScore(-3, false); - } - - comboSm.main.Reset(); - functionSm["HeavyAttack"].Execute(); } + return; } @@ -299,7 +319,7 @@ namespace Cielonos.MainGame.Inventory.Collections player.operationSc.Dodge(); DodgeSource defaultDodge = DodgeSource.Default(player); player.reactionSc.dodgeSm.ApplyDodge(defaultDodge); - player.reactionSc.dodgeSm.GetCurrentDodgeSource().PerfectDodge(); + player.reactionSc.dodgeSm.GetCurrentDodgeSource().PerfectDodge(null); player.reactionSc.dodgeSm.RemoveDodge("DefaultDodge"); } } @@ -372,17 +392,15 @@ namespace Cielonos.MainGame.Inventory.Collections float magnitude = hitFeedback == "SingleNormalHit" ? 0.12f : 0.06f; positionShakeAction.amplitude = vfxData.Get(vfxName).slashScreenPosition.normalized * magnitude; feedbackSc.PlayFeedback(hitFeedback); - - new ElectronicParalysis.Progress(100f).Apply(enemy, player, this); ModifyTechniqueScore(0.02f); - if (attackUnit.unitName == "InstantAttack") + /*if (attackUnit.unitName == "InstantAttack") { if (enemy.buffSm.HasBuff()) { slash.attackSm.attackValue.damage *= 2f; } - } + }*/ }); return slash; @@ -391,11 +409,25 @@ namespace Cielonos.MainGame.Inventory.Collections private NormalArea GenerateHeavySlash(string vfxName, AttackUnit attackUnit) { NormalArea slash = vfxData.SpawnVFX(vfxName, player).GetComponentInChildren(); + + slash.Initialize(player, this, Fraction.Enemy); + + if (!HasExtender()) + { + slash.SetAttackSubmodule(attackUnit) + .SetTimeSubmodule(1f, 0.04f) + .SetHitSubmodule(); + } + else // 如果有Photon Dissociator，重攻击拆分为五段，每段伤害为原来的30%，时间和判定也相应调整 + { + AttackUnit modifiedUnit = attackUnit.Clone(); + modifiedUnit.startDamage *= 0.5f; + + slash.SetAttackSubmodule(modifiedUnit) + .SetTimeSubmodule(1f, 0.04f, 0.4f) + .SetHitSubmodule(0.1f, 3); + } - slash.Initialize(player, this, Fraction.Enemy) - .SetAttackSubmodule(attackUnit) - .SetTimeSubmodule(1f, 0.04f) - .SetHitSubmodule(); slash.SetImpulseSubmodule(1f).WithRepulsion(5f); slash.attackSm.breakthroughAction = (enemy, hitPosition) => @@ -500,8 +532,6 @@ namespace Cielonos.MainGame.Inventory.Collections if (attackArea is NormalArea) { ModifyTechniqueScore(-0.1f); - //attackArea.creator.GetHit(Breakthrough.Type.Disruption, out _); - //attackArea.creator.movementSc.impulseSm.ApplyKnockback(player.transform.forward, 5f); } }; @@ -516,12 +546,15 @@ namespace Cielonos.MainGame.Inventory.Collections new Vector3(0f, 4f, -2f); feedbackSc.PlayFeedback("PerfectBlock"); - + if (attackArea is NormalArea) { ModifyTechniqueScore(0.2f); - //attackArea.creator.GetHit(Breakthrough.Type.Disruption, out _); - //attackArea.creator.movementSc.impulseSm.ApplyKnockback(player.transform.forward, 5f); + if (HasExtender()) + { + attackArea.creator.GetHit(Breakthrough.Type.Forced, out _); + attackArea.creator.movementSc.impulseSm.ApplyKnockback(player.transform.forward, 6f); + } } }; diff --git a/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs b/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs new file mode 100644 index 000000000..c1e485c6d --- /dev/null +++ b/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs @@ -0,0 +1,84 @@ +using System; +using Cielonos.MainGame.Buffs; +using Cielonos.MainGame.Buffs.Character; +using Cielonos.MainGame.Characters; +using SLSUtilities.General; +using UnityEngine; + +namespace Cielonos.MainGame.Inventory.Collections +{ + /// + /// 穿甲弹头 / Armor Piercing Round + /// Kinetics 攻击命中时降低目标护甲。 + /// + public partial class ArmorPiercingRound : PassiveEquipmentBase + { + private const string EventKey = nameof(ArmorPiercingRound); + + public override void OnObtained() + { + base.OnObtained(); + Action onStartAttack = OnStartAttack; + player.eventSm.onStartAttack.Add(EventKey, onStartAttack.ToPrioritized()); + } + + public override void OnDiscarded() + { + player.eventSm.onStartAttack.Remove(EventKey); + base.OnDiscarded(); + } + + private void OnStartAttack(AttackAreaBase attackArea, CharacterBase target, Attack.Context context) + { + if (context.value.type == Attack.Type.Kinetics) + { + int armorReduction = Mathf.RoundToInt(passiveAttributeSm.GetItemAttribute("ArmorReduction")); + new ArmorReduction(5f, armorReduction).Apply(target, player, this); + } + } + } + + public partial class ArmorPiercingRound + { + /// + /// 穿甲弹头的Buff，默认降低目标等于unitedStack层数的护甲，持续5秒 + /// + public class ArmorReduction : CharacterBuffBase + { + public ArmorReduction(float duration, int stack) + { + Initialize(BuffType.Positive, BuffDispelLevel.Basic); + + this.contentSubmodule = new ContentSubmodule(this); + this.timeSubmodule = new TimeSubmodule(this, duration); + this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack); + this.attributeSubmodule = new AttributeSubmodule(this); + } + + public override bool OnBuffApply(out CharacterBuffBase existingBuff) + { + if (FindExistingSameBuff(out ArmorReduction existing)) + { + existingBuff = existing; + existing.timeSubmodule.RefreshDuration(); + existing.unitedStackSubmodule.PickHigherStack(this.unitedStackSubmodule); + existing.UpdateArmorValue(existing.unitedStackSubmodule.stackAmount); + return false; + } + + existingBuff = null; + UpdateArmorValue(unitedStackSubmodule.stackAmount); + return true; + } + + /// + /// 根据当前层数更新护甲加成数值。 + /// + private void UpdateArmorValue(int stacks) + { + attributeSubmodule.numericChange[CharacterAttribute.Armor] = -stacks; + attributeSubmodule.RefreshAllModifiedAttributes(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs.meta b/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs.meta new file mode 100644 index 000000000..45dff7358 --- /dev/null +++ b/Assets/Scripts/MainGame/Items/PassiveEquipments/ArmorPiercingRound.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 46a4b90939f53e04c8b0211785d581d5 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/PassiveEquipments/Ascension.cs b/Assets/Scripts/MainGame/Items/PassiveEquipments/Ascension.cs index 21fa46f64..d8c770813 100644 --- a/Assets/Scripts/MainGame/Items/PassiveEquipments/Ascension.cs +++ b/Assets/Scripts/MainGame/Items/PassiveEquipments/Ascension.cs @@ -1,5 +1,3 @@ -using UnityEngine; - namespace Cielonos.MainGame.Inventory.Collections { public class Ascension : PassiveEquipmentBase diff --git a/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs b/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs new file mode 100644 index 000000000..1155e335e --- /dev/null +++ b/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs @@ -0,0 +1,36 @@ +using System; +using Cielonos.MainGame.Buffs.Character; +using Cielonos.MainGame.Characters; +using SLSUtilities.General; +using UnityEngine; + +namespace Cielonos.MainGame.Inventory.Collections +{ + /// + /// 助燃剂 / Combustion Enhancer + /// 每次攻击到敌人后，如果敌人处于燃烧Buff，那么为燃烧Buff持续时间延长0.1秒 + /// + public class CombustionEnhancer : PassiveEquipmentBase + { + private const string EventKey = nameof(CombustionEnhancer); + + public override void OnObtained() + { + base.OnObtained(); + Action onFinishAttack = OnFinishAttack; + player.eventSm.onFinishAttack.Add(EventKey, onFinishAttack.ToPrioritized()); + } + + public override void OnDiscarded() + { + player.eventSm.onFinishAttack.Remove(EventKey); + base.OnDiscarded(); + } + + private void OnFinishAttack(AttackAreaBase attackArea, CharacterBase target, Attack.Result result) + { + Burn burn = target.buffSm.GetBuff(); + burn?.timeSubmodule.AddDuration(0.1f); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs.meta b/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs.meta new file mode 100644 index 000000000..c0c3228f8 --- /dev/null +++ b/Assets/Scripts/MainGame/Items/PassiveEquipments/CombustionEnhancer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d9bbfaab77002de4f98d00e15a5b6466 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Items/Submodules/FunctionSubmodule.cs b/Assets/Scripts/MainGame/Items/Submodules/FunctionSubmodule.cs index 29f6abca4..0e6191be2 100644 --- a/Assets/Scripts/MainGame/Items/Submodules/FunctionSubmodule.cs +++ b/Assets/Scripts/MainGame/Items/Submodules/FunctionSubmodule.cs @@ -20,9 +20,9 @@ namespace Cielonos.MainGame.Inventory public FunctionSubmodule(ItemBase owner, FunctionData data) : base(owner) { functionUnits = new Dictionary(); - foreach (var kvp in data.functionUnits) + foreach (var unit in data.functionUnitList) { - functionUnits[kvp.Key] = new RuntimeFunctionUnit(this, kvp.Value); + functionUnits[unit.unitName] = new RuntimeFunctionUnit(this, unit); } } @@ -46,7 +46,7 @@ namespace Cielonos.MainGame.Inventory public RuntimeFunctionUnit(FunctionSubmodule owner, FunctionData.FunctionUnit data) : base(owner) { this.data = data; - maxCooldown = data.interval; + maxCooldown = data.cooldown; currentCooldown = 0f; } @@ -60,30 +60,49 @@ namespace Cielonos.MainGame.Inventory { bool cooldownAvailable = currentCooldown <= 0f; bool energyAvailable = character.attributeSm[CharacterAttribute.Energy] >= GetEffectiveEnergyCost(); - return cooldownAvailable && energyAvailable; + bool available = cooldownAvailable && energyAvailable; + + if (!available) + { + if(character is Player && owner.owner is MainWeaponBase) + { + if (data.shownInUI || data.isMain) + { + PlayerCanvas.MainWeaponUIArea.functionIconDict[data.unitName].SetFrameOutline(0.25f, Color.red); + } + } + } + return available; } public RuntimeFunctionUnit Execute() { ResetCooldown(); ConsumeEnergy(); + if(character is Player && owner.owner is MainWeaponBase) + { + if (data.shownInUI || data.isMain) + { + PlayerCanvas.MainWeaponUIArea.functionIconDict[data.unitName].SetFrameOutline(0.25f); + } + } return this; } - private const float MinCooldownMultiplier = 0.1f; + private const float MaxCooldownReduction = 0.9f; private const float MaxEnergyCostReduction = 0.9f; /// 计算应用 EnergyCostReduction 后的实际能量消耗。 private float GetEffectiveEnergyCost() { - float ecr = Mathf.Clamp(character.attributeSm[CharacterAttribute.EnergyCostReduction], 0f, MaxEnergyCostReduction); - return data.energyCost * (1f - ecr); + float energyCostReduction = Mathf.Clamp(character.attributeSm[CharacterAttribute.EnergyCostReduction], 0f, MaxEnergyCostReduction); + return data.energyCost * (1f - energyCostReduction); } private void ResetCooldown() { - float cdr = Mathf.Clamp(character.attributeSm[CharacterAttribute.CooldownReduction], 0f, 1f - MinCooldownMultiplier); - currentCooldown = maxCooldown * (1f - cdr); + float cooldownReduction = Mathf.Clamp(character.attributeSm[CharacterAttribute.CooldownReduction], 0f, MaxCooldownReduction); + currentCooldown = maxCooldown * (1f - cooldownReduction); } private void ConsumeEnergy() diff --git a/Assets/Scripts/MainGame/Managers/CombatManager/CombatRoomSubmodule/CombatRoomSubmodule.cs b/Assets/Scripts/MainGame/Managers/CombatManager/CombatRoomSubmodule/CombatRoomSubmodule.cs index 20c6a8573..bb1b4f272 100644 --- a/Assets/Scripts/MainGame/Managers/CombatManager/CombatRoomSubmodule/CombatRoomSubmodule.cs +++ b/Assets/Scripts/MainGame/Managers/CombatManager/CombatRoomSubmodule/CombatRoomSubmodule.cs @@ -105,7 +105,7 @@ namespace Cielonos.MainGame OnEnemyDefeated?.Invoke(enemy); GrantCurrencyDrop(enemy); - Debug.Log($"[CombatManager] 敌人死亡：{enemy.name}，剩余：{owner.enemySm.activeEnemiesList.Count}"); + //Debug.Log($"[CombatManager] 敌人死亡：{enemy.name}，剩余：{owner.enemySm.activeEnemiesList.Count}"); if (owner.enemySm.activeEnemiesList.Count > 0) { @@ -115,7 +115,7 @@ namespace Cielonos.MainGame // 所有敌人已清除 roomState = CombatRoomState.Cleared; owner.enemySm.OnEnemyRemoved -= HandleEnemyRemoved; - Debug.Log("[CombatManager] 战斗房间已清空，触发 OnRoomCleared。"); + //Debug.Log("[CombatManager] 战斗房间已清空，触发 OnRoomCleared。"); OnRoomCleared?.Invoke(); } @@ -130,7 +130,7 @@ namespace Cielonos.MainGame int amount = MainGameManager.Config.RollCurrency(typedEnemy.enemyRank, rng); MainGameManager.Player.inventorySc.backpackSm.ObtainItem(amount); - Debug.Log($"[CombatRoomSubmodule] 击杀 {typedEnemy.enemyRank} 敌人，获得稀有材料 x{amount}。"); + //Debug.Log($"[CombatRoomSubmodule] 击杀 {typedEnemy.enemyRank} 敌人，获得稀有材料 x{amount}。"); } } } diff --git a/Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatData.asset b/Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatData.asset index 094db43cd..5866306b1 100644 --- a/Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatData.asset +++ b/Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatData.asset @@ -64,8 +64,8 @@ MonoBehaviour: tags: - Normal barIndex: 0 - beatInBar: 6 - - time: 2.5958335 + beatInBar: 7 + - time: 2.6375 tags: - Normal barIndex: 1 diff --git a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponDisplayer.cs b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponDisplayer.cs index dc44bc8a9..06e1a3381 100644 --- a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponDisplayer.cs +++ b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponDisplayer.cs @@ -15,15 +15,14 @@ namespace Cielonos.MainGame.UI public Image frame; private Sequence frameOutlineSequence; - public void Initialize(Sprite icon, string weaponName) + public void Initialize(RuntimeFunctionUnit functionUnit, string weaponName) { - rectIcon.sprite = icon; + rectIcon.sprite = functionUnit.data.icon; weaponNameText.text = weaponName; } public void SetFrameOutline(float totalDuration, Color color = default, float intensity = 2f) { - return; color = color == default ? Color.cyan : color; Color hdrColor = color * Mathf.Pow(2f, intensity); GlowFilter glowFilter = frame.GetComponent(); diff --git a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponFunctionIcon.cs b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponFunctionIcon.cs index 0d633c15c..eb4eaa9de 100644 --- a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponFunctionIcon.cs +++ b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponFunctionIcon.cs @@ -1,5 +1,8 @@ +using ChocDino.UIFX; using Cielonos.MainGame.Inventory; +using DG.Tweening; using SLSUtilities.UI; +using TMPro; using UnityEngine; using UnityEngine.Serialization; using UnityEngine.UI; @@ -8,31 +11,87 @@ namespace Cielonos.MainGame.UI { public class MainWeaponFunctionIcon : UIElementBase { - public RuntimeFunctionUnit functionUnit; - [FormerlySerializedAs("timerFillImage")] public Image frame; + public Image frame; public Image iconImage; - public Image timer; - + public Image timerImage; + public TMP_Text timerText; + public TMP_Text costText; + + private Sequence _frameOutlineSequence; + private RuntimeFunctionUnit _functionUnit; public void Initialize(RuntimeFunctionUnit functionUnit) { - this.functionUnit = functionUnit; + this._functionUnit = functionUnit; iconImage.sprite = functionUnit.data.icon != null ? functionUnit.data.icon : null; + + if (_functionUnit.maxCooldown <= 0) + { + timerImage.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); + } + + if(_functionUnit.data.energyCost <= 0) + { + costText.gameObject.SetActive(false); + } + else + { + costText.text = Mathf.CeilToInt(_functionUnit.data.energyCost).ToString("D"); + } + + if (_functionUnit.data.tags.Contains("Disruption")) + { + Color newColor = Color.yellow; + iconImage.color = newColor; + newColor.a = 0.5f; + frame.color = newColor; + } } public override void UpdateUI() { - float fillAmount; - - if (functionUnit.maxCooldown <= 0f) + if (_functionUnit.maxCooldown <= 0f) { - fillAmount = 1f; + //无冷却 } else { - fillAmount = 1f - functionUnit.currentCooldown / functionUnit.maxCooldown; + float fillAmount = 1f - _functionUnit.currentCooldown / _functionUnit.maxCooldown; + timerImage.fillAmount = fillAmount; + + if (_functionUnit.currentCooldown > 0f) + { + timerText.text = _functionUnit.currentCooldown.ToString("F1"); + } + else + { + timerText.text = ""; + } } - - frame.fillAmount = fillAmount; + + if (_functionUnit.data.energyCost > 0) + { + float playerCurrentEnergy = MainGameManager.Player.attributeSm[CharacterAttribute.Energy]; + costText.color = playerCurrentEnergy >= _functionUnit.data.energyCost ? Color.cyan : Color.orangeRed; + costText.text = Mathf.CeilToInt(_functionUnit.data.energyCost).ToString("D"); + } + } + + public void SetFrameOutline(float totalDuration, Color color = default, float intensity = 0.5f) + { + color = color == default ? Color.white : color; + Color hdrColor = color * Mathf.Pow(2f, intensity); + GlowFilter glowFilter = frame.GetComponent(); + glowFilter.Color = hdrColor; + float fadeDuration = Mathf.Clamp(totalDuration / 2f, 0.2f, totalDuration); + float stayDuration = totalDuration - fadeDuration; + float strengthPeak = 0.5f; + _frameOutlineSequence?.Kill(true); + _frameOutlineSequence = DOTween.Sequence(); + _frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, strengthPeak, fadeDuration).SetEase(Ease.OutQuad)); + _frameOutlineSequence.AppendInterval(stayDuration); + _frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, 0f, fadeDuration).SetEase(Ease.InQuad)); + _frameOutlineSequence.Play(); } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponUIArea.cs b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponUIArea.cs index 7097cfe59..df0785d47 100644 --- a/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponUIArea.cs +++ b/Assets/Scripts/MainGame/UI/PlayerUI/MainWeapon/MainWeaponUIArea.cs @@ -14,29 +14,40 @@ namespace Cielonos.MainGame.UI public RectTransform functionIconContainer; public MainWeaponDisplayer displayer; + public MainWeaponFunctionIcon mainFunctionIcon; public List functionIcons; - + public Dictionary functionIconDict; + private void Awake() { functionIcons = new List(); + functionIconDict = new Dictionary(); } public void Initialize(MainWeaponBase mainWeapon) { this.mainWeapon = mainWeapon; - Sprite rectIcon = mainWeapon.contentData.rectIcon; - string weaponName = mainWeapon.contentData.itemClass.Name; //TODO: 后续改为本地化显示 - displayer.Initialize(rectIcon, weaponName); + string weaponName = mainWeapon.contentData.itemClass.Name; ClearIcons(); foreach (KeyValuePair unit in mainWeapon.functionSm.functionUnits) { - if (!unit.Value.data.shownInUI) continue; - - MainWeaponFunctionIcon icon = Instantiate(functionIconPrefab, functionIconContainer).GetComponent(); - icon.Initialize(unit.Value); - functionIcons.Add(icon); + if (unit.Value.data.isMain) + { + mainFunctionIcon.Initialize(unit.Value); + functionIconDict[unit.Key] = mainFunctionIcon; + } + else + { + if (!unit.Value.data.shownInUI) continue; + + MainWeaponFunctionIcon icon = Instantiate(functionIconPrefab, functionIconContainer).GetComponent(); + icon.Initialize(unit.Value); + functionIcons.Add(icon); + functionIconDict[unit.Key] = icon; + } + } } @@ -53,6 +64,7 @@ namespace Cielonos.MainGame.UI } functionIcons.Clear(); + functionIconDict.Clear(); } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentIcon.cs b/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentIcon.cs index 2f9e943a3..08b29ce1b 100644 --- a/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentIcon.cs +++ b/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentIcon.cs @@ -3,6 +3,7 @@ using ChocDino.UIFX; using Cielonos.MainGame.Inventory; using DG.Tweening; using SLSUtilities.UI; +using TMPro; using UnityEngine; using UnityEngine.UI; @@ -11,18 +12,21 @@ namespace Cielonos.MainGame.UI public class SupportEquipmentIcon : UIElementBase { public SupportEquipmentBase supportEquipment; - public RuntimeFunctionUnit functionUnit; public Image frame; public Image iconImage; - public Image timer; - private Sequence frameOutlineSequence; + public Image timerImage; + public TMP_Text timerText; + public TMP_Text costText; + + private RuntimeFunctionUnit _functionUnit; + private Sequence _frameOutlineSequence; public void Initialize(SupportEquipmentBase supportEquipment) { if (supportEquipment == null) { iconImage.sprite = null; - functionUnit = null; + _functionUnit = null; } else { @@ -35,40 +39,91 @@ namespace Cielonos.MainGame.UI if (functionCount == 0) { - + DisableAllParts(); } else if (functionCount == 1) { - functionUnit = supportEquipment.functionSm.functionUnits.Values.ToList()[0]; + _functionUnit = supportEquipment.functionSm.mainFunction; } else { - + //如果有多个功能单元，优先显示主功能单元 + _functionUnit = supportEquipment.functionSm.mainFunction; + } + + timerImage.gameObject.SetActive(true); + timerText.gameObject.SetActive(true); + costText.gameObject.SetActive(true); + iconImage.color = Color.white; + + if (_functionUnit.maxCooldown <= 0) + { + timerImage.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); + } + + if(_functionUnit.data.energyCost <= 0) + { + costText.gameObject.SetActive(false); + } + else + { + costText.text = Mathf.CeilToInt(_functionUnit.data.energyCost).ToString("D"); + } + + if (_functionUnit.data.tags.Contains("Disruption")) + { + Color newColor = Color.yellow; + iconImage.color = newColor; + newColor.a = 0.5f; + frame.color = newColor; } } else { - + DisableAllParts(); } } } + public void DisableAllParts() + { + iconImage.sprite = null; + iconImage.color = Color.clear; + timerImage.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); + costText.gameObject.SetActive(false); + } + public override void UpdateUI() { - if (functionUnit == null) return; + if (_functionUnit == null) return; - float fillAmount; - - if (functionUnit.maxCooldown <= 0f) + if (_functionUnit.maxCooldown <= 0f) { - fillAmount = 0f; + //无冷却 } else { - fillAmount = functionUnit.currentCooldown / functionUnit.maxCooldown; + float fillAmount = 1f - _functionUnit.currentCooldown / _functionUnit.maxCooldown; + timerImage.fillAmount = fillAmount; + + if (_functionUnit.currentCooldown > 0f) + { + timerText.text = _functionUnit.currentCooldown.ToString("F1"); + } + else + { + timerText.text = ""; + } + } + + if (_functionUnit.data.energyCost > 0) + { + float playerCurrentEnergy = MainGameManager.Player.attributeSm[CharacterAttribute.Energy]; + costText.color = playerCurrentEnergy >= _functionUnit.data.energyCost ? Color.cyan : Color.orangeRed; + costText.text = Mathf.CeilToInt(_functionUnit.data.energyCost).ToString("D"); } - - timer.fillAmount = fillAmount; } public void UseOutlineAnimation() => SetFrameOutline(0.4f, Color.white); @@ -85,13 +140,13 @@ namespace Cielonos.MainGame.UI float fadeDuration = Mathf.Clamp(totalDuration / 2f, 0.2f, totalDuration); float stayDuration = totalDuration - fadeDuration; float strengthPeak = 0.25f; - frameOutlineSequence?.Kill(true); - frameOutlineSequence = DOTween.Sequence(); - frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, strengthPeak, fadeDuration).SetEase(Ease.OutQuad)); - frameOutlineSequence.AppendInterval(stayDuration); - frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, 0f, fadeDuration).SetEase(Ease.InQuad)); - frameOutlineSequence.OnComplete(() => GetComponent().sortingOrder = 0); - frameOutlineSequence.Play(); + _frameOutlineSequence?.Kill(true); + _frameOutlineSequence = DOTween.Sequence(); + _frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, strengthPeak, fadeDuration).SetEase(Ease.OutQuad)); + _frameOutlineSequence.AppendInterval(stayDuration); + _frameOutlineSequence.Append(DOTween.To(() => glowFilter.Strength, x => glowFilter.Strength = x, 0f, fadeDuration).SetEase(Ease.InQuad)); + _frameOutlineSequence.OnComplete(() => GetComponent().sortingOrder = 0); + _frameOutlineSequence.Play(); } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentsUIArea.cs b/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentsUIArea.cs index 755ddb326..7fab1185a 100644 --- a/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentsUIArea.cs +++ b/Assets/Scripts/MainGame/UI/PlayerUI/SupportEquipments/SupportEquipmentsUIArea.cs @@ -17,6 +17,7 @@ namespace Cielonos.MainGame.UI private void Awake() { icons = GetComponentsInChildren(true).ToList(); + icons.ForEach(icon => icon.DisableAllParts()); } public void Initialize(SupportEquipmentBase supportEquipment, int slotIndex) diff --git a/Assets/Scripts/SLSUtilities/General/Timer.cs b/Assets/Scripts/SLSUtilities/General/Timer.cs index b73c299c5..d2b857dc9 100644 --- a/Assets/Scripts/SLSUtilities/General/Timer.cs +++ b/Assets/Scripts/SLSUtilities/General/Timer.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using UniRx; using UnityEngine; namespace SLSUtilities.General @@ -9,47 +10,63 @@ namespace SLSUtilities.General public float duration; public float currentTime; public bool isInfinite; + public bool keepActions; public float Percentage => duration > 0 ? Mathf.Clamp01(currentTime / duration) : 1f; - public virtual bool IsCompleted => currentTime >= duration; + public bool isCompleted; public List onComplete; + private IDisposable _autoObserver; - public Timer(float duration, bool isInfinite = false) + public Timer(float duration, bool keepActions = true, bool isInfinite = false) { this.duration = duration; this.isInfinite = isInfinite; + this.keepActions = keepActions; currentTime = 0f; onComplete = new List(); } public virtual void Update(float deltaTime) { - if (!IsCompleted) + currentTime += deltaTime; + + if (!isInfinite && !isCompleted && currentTime >= duration) { - currentTime += deltaTime; + isCompleted = true; + onComplete.Invoke(); + if (!keepActions) + { + onComplete.Clear(); + } } - else + else if (isInfinite) { - if (!isInfinite) - { - onComplete.Invoke(); - onComplete.Clear(); // 确保只调用一次 - } - else - { - onComplete.Invoke(); - Reset(); - } + onComplete.Invoke(); } } public virtual void Reset(float newDuration = -1f) { + isCompleted = false; currentTime = 0f; if(newDuration >= 0f) { duration = newDuration; } } + + public virtual void Complete(bool invokeAction = true) + { + currentTime = duration; + isCompleted = true; + if (invokeAction) + { + onComplete.Invoke(); + if (!keepActions) + { + onComplete.Clear(); + } + } + } } } \ No newline at end of file diff --git a/Assets/Settings/Fullscreen FX Blur Config.asset b/Assets/Settings/Fullscreen FX Blur Config.asset deleted file mode 100644 index 15a4edb5b..000000000 --- a/Assets/Settings/Fullscreen FX Blur Config.asset +++ /dev/null @@ -1,21 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - 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: 510c61cdec524e86b647525bb5947f82, type: 3} - m_Name: Fullscreen FX Blur Config - m_EditorClassIdentifier: - mode: 1 - radius: 2 - iteration: 3 - strength: 16 - referenceResolution: {x: 1920, y: 1080} - matchWidthOrHeight: 0 - useStrength: 1 diff --git a/Assets/Settings/Fullscreen FX Blur Config.asset.meta b/Assets/Settings/Fullscreen FX Blur Config.asset.meta deleted file mode 100644 index a08fdb281..000000000 --- a/Assets/Settings/Fullscreen FX Blur Config.asset.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 45ac4b3d5f9dfc746a89d180929cc72e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 78464 - packageName: Translucent Image - Fast UI Background Blur - packageVersion: 6.5.0 - assetPath: Assets/Settings/Fullscreen FX Blur Config.asset - uploadId: 824068 diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 7b30bfe9e..9dac1c78b 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -21,7 +21,7 @@ MonoBehaviour: surfaceData: 2 screenSpaceSettings: normalBlend: 0 ---- !u!114 &-5049805481540726669 +--- !u!114 &-5128268065812374329 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -30,12 +30,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c8e1eeeaa7fba944fb8e39c0af65b268, type: 3} - m_Name: TranslucentImageBlurSource - m_EditorClassIdentifier: LeTai.TranslucentImage.UniversalRP::LeTai.Asset.TranslucentImage.UniversalRP.TranslucentImageBlurSource + m_Script: {fileID: 11500000, guid: 872075d247354644389befca4a299b7a, type: 3} + m_Name: FlexibleBlurFeature + m_EditorClassIdentifier: JeffGrawAssets.FlexibleUI.Runtime::JeffGrawAssets.FlexibleUI.FlexibleBlurFeature m_Active: 1 - renderOrder: 0 - canvasDisappearWorkaround: 0 + platformData: + renderPassEvent: 600 + destinationFilterMode: 1 + uiBlurLayersSeeLower: 1 + blurredImagesSeeUIBlurs: 1 + blurredImageLayersSeeLower: 1 + useComputeShaders: 0 + overlayCompatibilityFix: 0 + resultFormat: 48 + blurFormat: 48 + layerResolutionRatio: 1 + maxLayerResolution: 1080 --- !u!114 &-4959381444210221564 MonoBehaviour: m_ObjectHideFlags: 0 @@ -139,9 +149,9 @@ MonoBehaviour: - {fileID: -260981590467567457} - {fileID: -4959381444210221564} - {fileID: 6609495894872259600} - - {fileID: -5049805481540726669} - {fileID: -2236813980570135019} - m_RendererFeatureMap: ad6b866f10d7b46c191d794be174b1e28ec034c34b50b7892799d53f7e688a2d9fa0434fa0ce60fc049e2f38dabc2cbb107c436e7fa5b95b73d0f167ab7cebb915567d2b893df5e0 + - {fileID: -5128268065812374329} + m_RendererFeatureMap: ad6b866f10d7b46c191d794be174b1e28ec034c34b50b7892799d53f7e688a2d9fa0434fa0ce60fc049e2f38dabc2cbb107c436e7fa5b95b15567d2b893df5e0c71c46685dbbd4b8 m_UseNativeRenderPass: 1 xrSystemData: {fileID: 0} postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}