This commit is contained in:
Ino 2024-12-23 09:36:04 +09:00
parent 5cd79b440f
commit 21adeadf23
9 changed files with 11066 additions and 15218 deletions

View File

@ -8,22 +8,33 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Ai_eyeline m_Name: Ai_eyeline
m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} m_Shader: {fileID: 4800000, guid: 733fefdcde0d35f4b822d2935d5a22f4, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _MK_ARTISTIC_ANIMATION_STUTTER
- _MK_ENVIRONMENT_REFLECTIONS_AMBIENT
- _MK_LIGHT_CEL
- _MK_RECEIVE_SHADOWS
- _MK_WRAPPED_DIFFUSE
m_InvalidKeywords:
- _EMISSIVE_SIMPLE - _EMISSIVE_SIMPLE
- _IS_ANGELRING_OFF - _IS_ANGELRING_OFF
- _IS_CLIPPING_OFF - _IS_CLIPPING_OFF
- _IS_OUTLINE_CLIPPING_NO - _IS_OUTLINE_CLIPPING_NO
- _OUTLINE_NML - _OUTLINE_NML
m_InvalidKeywords: [] - _RECEIVESHADOWS_ON
- _WRAPPEDLIGHTING_ON
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 2000
stringTagMap: stringTagMap:
IGNOREPROJECTOR: False
IgnoreProjection: False IgnoreProjection: False
RenderType: Opaque RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -35,6 +46,10 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _AlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AngelRing_Sampler: - _AngelRing_Sampler:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -91,10 +106,26 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _DiffuseRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveBorderRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionVectorMap: - _DistortionVectorMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _DrawnMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap: - _EmissionMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -115,6 +146,18 @@ Material:
m_Texture: {fileID: 2800000, guid: 3efba7c112fa27d4baa50f68135d225f, type: 3} m_Texture: {fileID: 2800000, guid: 3efba7c112fa27d4baa50f68135d225f, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _GoochRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HatchingBrightMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HatchingDarkMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _HeightMap: - _HeightMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -127,12 +170,16 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _IridescenceRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescenceThicknessMap: - _IridescenceThicknessMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 494cc47e4dcc5974bafb4ba328dbf871, type: 3} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MaskMap: - _MaskMap:
@ -147,6 +194,10 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _NoiseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap: - _NormalMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -183,6 +234,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3} m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _RimRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Set_1st_ShadePosition: - _Set_1st_ShadePosition:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -207,10 +262,22 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SketchMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularColorMap: - _SpecularColorMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SpecularMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularRamp:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularReflectionSampler: - _SpecularReflectionSampler:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -231,10 +298,30 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _ThresholdMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap: - _TransmittanceColorMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _VertexAnimationMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: [] m_Ints: []
m_Floats: m_Floats:
- _1st2nd_Shades_Feather: 0.1 - _1st2nd_Shades_Feather: 0.1
@ -250,7 +337,11 @@ Material:
- _ATDistance: 1 - _ATDistance: 1
- _AddPrecomputedVelocity: 0 - _AddPrecomputedVelocity: 0
- _Add_Antipodean_RimLight: 0 - _Add_Antipodean_RimLight: 0
- _AdvancedTab: 0
- _AlbedoAffectEmissive: 0 - _AlbedoAffectEmissive: 0
- _AlbedoMapIntensity: 1
- _AlembicMotionVectors: 0
- _AlphaClipping: 0
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0 - _AlphaCutoffEnable: 0
- _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPostpass: 0.5
@ -266,15 +357,25 @@ Material:
- _Anisotropy: 0 - _Anisotropy: 0
- _Ap_RimLight_FeatherOff: 0 - _Ap_RimLight_FeatherOff: 0
- _Ap_RimLight_Power: 0.1 - _Ap_RimLight_Power: 0.1
- _Artistic: 0
- _ArtisticFrequency: 1
- _ArtisticProjection: 0
- _ArtisticShadowFilter: 0
- _AutoRenderQueue: 1 - _AutoRenderQueue: 1
- _BaseColorOverridden: 0 - _BaseColorOverridden: 0
- _BaseColorVisible: 1 - _BaseColorVisible: 1
- _BaseColor_Step: 0.4 - _BaseColor_Step: 0.4
- _BaseShade_Feather: 0.2 - _BaseShade_Feather: 0.2
- _Base_Speed: 0 - _Base_Speed: 0
- _Blend: 0
- _BlendDst: 0
- _BlendDstAlpha: 0
- _BlendMode: 0 - _BlendMode: 0
- _BlendSrc: 1
- _BlendSrcAlpha: 1
- _BlurLevelMatcap: 0 - _BlurLevelMatcap: 0
- _BlurLevelSGM: 0 - _BlurLevelSGM: 0
- _Brightness: 1
- _BumpScale: 1 - _BumpScale: 1
- _BumpScaleMatcap: 1 - _BumpScaleMatcap: 1
- _CameraRolling_Stabilizer: 0 - _CameraRolling_Stabilizer: 0
@ -282,8 +383,10 @@ Material:
- _ClippingMode: 0 - _ClippingMode: 0
- _Clipping_Level: 0 - _Clipping_Level: 0
- _CoatMask: 0 - _CoatMask: 0
- _ColorGrading: 0
- _ColorShift_Speed: 0 - _ColorShift_Speed: 0
- _ComposerMaskMode: 0 - _ComposerMaskMode: 0
- _Contrast: 1
- _CullMode: 2 - _CullMode: 2
- _CullModeForward: 2 - _CullModeForward: 2
- _Cutoff: 0.5 - _Cutoff: 0.5
@ -293,11 +396,17 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DetailNormalScale: 1 - _DetailNormalScale: 1
- _DetailSmoothnessScale: 1 - _DetailSmoothnessScale: 1
- _DiffuseSmoothness: 0
- _DiffuseThresholdOffset: 0.25
- _DiffusionProfile: 0 - _DiffusionProfile: 0
- _DiffusionProfileHash: 0 - _DiffusionProfileHash: 0
- _DisplacementLockObjectScale: 1 - _DisplacementLockObjectScale: 1
- _DisplacementLockTilingScale: 1 - _DisplacementLockTilingScale: 1
- _DisplacementMode: 0 - _DisplacementMode: 0
- _Dissolve: 0
- _DissolveAmount: 0.5
- _DissolveBorderSize: 0.25
- _DissolveMapScale: 1
- _DistortionBlendMode: 0 - _DistortionBlendMode: 0
- _DistortionBlurBlendMode: 0 - _DistortionBlurBlendMode: 0
- _DistortionBlurDstBlend: 0 - _DistortionBlurDstBlend: 0
@ -314,6 +423,9 @@ Material:
- _DistortionVectorScale: 2 - _DistortionVectorScale: 2
- _DoubleSidedEnable: 0 - _DoubleSidedEnable: 0
- _DoubleSidedNormalMode: 1 - _DoubleSidedNormalMode: 1
- _DrawnClampMax: 1
- _DrawnClampMin: 0
- _DrawnMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _EMISSIVE: 0 - _EMISSIVE: 0
- _EdgeThickness: 6 - _EdgeThickness: 6
@ -325,6 +437,7 @@ Material:
- _EnableFogOnTransparent: 1 - _EnableFogOnTransparent: 1
- _EnableGeometricSpecularAA: 0 - _EnableGeometricSpecularAA: 0
- _EnergyConservingSpecularColor: 1 - _EnergyConservingSpecularColor: 1
- _EnvironmentReflections: 1
- _Farthest_Distance: 100 - _Farthest_Distance: 100
- _FirstShadeOverridden: 0 - _FirstShadeOverridden: 0
- _FirstShadeVisible: 1 - _FirstShadeVisible: 1
@ -332,6 +445,8 @@ Material:
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.5
- _GlossyReflections: 1 - _GlossyReflections: 1
- _GoochRampIntensity: 0.5
- _HatchingMapScale: 1
- _HeightAmplitude: 0.02 - _HeightAmplitude: 0.02
- _HeightCenter: 0.5 - _HeightCenter: 0.5
- _HeightMapParametrization: 0 - _HeightMapParametrization: 0
@ -344,13 +459,21 @@ Material:
- _HighColor_Power: 0 - _HighColor_Power: 0
- _HighlightOverridden: 0 - _HighlightOverridden: 0
- _HighlightVisible: 1 - _HighlightVisible: 1
- _Hue: 0
- _IndirectFade: 1
- _Initialized: 0
- _InputTab: 1
- _InvTilingScale: 1 - _InvTilingScale: 1
- _Inverse_Clipping: 0 - _Inverse_Clipping: 0
- _Inverse_MatcapMask: 0 - _Inverse_MatcapMask: 0
- _Inverse_Z_Axis_BLD: 1 - _Inverse_Z_Axis_BLD: 1
- _Ior: 1 - _Ior: 1
- _Iridescence: 0
- _IridescenceMask: 1 - _IridescenceMask: 1
- _IridescenceSize: 1
- _IridescenceSmoothness: 0.5
- _IridescenceThickness: 1 - _IridescenceThickness: 1
- _IridescenceThresholdOffset: 0
- _IsBaseMapAlphaAsClippingMask: 0 - _IsBaseMapAlphaAsClippingMask: 0
- _Is_BLD: 0 - _Is_BLD: 0
- _Is_BakedNormal: 0 - _Is_BakedNormal: 0
@ -381,13 +504,18 @@ Material:
- _Is_UseTweakMatCapOnShadow: 0 - _Is_UseTweakMatCapOnShadow: 0
- _Is_ViewCoord_Scroll: 0 - _Is_ViewCoord_Scroll: 0
- _Is_ViewShift: 0 - _Is_ViewShift: 0
- _Light: 1
- _LightBands: 4
- _LightBandsScale: 0.5
- _LightDirection_MaskOn: 0 - _LightDirection_MaskOn: 0
- _LightThreshold: 0.5
- _LinkDetailsWithBase: 1 - _LinkDetailsWithBase: 1
- _MatCap: 0 - _MatCap: 0
- _MaterialID: 1 - _MaterialID: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0
- _Nearest_Distance: 0.5 - _Nearest_Distance: 0.5
- _NormalMapIntensity: 1
- _NormalMapSpace: 0 - _NormalMapSpace: 0
- _NormalScale: 1 - _NormalScale: 1
- _OUTLINE: 0 - _OUTLINE: 0
@ -396,6 +524,7 @@ Material:
- _Offset_X_Axis_BLD: -0.05 - _Offset_X_Axis_BLD: -0.05
- _Offset_Y_Axis_BLD: 0.09 - _Offset_Y_Axis_BLD: 0.09
- _Offset_Z: 0 - _Offset_Z: 0
- _OptionsTab: 1
- _OutlineOverridden: 0 - _OutlineOverridden: 0
- _OutlineVisible: 1 - _OutlineVisible: 1
- _Outline_Width: 1 - _Outline_Width: 1
@ -405,41 +534,58 @@ Material:
- _PPDPrimitiveLength: 1 - _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1 - _PPDPrimitiveWidth: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _ReceiveShadows: 1
- _ReceivesSSR: 1 - _ReceivesSSR: 1
- _RefractionModel: 0 - _RefractionModel: 0
- _RenderFace: 2
- _RenderPriority: 0
- _Rim: 0
- _RimLight: 1 - _RimLight: 1
- _RimLightOverridden: 0 - _RimLightOverridden: 0
- _RimLightVisible: 1 - _RimLightVisible: 1
- _RimLight_FeatherOff: 0 - _RimLight_FeatherOff: 0
- _RimLight_InsideMask: 0.2 - _RimLight_InsideMask: 0.2
- _RimLight_Power: 0.7 - _RimLight_Power: 0.7
- _RimSize: 1
- _RimSmoothness: 0.5
- _RimThresholdOffset: 0.25
- _Rotate_EmissiveUV: 0 - _Rotate_EmissiveUV: 0
- _Rotate_MatCapUV: 0 - _Rotate_MatCapUV: 0
- _Rotate_NormalMapForMatCapUV: 0 - _Rotate_NormalMapForMatCapUV: 0
- _SPRDefaultUnlitColorMask: 15 - _SPRDefaultUnlitColorMask: 15
- _SRPDefaultUnlitColMode: 1 - _SRPDefaultUnlitColMode: 1
- _SSRefractionProjectionModel: 0 - _SSRefractionProjectionModel: 0
- _Saturation: 1
- _Scroll_EmissiveU: 0 - _Scroll_EmissiveU: 0
- _Scroll_EmissiveV: 0 - _Scroll_EmissiveV: 0
- _SecondShadeOverridden: 0 - _SecondShadeOverridden: 0
- _SecondShadeVisible: 1 - _SecondShadeVisible: 1
- _Set_SystemShadowsToBase: 1 - _Set_SystemShadowsToBase: 1
- _ShadeColor_Step: 0 - _ShadeColor_Step: 0
- _SketchMapScale: 1
- _Smoothness: 0.5 - _Smoothness: 0.5
- _SmoothnessRemapMax: 1 - _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0 - _SmoothnessRemapMin: 0
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _Specular: 0
- _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2 - _SpecularAAThreshold: 0.2
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SpecularIntensity: 1
- _SpecularOcclusionMode: 1 - _SpecularOcclusionMode: 1
- _SpecularPower: 20 - _SpecularPower: 20
- _SpecularSmoothness: 0
- _SpecularThresholdOffset: 0.25
- _SrcBlend: 1 - _SrcBlend: 1
- _Stencil: 1
- _StencilComp: 0 - _StencilComp: 0
- _StencilFail: 0
- _StencilMode: 0 - _StencilMode: 0
- _StencilNo: 1 - _StencilNo: 1
- _StencilOpFail: 0 - _StencilOpFail: 0
- _StencilOpPass: 0 - _StencilOpPass: 0
- _StencilPass: 0
- _StencilReadMask: 255
- _StencilRef: 2 - _StencilRef: 2
- _StencilRefDepth: 0 - _StencilRefDepth: 0
- _StencilRefDistortionVec: 64 - _StencilRefDistortionVec: 64
@ -450,14 +596,18 @@ Material:
- _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskDistortionVec: 64
- _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskGBuffer: 3
- _StencilWriteMaskMV: 128 - _StencilWriteMaskMV: 128
- _StencilZFail: 0
- _StepOffset: 0 - _StepOffset: 0
- _StylizeTab: 0
- _SubsurfaceMask: 1 - _SubsurfaceMask: 1
- _SupportDecals: 1 - _SupportDecals: 1
- _Surface: 0
- _SurfaceType: 0 - _SurfaceType: 0
- _TexWorldScale: 1 - _TexWorldScale: 1
- _TexWorldScaleEmissive: 1 - _TexWorldScaleEmissive: 1
- _Thickness: 1 - _Thickness: 1
- _ThicknessMultiplier: 1 - _ThicknessMultiplier: 1
- _ThresholdMapScale: 1
- _TransmissionEnable: 1 - _TransmissionEnable: 1
- _TransmissionMask: 1 - _TransmissionMask: 1
- _TransparentBackfaceEnable: 0 - _TransparentBackfaceEnable: 0
@ -487,7 +637,12 @@ Material:
- _UseShadowThreshold: 0 - _UseShadowThreshold: 0
- _Use_1stAs2nd: 0 - _Use_1stAs2nd: 0
- _Use_BaseAs1st: 1 - _Use_BaseAs1st: 1
- _VertexAnimation: 0
- _VertexAnimationIntensity: 0.05
- _VertexAnimationStutter: 0
- _WrappedLighting: 1
- _ZOverDrawMode: 0 - _ZOverDrawMode: 0
- _ZTest: 4
- _ZTestDepthEqualForOpaque: 4 - _ZTestDepthEqualForOpaque: 4
- _ZTestGBuffer: 4 - _ZTestGBuffer: 4
- _ZTestModeDistortion: 8 - _ZTestModeDistortion: 8
@ -503,6 +658,7 @@ Material:
m_Colors: m_Colors:
- _1st_ShadeColor: {r: 0.8867924, g: 0.6818262, b: 0.6818262, a: 1} - _1st_ShadeColor: {r: 0.8867924, g: 0.6818262, b: 0.6818262, a: 1}
- _2nd_ShadeColor: {r: 1, g: 1, b: 1, a: 1} - _2nd_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
- _AlbedoColor: {r: 1, g: 1, b: 1, a: 1}
- _AngelRingMaskColor: {r: 0, g: 1, b: 0, a: 1} - _AngelRingMaskColor: {r: 0, g: 1, b: 0, a: 1}
- _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1} - _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
- _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1} - _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1}
@ -512,19 +668,26 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorShift: {r: 0, g: 0, b: 0, a: 1} - _ColorShift: {r: 0, g: 0, b: 0, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DissolveBorderColor: {r: 1, g: 1, b: 1, a: 1}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
- _Emissive_Color: {r: 0, g: 0, b: 0, a: 1} - _Emissive_Color: {r: 0, g: 0, b: 0, a: 1}
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1} - _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
- _GoochBrightColor: {r: 1, g: 1, b: 1, a: 1}
- _GoochDarkColor: {r: 0, g: 0, b: 0, a: 1}
- _HighColor: {r: 0, g: 0, b: 0, a: 1} - _HighColor: {r: 0, g: 0, b: 0, a: 1}
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1} - _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
- _IridescenceColor: {r: 1, g: 1, b: 1, a: 0.5}
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1} - _MatCapColor: {r: 1, g: 1, b: 1, a: 1}
- _OutlineMaskColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineMaskColor: {r: 0, g: 0, b: 0, a: 1}
- _Outline_Color: {r: 1, g: 1, b: 1, a: 1} - _Outline_Color: {r: 1, g: 1, b: 1, a: 1}
- _RimBrightColor: {r: 1, g: 1, b: 1, a: 1}
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _RimDarkColor: {r: 0, g: 0, b: 0, a: 1}
- _RimLightColor: {r: 1, g: 0.72484124, b: 0.6367924, a: 1} - _RimLightColor: {r: 1, g: 0.72484124, b: 0.6367924, a: 1}
- _RimLightMaskColor: {r: 1, g: 0, b: 1, a: 1} - _RimLightMaskColor: {r: 1, g: 0, b: 1, a: 1}
- _SecondShadeMaskColor: {r: 0, g: 0, b: 1, a: 1} - _SecondShadeMaskColor: {r: 0, g: 0, b: 1, a: 1}
@ -535,6 +698,7 @@ Material:
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
- _VertexAnimationFrequency: {r: 2.5, g: 2.5, b: 2.5, a: 1}
- _ViewShift: {r: 0, g: 0, b: 0, a: 1} - _ViewShift: {r: 0, g: 0, b: 0, a: 1}
- emissive: {r: 0, g: 0, b: 0, a: 1} - emissive: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,12 +2,12 @@ using CodeStage.AntiCheat.ObscuredTypes;
using System.Collections; using System.Collections;
using UnityEngine; using UnityEngine;
using UnityEngine.AI; using UnityEngine.AI;
using UnityEngine.Rendering.Universal;
using UnityEngine.ResourceManagement.AsyncOperations; using UnityEngine.ResourceManagement.AsyncOperations;
public class PCActor : MyActor public class PCActor : MyActor
{ {
public Transform[] tfs_weapon; // 0 왼손, 1 오른손 public Transform[] tfs_weapon; // 0 왼손, 1 오른손
public GameObject go_RunSmoke;
float t_RecoverHPTime = 10f, t_RecoverMPTime = 10f, t_autoskill = 0.5f; float t_RecoverHPTime = 10f, t_RecoverMPTime = 10f, t_autoskill = 0.5f;
float t_HP = 0f, t_MP = 0f; float t_HP = 0f, t_MP = 0f;
@ -114,7 +114,12 @@ public class PCActor : MyActor
{ {
m_animation.runtimeAnimatorController = handle.Result; m_animation.runtimeAnimatorController = handle.Result;
}); });
transform.localScale = m_ClassData.f_Scale * Vector3.one;
if (InGameInfo.Ins.IsGameMode(eGameMode.Lobby))
transform.localScale = Vector3.one;
else
transform.localScale = m_ClassData.f_Scale * Vector3.one;
m_NavStopDistance = m_ClassData.f_AttackRange; m_NavStopDistance = m_ClassData.f_AttackRange;
base.Set(isEnemy, owner, sdata, _id, _isstop, _ui); base.Set(isEnemy, owner, sdata, _id, _isstop, _ui);
Change_Weapon(_ui); Change_Weapon(_ui);
@ -190,15 +195,15 @@ public class PCActor : MyActor
Camera.main.fieldOfView = 60f; Camera.main.fieldOfView = 60f;
LoadMapMgr.Ins.Get_PortalPos(MyValue.MyChoiceMapData, portalpos => LoadMapMgr.Ins.Get_PortalPos(MyValue.MyChoiceMapData, portalpos =>
{ {
Vector3 targetPosition = portalpos; //Vector3 targetPosition = portalpos;
Vector3 cameraPosition = portalpos - Vector3.forward; // 현재 카메라의 위치 //Vector3 cameraPosition = portalpos - Vector3.forward; // 현재 카메라의 위치
Vector3 relativePosition = targetPosition - cameraPosition; //Vector3 relativePosition = targetPosition - cameraPosition;
float rotateAround = Mathf.Atan2(relativePosition.x, relativePosition.z) * Mathf.Rad2Deg; //float rotateAround = Mathf.Atan2(relativePosition.x, relativePosition.z) * Mathf.Rad2Deg;
//rotateAround += 180f; // 캐릭터 뒤에서 바라보도록 180도 보정 //rotateAround += 180f; // 캐릭터 뒤에서 바라보도록 180도 보정
MyValue.m_RealCamera.Set_Target(transform, rotateAround); MyValue.m_RealCamera.Set_Target(transform, InGameInfo.Ins.IsGameMode(eGameMode.Lobby) ? 143f : 305f);
}); });
} }
public override void Get_Damage(DamageInfo _dinfo) public override void Get_Damage(DamageInfo _dinfo)
@ -219,8 +224,6 @@ public class PCActor : MyActor
public override void Set_RunSmoke(bool _active) public override void Set_RunSmoke(bool _active)
{ {
if (go_RunSmoke.activeSelf != _active)
go_RunSmoke.SetActive(_active);
} }
public override void Set_MagicCoolTime(float _time, int _index) public override void Set_MagicCoolTime(float _time, int _index)
{ {

View File

@ -121,7 +121,8 @@ public class TitleInfo : MyCoroutine
#if FGB_OneStore #if FGB_OneStore
DSUtil.InActivateGameObjects(gos_LoginButton, 1); DSUtil.InActivateGameObjects(gos_LoginButton, 1);
#else #else
DSUtil.ActivateGameObjects(gos_LoginButton); //DSUtil.ActivateGameObjects(gos_LoginButton);
DSUtil.InActivateGameObjects(gos_LoginButton, 2); // TODO 정인호 : 지금은 게스트만
#endif #endif
} }
void InActive_LoginButton() void InActive_LoginButton()

View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;

View File

@ -7,7 +7,7 @@ public class RealCameraRot : MonoBehaviour, IDragHandler
public void OnDrag(PointerEventData eventData) public void OnDrag(PointerEventData eventData)
{ {
if (!DSUtil.CheckNull(MyValue.m_RealCamera)) if (!InGameInfo.Ins.IsGameMode(eGameMode.Lobby) && !DSUtil.CheckNull(MyValue.m_RealCamera))
MyValue.m_RealCamera.rotateAround += eventData.delta.x * RotSpeed; MyValue.m_RealCamera.rotateAround += eventData.delta.x * RotSpeed;
} }
} }

View File

@ -1,6 +1,5 @@
using UnityEngine;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine;
public class RealCamera : MyCoroutine public class RealCamera : MyCoroutine
{ {
@ -40,7 +39,6 @@ public class RealCamera : MyCoroutine
float DragEndTime; float DragEndTime;
GameObject godummy, gowitch; GameObject godummy, gowitch;
List<Transform> list_tfCamactionTarget = new List<Transform>(); List<Transform> list_tfCamactionTarget = new List<Transform>();
bool RunUpdate = false;
private void Awake() private void Awake()
{ {
@ -53,27 +51,14 @@ public class RealCamera : MyCoroutine
public bool IsEnter() { return CamStatus == 0; } public bool IsEnter() { return CamStatus == 0; }
public void Set_Target(Transform _target, float _camrot) public void Set_Target(Transform _target, float _camrot)
{ {
if (InGameInfo.Ins.Get_GameMode() == eGameMode.Lobby) CamStatus = 0;
{ target = _target;
RunUpdate = false; Add_CamActionTarget(_target);
transform.position = new Vector3(-14.77f, 12.07f, 14.54f); rotateAround = _camrot;
transform.eulerAngles = new Vector3(32.05f, 135.08f, 0f);
GetComponent<Camera>().fieldOfView = 34;
}
else
{
GetComponent<Camera>().fieldOfView = 60;
RunUpdate = true; //cameraHeight = 55f;
CamStatus = 0; DistanceUp = OriDistanceUp;
target = _target; VerticalAxis = maxDistance = OrimaxDistance;
Add_CamActionTarget(_target);
rotateAround = _camrot;
//cameraHeight = 55f;
DistanceUp = OriDistanceUp;
VerticalAxis = maxDistance = OrimaxDistance;
}
} }
public void Set_InsideBuilding(bool _active) public void Set_InsideBuilding(bool _active)
{ {
@ -134,9 +119,8 @@ public class RealCamera : MyCoroutine
void LateUpdate() void LateUpdate()
{ {
if (!RunUpdate) return;
if (DragEndTime > 0f) DragEndTime -= Time.deltaTime; if (DragEndTime > 0f) DragEndTime -= Time.deltaTime;
if (target == null) return; if (DSUtil.CheckNull(target)) return;
// 캐릭터의 이동 방향 계산 // 캐릭터의 이동 방향 계산
Vector3 direction = target.position - previousPosition; Vector3 direction = target.position - previousPosition;

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
@ -13,7 +11,7 @@ public class FloatingJoystick : Joystick
private void Update() private void Update()
{ {
if (MyValue.MyPC && MyValue.MyPC.CanMove()) if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
{ {
// Cursor.lockState를 None으로 설정하여 마우스 고정 해제 // Cursor.lockState를 None으로 설정하여 마우스 고정 해제
if (Cursor.lockState == CursorLockMode.Locked) if (Cursor.lockState == CursorLockMode.Locked)