diff --git a/Assets/Editor/MyEditorUtil.cs b/Assets/Editor/MyEditorUtil.cs index 45838d9cf..d5f5b994b 100644 --- a/Assets/Editor/MyEditorUtil.cs +++ b/Assets/Editor/MyEditorUtil.cs @@ -182,6 +182,29 @@ public static class MyEditorUtil CommonSetting(go, 51); } } + [MenuItem("Edit/PCSetting", false, -1003)] + static void PCSetting() + { + var selectedObjects = Selection.gameObjects; + + foreach (var go in selectedObjects) + { + var ma = go.GetComponent(); + if (ma == null) ma = go.AddComponent(); + ma.m_Role = eRole.PC; + + Set_CommonRigidBody(go); + + var cc = go.GetComponent(); + if (cc == null) cc = go.AddComponent(); + cc.center = Vector3.up * 0.79f; + cc.radius = 0.55f; + cc.height = 1.58f; + cc.direction = 1; + + // 왼손 방패, 오른손 무기 위치 잡기 + } + } static void CommonSetting(GameObject go, int avoidancePriority) { @@ -200,16 +223,7 @@ public static class MyEditorUtil navmesh.avoidancePriority = avoidancePriority; navmesh.obstacleAvoidanceType = ObstacleAvoidanceType.GoodQualityObstacleAvoidance; - var rigidbody = go.GetComponent(); - if (rigidbody == null) rigidbody = go.AddComponent(); - rigidbody.useGravity = false; - rigidbody.mass = 1; - rigidbody.drag = 0; - rigidbody.angularDrag = 0.05f; - rigidbody.automaticCenterOfMass = true; - rigidbody.automaticInertiaTensor = true; - rigidbody.collisionDetectionMode = CollisionDetectionMode.Discrete; - rigidbody.constraints = RigidbodyConstraints.FreezeAll; + Set_CommonRigidBody(go); var rds = go.GetComponentsInChildren(); SkinnedMeshRenderer m_smr = null; @@ -233,6 +247,19 @@ public static class MyEditorUtil EditorApplication.update += UpdateAllObjects; } + static void Set_CommonRigidBody(GameObject go) + { + var rigidbody = go.GetComponent(); + if (rigidbody == null) rigidbody = go.AddComponent(); + rigidbody.useGravity = false; + rigidbody.mass = 1; + rigidbody.drag = 0; + rigidbody.angularDrag = 0.05f; + rigidbody.automaticCenterOfMass = true; + rigidbody.automaticInertiaTensor = true; + rigidbody.collisionDetectionMode = CollisionDetectionMode.Discrete; + rigidbody.constraints = RigidbodyConstraints.FreezeAll; + } private static void UpdateAllObjects() { diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 5f28a52e3..058769da3 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -39,8 +39,10 @@ classconfig 에 의해 정해짐 인게임 - 터레인 제외, 메시 베이커로 통째로 묶기 //로비 - 퍼펙트 컬링 +어드레서블 다운로드 % 정상적으로 나오게 수정 + 코스튬 - - 코스튬 나오고 난 뒤 세팅 - - + - 3D 캐릭터도 PCActor를 이용하거나 하나의 클래스를 이용해서 코스튬 변경 공통 처리 + - 코스튬 이미지는 아틀라스가 아닌 동적 로딩 + - 코스튬 테이블 (코스튬 이미지 컬럼 필요) diff --git a/Assets/ResWork/Suriyun/Animations/Animation_check.controller b/Assets/ResWork/Suriyun/Animations/Animation_check.controller index 57f950e46..71ae767d7 100644 --- a/Assets/ResWork/Suriyun/Animations/Animation_check.controller +++ b/Assets/ResWork/Suriyun/Animations/Animation_check.controller @@ -19,7 +19,7 @@ AnimatorController: m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 + m_DefaultBool: 1 m_Controller: {fileID: 9100000} - m_Name: emo2 m_Type: 9 diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Aki_skin_v2.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Aki_skin_v2.mat index 201b5a1fd..f39c0c963 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Aki_skin_v2.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Aki_skin_v2.mat @@ -566,7 +566,7 @@ Material: - _SpecularThresholdOffset: 0.25 - _SrcBlend: 1 - _Stencil: 1 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilFail: 0 - _StencilMode: 0 - _StencilNo: 1 @@ -574,12 +574,12 @@ Material: - _StencilOpPass: 0 - _StencilPass: 0 - _StencilReadMask: 255 - - _StencilRef: 2 + - _StencilRef: 0 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 64 - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - - _StencilWriteMask: 3 + - _StencilWriteMask: 255 - _StencilWriteMaskDepth: 32 - _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskGBuffer: 3 diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Lash.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Lash.mat index d9c0a1906..ba638d316 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Lash.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/Lash.mat @@ -8,22 +8,33 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lash - 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: + - _MK_ARTISTIC_ANIMATION_STUTTER + - _MK_ENVIRONMENT_REFLECTIONS_AMBIENT + - _MK_LIGHT_CEL + - _MK_RECEIVE_SHADOWS + - _MK_WRAPPED_DIFFUSE + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] - m_LightmapFlags: 5 + - _RECEIVESHADOWS_ON + - _WRAPPEDLIGHTING_ON + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: + IGNOREPROJECTOR: False IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -35,6 +46,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -91,10 +106,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DrawnMap: + 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} @@ -115,6 +146,18 @@ Material: m_Texture: {fileID: 2800000, guid: 3efba7c112fa27d4baa50f68135d225f, type: 3} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -127,12 +170,16 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _IridescenceRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescenceThicknessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 6d67cf8df0c0cf14a8fa0d315f42b221, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -147,6 +194,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NoiseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _NormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -183,6 +234,10 @@ Material: m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -207,10 +262,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SketchMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecularColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,10 +298,30 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ThresholdMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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_Floats: - _1st2nd_Shades_Feather: 0.1 @@ -250,7 +337,11 @@ Material: - _ATDistance: 1 - _AddPrecomputedVelocity: 0 - _Add_Antipodean_RimLight: 0 + - _AdvancedTab: 0 - _AlbedoAffectEmissive: 0 + - _AlbedoMapIntensity: 1 + - _AlembicMotionVectors: 0 + - _AlphaClipping: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 @@ -266,15 +357,25 @@ Material: - _Anisotropy: 0 - _Ap_RimLight_FeatherOff: 0 - _Ap_RimLight_Power: 0.1 + - _Artistic: 0 + - _ArtisticFrequency: 1 + - _ArtisticProjection: 0 + - _ArtisticShadowFilter: 0 - _AutoRenderQueue: 1 - _BaseColorOverridden: 0 - _BaseColorVisible: 1 - _BaseColor_Step: 0.4 - _BaseShade_Feather: 0.2 - _Base_Speed: 0 + - _Blend: 0 + - _BlendDst: 0 + - _BlendDstAlpha: 0 - _BlendMode: 0 + - _BlendSrc: 1 + - _BlendSrcAlpha: 1 - _BlurLevelMatcap: 0 - _BlurLevelSGM: 0 + - _Brightness: 1 - _BumpScale: 1 - _BumpScaleMatcap: 1 - _CameraRolling_Stabilizer: 0 @@ -282,9 +383,11 @@ Material: - _ClippingMode: 0 - _Clipping_Level: 0 - _CoatMask: 0 + - _ColorGrading: 0 - _ColorMask: 15 - _ColorShift_Speed: 0 - _ComposerMaskMode: 0 + - _Contrast: 1 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 @@ -294,11 +397,17 @@ Material: - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 + - _DiffuseSmoothness: 0 + - _DiffuseThresholdOffset: 0.25 - _DiffusionProfile: 0 - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 + - _Dissolve: 0 + - _DissolveAmount: 0.5 + - _DissolveBorderSize: 0.25 + - _DissolveMapScale: 1 - _DistortionBlendMode: 0 - _DistortionBlurBlendMode: 0 - _DistortionBlurDstBlend: 0 @@ -315,6 +424,9 @@ Material: - _DistortionVectorScale: 2 - _DoubleSidedEnable: 0 - _DoubleSidedNormalMode: 1 + - _DrawnClampMax: 1 + - _DrawnClampMin: 0 + - _DrawnMapScale: 1 - _DstBlend: 0 - _EMISSIVE: 0 - _EdgeThickness: 4 @@ -326,12 +438,15 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _FalloffPower: 1 - _Farthest_Distance: 100 - _FirstShadeOverridden: 0 - _FirstShadeVisible: 1 - _GI_Intensity: 0 - _Glossiness: 0.5 + - _GoochRampIntensity: 0.5 + - _HatchingMapScale: 1 - _HeightAmplitude: 0.02 - _HeightCenter: 0.5 - _HeightMapParametrization: 0 @@ -344,13 +459,21 @@ Material: - _HighColor_Power: 0 - _HighlightOverridden: 0 - _HighlightVisible: 1 + - _Hue: 0 + - _IndirectFade: 1 + - _Initialized: 0 + - _InputTab: 1 - _InvTilingScale: 1 - _Inverse_Clipping: 0 - _Inverse_MatcapMask: 0 - _Inverse_Z_Axis_BLD: 1 - _Ior: 1 + - _Iridescence: 0 - _IridescenceMask: 1 + - _IridescenceSize: 1 + - _IridescenceSmoothness: 0.5 - _IridescenceThickness: 1 + - _IridescenceThresholdOffset: 0 - _IsBaseMapAlphaAsClippingMask: 0 - _Is_BLD: 0 - _Is_BakedNormal: 0 @@ -381,13 +504,18 @@ Material: - _Is_UseTweakMatCapOnShadow: 0 - _Is_ViewCoord_Scroll: 0 - _Is_ViewShift: 0 + - _Light: 1 + - _LightBands: 4 + - _LightBandsScale: 0.5 - _LightDirection_MaskOn: 0 + - _LightThreshold: 0.5 - _LinkDetailsWithBase: 1 - _MatCap: 0 - _MaterialID: 1 - _Metallic: 0 - _Mode: 0 - _Nearest_Distance: 0.5 + - _NormalMapIntensity: 1 - _NormalMapSpace: 0 - _NormalScale: 1 - _OUTLINE: 0 @@ -396,6 +524,7 @@ Material: - _Offset_X_Axis_BLD: -0.05 - _Offset_Y_Axis_BLD: 0.09 - _Offset_Z: 0 + - _OptionsTab: 1 - _OutlineOverridden: 0 - _OutlineVisible: 1 - _Outline_Width: 1 @@ -405,41 +534,56 @@ Material: - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 + - _ReceiveShadows: 1 - _ReceivesSSR: 1 - _RefractionModel: 0 + - _RenderFace: 2 + - _RenderPriority: 0 + - _Rim: 0 - _RimLight: 1 - _RimLightOverridden: 0 - _RimLightVisible: 1 - _RimLight_FeatherOff: 0 - _RimLight_InsideMask: 0.2 - _RimLight_Power: 0.7 + - _RimSize: 1 + - _RimSmoothness: 0.5 + - _RimThresholdOffset: 0.25 - _Rotate_EmissiveUV: 0 - _Rotate_MatCapUV: 0 - _Rotate_NormalMapForMatCapUV: 0 - _SPRDefaultUnlitColorMask: 15 - _SRPDefaultUnlitColMode: 1 - _SSRefractionProjectionModel: 0 + - _Saturation: 1 - _Scroll_EmissiveU: 0 - _Scroll_EmissiveV: 0 - _SecondShadeOverridden: 0 - _SecondShadeVisible: 1 - _Set_SystemShadowsToBase: 1 - _ShadeColor_Step: 0 + - _SketchMapScale: 1 - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 + - _Specular: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularIntensity: 1 - _SpecularOcclusionMode: 1 - _SpecularPower: 20 + - _SpecularSmoothness: 0 + - _SpecularThresholdOffset: 0.25 - _SrcBlend: 1 - _Stencil: 0 - _StencilComp: 0 + - _StencilFail: 0 - _StencilMode: 0 - _StencilNo: 1 - _StencilOp: 0 - _StencilOpFail: 0 - _StencilOpPass: 0 + - _StencilPass: 0 - _StencilReadMask: 255 - _StencilRef: 2 - _StencilRefDepth: 0 @@ -451,14 +595,18 @@ Material: - _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 + - _StencilZFail: 0 - _StepOffset: 0 + - _StylizeTab: 0 - _SubsurfaceMask: 1 - _SupportDecals: 1 + - _Surface: 0 - _SurfaceType: 0 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _ThicknessMultiplier: 1 + - _ThresholdMapScale: 1 - _TransmissionEnable: 1 - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 @@ -489,7 +637,12 @@ Material: - _UseUIAlphaClip: 0 - _Use_1stAs2nd: 0 - _Use_BaseAs1st: 1 + - _VertexAnimation: 0 + - _VertexAnimationIntensity: 0.05 + - _VertexAnimationStutter: 0 + - _WrappedLighting: 1 - _ZOverDrawMode: 0 + - _ZTest: 4 - _ZTestDepthEqualForOpaque: 4 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 8 @@ -505,6 +658,7 @@ Material: m_Colors: - _1st_ShadeColor: {r: 0.8867924, g: 0.6818262, b: 0.6818262, 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} - _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1} - _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1} @@ -514,19 +668,26 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _ColorShift: {r: 0, g: 0, b: 0, a: 1} - _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} - _EmissionColor: {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} - _Emissive_Color: {r: 0, g: 0, b: 0, 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} - _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1} - _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} - _MatCapColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineMaskColor: {r: 0, g: 0, b: 0, 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} - _RimLightMaskColor: {r: 1, g: 0, b: 1, a: 1} - _SecondShadeMaskColor: {r: 0, g: 0, b: 1, a: 1} @@ -537,6 +698,7 @@ Material: - _UVDetailsMappingMask: {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} + - _VertexAnimationFrequency: {r: 2.5, g: 2.5, b: 2.5, a: 1} - _ViewShift: {r: 0, g: 0, b: 0, a: 1} - emissive: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/eyebase_Aki.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/eyebase_Aki.mat index 3efe3846a..61461d9ac 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/eyebase_Aki.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/eyebase_Aki.mat @@ -8,22 +8,33 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: eyebase_Aki - 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: + - _MK_ARTISTIC_ANIMATION_STUTTER + - _MK_ENVIRONMENT_REFLECTIONS_AMBIENT + - _MK_LIGHT_CEL + - _MK_RECEIVE_SHADOWS + - _MK_WRAPPED_DIFFUSE + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] - m_LightmapFlags: 5 + - _RECEIVESHADOWS_ON + - _WRAPPEDLIGHTING_ON + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: + IGNOREPROJECTOR: False IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -35,6 +46,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,10 +90,30 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DrawnMap: + 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} - _EmissiveColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -91,6 +126,18 @@ Material: m_Texture: {fileID: 2800000, guid: 3efba7c112fa27d4baa50f68135d225f, type: 3} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -103,12 +150,16 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _IridescenceRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescenceThicknessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 6d67cf8df0c0cf14a8fa0d315f42b221, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -119,6 +170,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NoiseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _NormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -143,6 +198,10 @@ Material: m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3} m_Scale: {x: 1, y: 1} 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: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -167,10 +226,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SketchMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecularColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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} - _SubsurfaceMaskMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -187,10 +258,30 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ThresholdMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} 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_Floats: - _1st2nd_Shades_Feather: 0.1 @@ -206,7 +297,11 @@ Material: - _ATDistance: 1 - _AddPrecomputedVelocity: 0 - _Add_Antipodean_RimLight: 0 + - _AdvancedTab: 0 - _AlbedoAffectEmissive: 0 + - _AlbedoMapIntensity: 1 + - _AlembicMotionVectors: 0 + - _AlphaClipping: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 @@ -222,15 +317,25 @@ Material: - _Anisotropy: 0 - _Ap_RimLight_FeatherOff: 0 - _Ap_RimLight_Power: 0.1 + - _Artistic: 0 + - _ArtisticFrequency: 1 + - _ArtisticProjection: 0 + - _ArtisticShadowFilter: 0 - _AutoRenderQueue: 1 - _BaseColorOverridden: 0 - _BaseColorVisible: 1 - _BaseColor_Step: 0.4 - _BaseShade_Feather: 0.2 - _Base_Speed: 0 + - _Blend: 0 + - _BlendDst: 0 + - _BlendDstAlpha: 0 - _BlendMode: 0 + - _BlendSrc: 1 + - _BlendSrcAlpha: 1 - _BlurLevelMatcap: 0 - _BlurLevelSGM: 0 + - _Brightness: 1 - _BumpScale: 1 - _BumpScaleMatcap: 1 - _CameraRolling_Stabilizer: 0 @@ -238,8 +343,10 @@ Material: - _ClippingMode: 0 - _Clipping_Level: 0 - _CoatMask: 0 + - _ColorGrading: 0 - _ColorShift_Speed: 0 - _ComposerMaskMode: 0 + - _Contrast: 1 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 @@ -247,11 +354,17 @@ Material: - _DetailAlbedoScale: 1 - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 + - _DiffuseSmoothness: 0 + - _DiffuseThresholdOffset: 0.25 - _DiffusionProfile: 0 - _DiffusionProfileHash: 0 - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 + - _Dissolve: 0 + - _DissolveAmount: 0.5 + - _DissolveBorderSize: 0.25 + - _DissolveMapScale: 1 - _DistortionBlendMode: 0 - _DistortionBlurBlendMode: 0 - _DistortionBlurDstBlend: 0 @@ -268,6 +381,9 @@ Material: - _DistortionVectorScale: 2 - _DoubleSidedEnable: 0 - _DoubleSidedNormalMode: 1 + - _DrawnClampMax: 1 + - _DrawnClampMin: 0 + - _DrawnMapScale: 1 - _DstBlend: 0 - _EMISSIVE: 0 - _EmissiveColorMode: 1 @@ -278,11 +394,14 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _FalloffPower: 1 - _Farthest_Distance: 100 - _FirstShadeOverridden: 0 - _FirstShadeVisible: 1 - _GI_Intensity: 0 + - _GoochRampIntensity: 0.5 + - _HatchingMapScale: 1 - _HeightAmplitude: 0.02 - _HeightCenter: 0.5 - _HeightMapParametrization: 0 @@ -295,13 +414,21 @@ Material: - _HighColor_Power: 0 - _HighlightOverridden: 0 - _HighlightVisible: 1 + - _Hue: 0 + - _IndirectFade: 1 + - _Initialized: 0 + - _InputTab: 1 - _InvTilingScale: 1 - _Inverse_Clipping: 0 - _Inverse_MatcapMask: 0 - _Inverse_Z_Axis_BLD: 1 - _Ior: 1 + - _Iridescence: 0 - _IridescenceMask: 1 + - _IridescenceSize: 1 + - _IridescenceSmoothness: 0.5 - _IridescenceThickness: 1 + - _IridescenceThresholdOffset: 0 - _IsBaseMapAlphaAsClippingMask: 0 - _Is_BLD: 0 - _Is_BakedNormal: 0 @@ -332,12 +459,17 @@ Material: - _Is_UseTweakMatCapOnShadow: 0 - _Is_ViewCoord_Scroll: 0 - _Is_ViewShift: 0 + - _Light: 1 + - _LightBands: 4 + - _LightBandsScale: 0.5 - _LightDirection_MaskOn: 0 + - _LightThreshold: 0.5 - _LinkDetailsWithBase: 1 - _MatCap: 0 - _MaterialID: 1 - _Metallic: 0 - _Nearest_Distance: 0.5 + - _NormalMapIntensity: 1 - _NormalMapSpace: 0 - _NormalScale: 1 - _OUTLINE: 0 @@ -345,6 +477,7 @@ Material: - _Offset_X_Axis_BLD: -0.05 - _Offset_Y_Axis_BLD: 0.09 - _Offset_Z: 0 + - _OptionsTab: 1 - _OutlineOverridden: 0 - _OutlineVisible: 1 - _Outline_Width: 1 @@ -353,38 +486,55 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 + - _ReceiveShadows: 1 - _ReceivesSSR: 1 - _RefractionModel: 0 + - _RenderFace: 2 + - _RenderPriority: 0 + - _Rim: 0 - _RimLight: 1 - _RimLightOverridden: 0 - _RimLightVisible: 1 - _RimLight_FeatherOff: 0 - _RimLight_InsideMask: 0.2 - _RimLight_Power: 0.7 + - _RimSize: 1 + - _RimSmoothness: 0.5 + - _RimThresholdOffset: 0.25 - _Rotate_EmissiveUV: 0 - _Rotate_MatCapUV: 0 - _Rotate_NormalMapForMatCapUV: 0 - _SPRDefaultUnlitColorMask: 15 - _SRPDefaultUnlitColMode: 1 - _SSRefractionProjectionModel: 0 + - _Saturation: 1 - _Scroll_EmissiveU: 0 - _Scroll_EmissiveV: 0 - _SecondShadeOverridden: 0 - _SecondShadeVisible: 1 - _Set_SystemShadowsToBase: 1 - _ShadeColor_Step: 0 + - _SketchMapScale: 1 - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 + - _Specular: 0 - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 + - _SpecularIntensity: 1 - _SpecularOcclusionMode: 1 + - _SpecularSmoothness: 0 + - _SpecularThresholdOffset: 0.25 - _SrcBlend: 1 + - _Stencil: 1 - _StencilComp: 0 + - _StencilFail: 0 - _StencilMode: 0 - _StencilNo: 1 - _StencilOpFail: 0 - _StencilOpPass: 0 + - _StencilPass: 0 + - _StencilReadMask: 255 - _StencilRef: 2 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 64 @@ -395,14 +545,18 @@ Material: - _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskGBuffer: 3 - _StencilWriteMaskMV: 128 + - _StencilZFail: 0 - _StepOffset: 0 + - _StylizeTab: 0 - _SubsurfaceMask: 1 - _SupportDecals: 1 + - _Surface: 0 - _SurfaceType: 0 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _ThicknessMultiplier: 1 + - _ThresholdMapScale: 1 - _TransmissionEnable: 1 - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 @@ -431,7 +585,12 @@ Material: - _UseShadowThreshold: 0 - _Use_1stAs2nd: 0 - _Use_BaseAs1st: 1 + - _VertexAnimation: 0 + - _VertexAnimationIntensity: 0.05 + - _VertexAnimationStutter: 0 + - _WrappedLighting: 1 - _ZOverDrawMode: 0 + - _ZTest: 4 - _ZTestDepthEqualForOpaque: 4 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 8 @@ -447,6 +606,7 @@ Material: m_Colors: - _1st_ShadeColor: {r: 0.8867924, g: 0.6818262, b: 0.6818262, 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} - _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1} - _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1} @@ -456,19 +616,26 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _ColorShift: {r: 0, g: 0, b: 0, a: 1} - _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} - _EmissionColor: {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} - _Emissive_Color: {r: 0, g: 0, b: 0, 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} - _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1} - _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} - _MatCapColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineMaskColor: {r: 0, g: 0, b: 0, 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} - _RimLightMaskColor: {r: 1, g: 0, b: 1, a: 1} - _SecondShadeMaskColor: {r: 0, g: 0, b: 1, a: 1} @@ -479,6 +646,7 @@ Material: - _UVDetailsMappingMask: {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} + - _VertexAnimationFrequency: {r: 2.5, g: 2.5, b: 2.5, a: 1} - _ViewShift: {r: 0, g: 0, b: 0, a: 1} - emissive: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/mat_cheek_Aki.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/mat_cheek_Aki.mat index bdb89b567..04ec9fa1c 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/mat_cheek_Aki.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Base_character/mat_cheek_Aki.mat @@ -2,40 +2,234 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_cheek_Aki m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} + m_CustomRenderQueue: -1 + stringTagMap: + IGNOREPROJECTOR: False disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _AlbedoMap: + m_Texture: {fileID: 2800000, guid: d288b17ca17e44f46a7c6a1d2f4f1bed, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d288b17ca17e44f46a7c6a1d2f4f1bed, type: 3} + m_Scale: {x: 1, y: 1} + 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} + - _DrawnMap: + 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} - _FalloffSampler: m_Texture: {fileID: 2800000, guid: 3efba7c112fa27d4baa50f68135d225f, type: 3} m_Scale: {x: 1, y: 1} 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} + - _IridescenceRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: d288b17ca17e44f46a7c6a1d2f4f1bed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NoiseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _RimLightSampler: m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _RimRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SketchMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + - _ThresholdMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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_Floats: + - _AddPrecomputedVelocity: 0 + - _AdvancedTab: 0 + - _AlbedoMapIntensity: 1 + - _AlembicMotionVectors: 0 + - _AlphaClip: 0 + - _AlphaClipping: 0 + - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 + - _Artistic: 0 + - _ArtisticFrequency: 1 + - _ArtisticProjection: 0 + - _ArtisticShadowFilter: 0 + - _Blend: 0 + - _BlendDst: 0 + - _BlendDstAlpha: 0 + - _BlendOp: 0 + - _BlendSrc: 1 + - _BlendSrcAlpha: 1 + - _Brightness: 1 + - _ColorGrading: 0 + - _Contrast: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DiffuseSmoothness: 0 + - _DiffuseThresholdOffset: 0.25 + - _Dissolve: 0 + - _DissolveAmount: 0.5 + - _DissolveBorderSize: 0.25 + - _DissolveMapScale: 1 + - _DrawnClampMax: 1 + - _DrawnClampMin: 0 + - _DrawnMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EdgeThickness: 1 + - _EnvironmentReflections: 1 + - _GoochRampIntensity: 0.5 + - _HatchingMapScale: 1 + - _Hue: 0 + - _IndirectFade: 1 + - _Initialized: 0 + - _InputTab: 1 + - _Iridescence: 0 + - _IridescenceSize: 1 + - _IridescenceSmoothness: 0.5 + - _IridescenceThresholdOffset: 0 + - _Light: 1 + - _LightBands: 4 + - _LightBandsScale: 0.5 + - _LightThreshold: 0.5 + - _NormalMapIntensity: 1 + - _OptionsTab: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _RenderFace: 2 + - _RenderPriority: 0 + - _Rim: 0 + - _RimSize: 1 + - _RimSmoothness: 0.5 + - _RimThresholdOffset: 0.25 + - _SampleGI: 0 + - _Saturation: 1 - _Shininess: 0.7 + - _SketchMapScale: 1 + - _Smoothness: 0.5 + - _Specular: 0 + - _SpecularIntensity: 1 + - _SpecularSmoothness: 0 + - _SpecularThresholdOffset: 0.25 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 1 + - _StencilComp: 8 + - _StencilFail: 0 + - _StencilPass: 0 + - _StencilReadMask: 255 + - _StencilRef: 0 + - _StencilWriteMask: 255 + - _StencilZFail: 0 + - _StylizeTab: 0 + - _Surface: 0 + - _ThresholdMapScale: 1 + - _VertexAnimation: 0 + - _VertexAnimationIntensity: 0.05 + - _VertexAnimationStutter: 0 + - _WrappedLighting: 1 + - _ZTest: 4 + - _ZWrite: 1 m_Colors: + - _AlbedoColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DissolveBorderColor: {r: 1, g: 1, b: 1, a: 1} - _Emission: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _GoochBrightColor: {r: 1, g: 1, b: 1, a: 1} + - _GoochDarkColor: {r: 0, g: 0, b: 0, a: 1} + - _IridescenceColor: {r: 1, g: 1, b: 1, a: 0.5} + - _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} - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _VertexAnimationFrequency: {r: 2.5, g: 2.5, b: 2.5, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Boot.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Boot.mat index 30187836c..7ad64f9f9 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Boot.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Boot.mat @@ -541,7 +541,7 @@ Material: - _SpecularThresholdOffset: 0.25 - _SrcBlend: 1 - _Stencil: 1 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilFail: 0 - _StencilMode: 0 - _StencilNo: 1 @@ -549,12 +549,12 @@ Material: - _StencilOpPass: 0 - _StencilPass: 0 - _StencilReadMask: 255 - - _StencilRef: 2 + - _StencilRef: 0 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 64 - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - - _StencilWriteMask: 3 + - _StencilWriteMask: 255 - _StencilWriteMaskDepth: 32 - _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskGBuffer: 3 diff --git a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Katana_Aki.mat b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Katana_Aki.mat index 45f44fe76..65f519dcb 100644 --- a/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Katana_Aki.mat +++ b/Assets/ResWork/Suriyun/Characters/Aki/Materials/Aki/Dress/Katana_Aki.mat @@ -541,7 +541,7 @@ Material: - _SpecularThresholdOffset: 0.25 - _SrcBlend: 1 - _Stencil: 1 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilFail: 0 - _StencilMode: 0 - _StencilNo: 1 @@ -549,12 +549,12 @@ Material: - _StencilOpPass: 0 - _StencilPass: 0 - _StencilReadMask: 255 - - _StencilRef: 2 + - _StencilRef: 0 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 64 - _StencilRefGBuffer: 2 - _StencilRefMV: 128 - - _StencilWriteMask: 3 + - _StencilWriteMask: 255 - _StencilWriteMaskDepth: 32 - _StencilWriteMaskDistortionVec: 64 - _StencilWriteMaskGBuffer: 3 diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Eimika_clothes.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Eimika_clothes.mat index 97f210615..f92d18405 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Eimika_clothes.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Eimika_clothes.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Eimika_clothes m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_eyeline.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_eyeline.mat index 4e7530a30..8030a26fb 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_eyeline.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_eyeline.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_eyeline m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_face.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_face.mat index 8a1452295..02ea4a3d7 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_face.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_face.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_face m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_last.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_last.mat index 90fc3686b..ce2394744 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_last.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_last.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_last m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_skin.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_skin.mat index 40085c7ed..58638aec4 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_skin.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/Emika_skin.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_skin m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/cheek.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/cheek.mat index 3df1f06ae..cf1f6d65d 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/cheek.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Base_character/cheek.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: cheek m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHAPREMULTIPLY_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -63,6 +68,7 @@ Material: m_Texture: {fileID: 2800000, guid: 695344a219643f1448e214a2ad48328c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -86,3 +92,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Emika_SkinB.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Emika_SkinB.mat index bfa84cb58..407d41737 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Emika_SkinB.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Emika_SkinB.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_SkinB m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Pajama07.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Pajama07.mat index 181166e72..1881ada1c 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Pajama07.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/Pajama07.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pajama07 m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/bikini16.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/bikini16.mat index c96323d87..090212d81 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/bikini16.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/Bikini&Pajama/bikini16.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: bikini16 m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/School_uniform/Emika_schooluniform.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/School_uniform/Emika_schooluniform.mat index 8f4fd8ffa..81de31d62 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/School_uniform/Emika_schooluniform.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika/School_uniform/Emika_schooluniform.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_schooluniform m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika_hair.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika_hair.mat index 74bc61447..b3333fb39 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika_hair.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Emika_hair.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Emika_hair m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Horn_sheep.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Horn_sheep.mat index 9f1db2a2e..7e15247eb 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Horn_sheep.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Horn_sheep.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Horn_sheep m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Straw_hat_flower.mat b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Straw_hat_flower.mat index 49e6c803a..d09033fdd 100644 --- a/Assets/ResWork/Suriyun/Characters/Emika/Materials/Straw_hat_flower.mat +++ b/Assets/ResWork/Suriyun/Characters/Emika/Materials/Straw_hat_flower.mat @@ -9,13 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Straw_hat_flower m_Shader: {fileID: 4800000, guid: be891319084e9d147b09d89e80ce60e0, type: 3} - m_ValidKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: - _EMISSIVE_SIMPLE - _IS_ANGELRING_OFF - _IS_CLIPPING_OFF - _IS_OUTLINE_CLIPPING_NO - _OUTLINE_NML - m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +26,7 @@ Material: IgnoreProjection: False RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/ResWork/Suriyun/Emotions/Emo@Face_SmileA.fbx.meta b/Assets/ResWork/Suriyun/Emotions/Emo@Face_SmileA.fbx.meta index 1dbb4de6a..53b2a5691 100644 --- a/Assets/ResWork/Suriyun/Emotions/Emo@Face_SmileA.fbx.meta +++ b/Assets/ResWork/Suriyun/Emotions/Emo@Face_SmileA.fbx.meta @@ -1,460 +1,1358 @@ fileFormatVersion: 2 guid: fa666ad69ae216c43a16cc2e3abda821 ModelImporter: - serializedVersion: 22 - fileIDToRecycleName: - 100000: Brow - 100002: cheek - 100004: Chest_M - 100006: //RootNode - 100008: Eye - 100010: Eye_base - 100012: Face_A - 100014: FaceB - 100016: Head_M - 100018: Lash - 100020: Neck_M - 100022: Root_M - 100024: RootPart1_M - 100026: Spine1_M - 100028: Ang1 - 100030: Ang2 - 100032: Ang3 - 100034: Ankle_L - 100036: Ankle_R - 100038: blen - 100040: Chest_L - 100042: Chest_R - 100044: Cup_L - 100046: Cup_R - 100048: Elbow_L - 100050: Elbow_R - 100052: Eye_c - 100054: Eye_Down - 100056: Eye_L - 100058: Eye_L 1 - 100060: Eye_R - 100062: Eye_R 1 - 100064: Eye_sDwon - 100066: Eye_sL - 100068: Eye_sR - 100070: Eye_sTop - 100072: Eye_Top - 100074: EyeEnd_L - 100076: EyeEnd_R - 100078: FKExtraRoot_M - 100080: FKIKParentConstraintSpine_M - 100082: FKIKSpine_M - 100084: FKIKSystem - 100086: FKOffsetRoot_M - 100088: FKRoot_M - 100090: FKSystem - 100092: FKXRoot_M - 100094: Group - 100096: Hair_Root - 100098: HeadEnd_M - 100100: Hip_L - 100102: Hip_R - 100104: HipSwingerStabilizer - 100106: IKExtraSpine1_M - 100108: IKExtraSpine2_M - 100110: IKHandle - 100112: IKJoints - 100114: IKOffsetSpine1_M - 100116: IKOffsetSpine2_M - 100118: IKParentConstraintRoot_M - 100120: IKRootConstraint - 100122: IKScalerRoot_M - 100124: IKSpine1_M - 100126: IKSpine2_M - 100128: IKSpRoot_M - 100130: IKSpRootFollowOffset_M - 100132: IKSpSpineOffset_M - 100134: IKSystem - 100136: IKXOffsetRoot_M - 100138: IKXRoot_M - 100140: IndexFinger1_L - 100142: IndexFinger1_R - 100144: IndexFinger2_L - 100146: IndexFinger2_R - 100148: IndexFinger3_L - 100150: IndexFinger3_R - 100152: IndexFinger4_L - 100154: IndexFinger4_R - 100156: Jaw_M - 100158: JawEnd_M - 100160: joint10 - 100162: joint11 - 100164: joint12 - 100166: joint13 - 100168: joint14 - 100170: joint15 - 100172: joint16 - 100174: joint17 - 100176: joint18 - 100178: joint2 - 100180: joint21 - 100182: joint22 - 100184: joint23 - 100186: joint24 - 100188: joint25 - 100190: joint26 - 100192: joint27 - 100194: joint28 - 100196: joint29 - 100198: joint3 - 100200: joint30 - 100202: joint31 - 100204: joint32 - 100206: joint33 - 100208: joint34 - 100210: joint35 - 100212: joint36 - 100214: joint37 - 100216: joint38 - 100218: joint39 - 100220: joint4 - 100222: joint40 - 100224: joint41 - 100226: joint42 - 100228: joint43 - 100230: joint44 - 100232: joint45 - 100234: joint46 - 100236: joint47 - 100238: joint5 - 100240: joint6 - 100242: joint7 - 100244: joint8 - 100246: joint9 - 100248: Knee_L - 100250: Knee_R - 100252: Main - 100254: MiddleFinger1_L - 100256: MiddleFinger1_R - 100258: MiddleFinger2_L - 100260: MiddleFinger2_R - 100262: MiddleFinger3_L - 100264: MiddleFinger3_R - 100266: MiddleFinger4_L - 100268: MiddleFinger4_R - 100270: MotionSystem - 100272: nurbsCircle1 - 100274: nurbsCircle10 - 100276: nurbsCircle11 - 100278: nurbsCircle12 - 100280: nurbsCircle13 - 100282: nurbsCircle14 - 100284: nurbsCircle15 - 100286: nurbsCircle17 - 100288: nurbsCircle19 - 100290: nurbsCircle2 - 100292: nurbsCircle21 - 100294: nurbsCircle23 - 100296: nurbsCircle25 - 100298: nurbsCircle27 - 100300: nurbsCircle28 - 100302: nurbsCircle29 - 100304: nurbsCircle3 - 100306: nurbsCircle31 - 100308: nurbsCircle32 - 100310: nurbsCircle33 - 100312: nurbsCircle35 - 100314: nurbsCircle37 - 100316: nurbsCircle38 - 100318: nurbsCircle4 - 100320: nurbsCircle40 - 100322: nurbsCircle41 - 100324: nurbsCircle42 - 100326: nurbsCircle5 - 100328: nurbsCircle7 - 100330: nurbsCircle8 - 100332: nurbsCircle9 - 100334: PinkyFinger1_L - 100336: PinkyFinger1_R - 100338: PinkyFinger2_L - 100340: PinkyFinger2_R - 100342: PinkyFinger3_L - 100344: PinkyFinger3_R - 100346: PinkyFinger4_L - 100348: PinkyFinger4_R - 100350: RingFinger1_L - 100352: RingFinger1_R - 100354: RingFinger2_L - 100356: RingFinger2_R - 100358: RingFinger3_L - 100360: RingFinger3_R - 100362: RingFinger4_L - 100364: RingFinger4_R - 100366: Sad - 100368: sap - 100370: Scapula_L - 100372: Scapula_R - 100374: Shoulder_L - 100376: Shoulder_R - 100378: Skirt_La - 100380: Skirt_Ra - 100382: SkirtLb - 100384: SkirtLc - 100386: SkirtRb - 100388: SkirtRc - 100390: Smile2 - 100392: ThumbFinger1_L - 100394: ThumbFinger1_R - 100396: ThumbFinger2_L - 100398: ThumbFinger2_R - 100400: ThumbFinger3_L - 100402: ThumbFinger3_R - 100404: ThumbFinger4_L - 100406: ThumbFinger4_R - 100408: Toes_L - 100410: Toes_R - 100412: ToesEnd_L - 100414: ToesEnd_R - 100416: Wrist_L - 100418: Wrist_R - 400000: Brow - 400002: cheek - 400004: Chest_M - 400006: //RootNode - 400008: Eye - 400010: Eye_base - 400012: Face_A - 400014: FaceB - 400016: Head_M - 400018: Lash - 400020: Neck_M - 400022: Root_M - 400024: RootPart1_M - 400026: Spine1_M - 400028: Ang1 - 400030: Ang2 - 400032: Ang3 - 400034: Ankle_L - 400036: Ankle_R - 400038: blen - 400040: Chest_L - 400042: Chest_R - 400044: Cup_L - 400046: Cup_R - 400048: Elbow_L - 400050: Elbow_R - 400052: Eye_c - 400054: Eye_Down - 400056: Eye_L - 400058: Eye_L 1 - 400060: Eye_R - 400062: Eye_R 1 - 400064: Eye_sDwon - 400066: Eye_sL - 400068: Eye_sR - 400070: Eye_sTop - 400072: Eye_Top - 400074: EyeEnd_L - 400076: EyeEnd_R - 400078: FKExtraRoot_M - 400080: FKIKParentConstraintSpine_M - 400082: FKIKSpine_M - 400084: FKIKSystem - 400086: FKOffsetRoot_M - 400088: FKRoot_M - 400090: FKSystem - 400092: FKXRoot_M - 400094: Group - 400096: Hair_Root - 400098: HeadEnd_M - 400100: Hip_L - 400102: Hip_R - 400104: HipSwingerStabilizer - 400106: IKExtraSpine1_M - 400108: IKExtraSpine2_M - 400110: IKHandle - 400112: IKJoints - 400114: IKOffsetSpine1_M - 400116: IKOffsetSpine2_M - 400118: IKParentConstraintRoot_M - 400120: IKRootConstraint - 400122: IKScalerRoot_M - 400124: IKSpine1_M - 400126: IKSpine2_M - 400128: IKSpRoot_M - 400130: IKSpRootFollowOffset_M - 400132: IKSpSpineOffset_M - 400134: IKSystem - 400136: IKXOffsetRoot_M - 400138: IKXRoot_M - 400140: IndexFinger1_L - 400142: IndexFinger1_R - 400144: IndexFinger2_L - 400146: IndexFinger2_R - 400148: IndexFinger3_L - 400150: IndexFinger3_R - 400152: IndexFinger4_L - 400154: IndexFinger4_R - 400156: Jaw_M - 400158: JawEnd_M - 400160: joint10 - 400162: joint11 - 400164: joint12 - 400166: joint13 - 400168: joint14 - 400170: joint15 - 400172: joint16 - 400174: joint17 - 400176: joint18 - 400178: joint2 - 400180: joint21 - 400182: joint22 - 400184: joint23 - 400186: joint24 - 400188: joint25 - 400190: joint26 - 400192: joint27 - 400194: joint28 - 400196: joint29 - 400198: joint3 - 400200: joint30 - 400202: joint31 - 400204: joint32 - 400206: joint33 - 400208: joint34 - 400210: joint35 - 400212: joint36 - 400214: joint37 - 400216: joint38 - 400218: joint39 - 400220: joint4 - 400222: joint40 - 400224: joint41 - 400226: joint42 - 400228: joint43 - 400230: joint44 - 400232: joint45 - 400234: joint46 - 400236: joint47 - 400238: joint5 - 400240: joint6 - 400242: joint7 - 400244: joint8 - 400246: joint9 - 400248: Knee_L - 400250: Knee_R - 400252: Main - 400254: MiddleFinger1_L - 400256: MiddleFinger1_R - 400258: MiddleFinger2_L - 400260: MiddleFinger2_R - 400262: MiddleFinger3_L - 400264: MiddleFinger3_R - 400266: MiddleFinger4_L - 400268: MiddleFinger4_R - 400270: MotionSystem - 400272: nurbsCircle1 - 400274: nurbsCircle10 - 400276: nurbsCircle11 - 400278: nurbsCircle12 - 400280: nurbsCircle13 - 400282: nurbsCircle14 - 400284: nurbsCircle15 - 400286: nurbsCircle17 - 400288: nurbsCircle19 - 400290: nurbsCircle2 - 400292: nurbsCircle21 - 400294: nurbsCircle23 - 400296: nurbsCircle25 - 400298: nurbsCircle27 - 400300: nurbsCircle28 - 400302: nurbsCircle29 - 400304: nurbsCircle3 - 400306: nurbsCircle31 - 400308: nurbsCircle32 - 400310: nurbsCircle33 - 400312: nurbsCircle35 - 400314: nurbsCircle37 - 400316: nurbsCircle38 - 400318: nurbsCircle4 - 400320: nurbsCircle40 - 400322: nurbsCircle41 - 400324: nurbsCircle42 - 400326: nurbsCircle5 - 400328: nurbsCircle7 - 400330: nurbsCircle8 - 400332: nurbsCircle9 - 400334: PinkyFinger1_L - 400336: PinkyFinger1_R - 400338: PinkyFinger2_L - 400340: PinkyFinger2_R - 400342: PinkyFinger3_L - 400344: PinkyFinger3_R - 400346: PinkyFinger4_L - 400348: PinkyFinger4_R - 400350: RingFinger1_L - 400352: RingFinger1_R - 400354: RingFinger2_L - 400356: RingFinger2_R - 400358: RingFinger3_L - 400360: RingFinger3_R - 400362: RingFinger4_L - 400364: RingFinger4_R - 400366: Sad - 400368: sap - 400370: Scapula_L - 400372: Scapula_R - 400374: Shoulder_L - 400376: Shoulder_R - 400378: Skirt_La - 400380: Skirt_Ra - 400382: SkirtLb - 400384: SkirtLc - 400386: SkirtRb - 400388: SkirtRc - 400390: Smile2 - 400392: ThumbFinger1_L - 400394: ThumbFinger1_R - 400396: ThumbFinger2_L - 400398: ThumbFinger2_R - 400400: ThumbFinger3_L - 400402: ThumbFinger3_R - 400404: ThumbFinger4_L - 400406: ThumbFinger4_R - 400408: Toes_L - 400410: Toes_R - 400412: ToesEnd_L - 400414: ToesEnd_R - 400416: Wrist_L - 400418: Wrist_R - 2300000: Brow - 2300002: cheek - 2300004: Eye - 2300006: Eye_base - 2300008: Face_A - 2300010: FaceB - 2300012: Lash - 3300000: Brow - 3300002: cheek - 3300004: Eye - 3300006: Eye_base - 3300008: Face_A - 3300010: FaceB - 3300012: Lash - 4300000: FaceB - 4300002: Lash - 4300004: Face_A - 4300006: Eye_base - 4300008: Eye - 4300010: cheek - 4300012: Brow - 7400000: Face_SmileA - 9500000: //RootNode - 13700000: Brow - 13700002: Eye - 13700004: Face_A - 13700006: FaceB - 13700008: Lash - 2186277476908879412: ImportLogs + serializedVersion: 22200 + internalIDToNameTable: + - first: + 1: 100000 + second: Brow + - first: + 1: 100002 + second: cheek + - first: + 1: 100004 + second: Chest_M + - first: + 1: 100006 + second: //RootNode + - first: + 1: 100008 + second: Eye + - first: + 1: 100010 + second: Eye_base + - first: + 1: 100012 + second: Face_A + - first: + 1: 100014 + second: FaceB + - first: + 1: 100016 + second: Head_M + - first: + 1: 100018 + second: Lash + - first: + 1: 100020 + second: Neck_M + - first: + 1: 100022 + second: Root_M + - first: + 1: 100024 + second: RootPart1_M + - first: + 1: 100026 + second: Spine1_M + - first: + 1: 100028 + second: Ang1 + - first: + 1: 100030 + second: Ang2 + - first: + 1: 100032 + second: Ang3 + - first: + 1: 100034 + second: Ankle_L + - first: + 1: 100036 + second: Ankle_R + - first: + 1: 100038 + second: blen + - first: + 1: 100040 + second: Chest_L + - first: + 1: 100042 + second: Chest_R + - first: + 1: 100044 + second: Cup_L + - first: + 1: 100046 + second: Cup_R + - first: + 1: 100048 + second: Elbow_L + - first: + 1: 100050 + second: Elbow_R + - first: + 1: 100052 + second: Eye_c + - first: + 1: 100054 + second: Eye_Down + - first: + 1: 100056 + second: Eye_L + - first: + 1: 100058 + second: Eye_L 1 + - first: + 1: 100060 + second: Eye_R + - first: + 1: 100062 + second: Eye_R 1 + - first: + 1: 100064 + second: Eye_sDwon + - first: + 1: 100066 + second: Eye_sL + - first: + 1: 100068 + second: Eye_sR + - first: + 1: 100070 + second: Eye_sTop + - first: + 1: 100072 + second: Eye_Top + - first: + 1: 100074 + second: EyeEnd_L + - first: + 1: 100076 + second: EyeEnd_R + - first: + 1: 100078 + second: FKExtraRoot_M + - first: + 1: 100080 + second: FKIKParentConstraintSpine_M + - first: + 1: 100082 + second: FKIKSpine_M + - first: + 1: 100084 + second: FKIKSystem + - first: + 1: 100086 + second: FKOffsetRoot_M + - first: + 1: 100088 + second: FKRoot_M + - first: + 1: 100090 + second: FKSystem + - first: + 1: 100092 + second: FKXRoot_M + - first: + 1: 100094 + second: Group + - first: + 1: 100096 + second: Hair_Root + - first: + 1: 100098 + second: HeadEnd_M + - first: + 1: 100100 + second: Hip_L + - first: + 1: 100102 + second: Hip_R + - first: + 1: 100104 + second: HipSwingerStabilizer + - first: + 1: 100106 + second: IKExtraSpine1_M + - first: + 1: 100108 + second: IKExtraSpine2_M + - first: + 1: 100110 + second: IKHandle + - first: + 1: 100112 + second: IKJoints + - first: + 1: 100114 + second: IKOffsetSpine1_M + - first: + 1: 100116 + second: IKOffsetSpine2_M + - first: + 1: 100118 + second: IKParentConstraintRoot_M + - first: + 1: 100120 + second: IKRootConstraint + - first: + 1: 100122 + second: IKScalerRoot_M + - first: + 1: 100124 + second: IKSpine1_M + - first: + 1: 100126 + second: IKSpine2_M + - first: + 1: 100128 + second: IKSpRoot_M + - first: + 1: 100130 + second: IKSpRootFollowOffset_M + - first: + 1: 100132 + second: IKSpSpineOffset_M + - first: + 1: 100134 + second: IKSystem + - first: + 1: 100136 + second: IKXOffsetRoot_M + - first: + 1: 100138 + second: IKXRoot_M + - first: + 1: 100140 + second: IndexFinger1_L + - first: + 1: 100142 + second: IndexFinger1_R + - first: + 1: 100144 + second: IndexFinger2_L + - first: + 1: 100146 + second: IndexFinger2_R + - first: + 1: 100148 + second: IndexFinger3_L + - first: + 1: 100150 + second: IndexFinger3_R + - first: + 1: 100152 + second: IndexFinger4_L + - first: + 1: 100154 + second: IndexFinger4_R + - first: + 1: 100156 + second: Jaw_M + - first: + 1: 100158 + second: JawEnd_M + - first: + 1: 100160 + second: joint10 + - first: + 1: 100162 + second: joint11 + - first: + 1: 100164 + second: joint12 + - first: + 1: 100166 + second: joint13 + - first: + 1: 100168 + second: joint14 + - first: + 1: 100170 + second: joint15 + - first: + 1: 100172 + second: joint16 + - first: + 1: 100174 + second: joint17 + - first: + 1: 100176 + second: joint18 + - first: + 1: 100178 + second: joint2 + - first: + 1: 100180 + second: joint21 + - first: + 1: 100182 + second: joint22 + - first: + 1: 100184 + second: joint23 + - first: + 1: 100186 + second: joint24 + - first: + 1: 100188 + second: joint25 + - first: + 1: 100190 + second: joint26 + - first: + 1: 100192 + second: joint27 + - first: + 1: 100194 + second: joint28 + - first: + 1: 100196 + second: joint29 + - first: + 1: 100198 + second: joint3 + - first: + 1: 100200 + second: joint30 + - first: + 1: 100202 + second: joint31 + - first: + 1: 100204 + second: joint32 + - first: + 1: 100206 + second: joint33 + - first: + 1: 100208 + second: joint34 + - first: + 1: 100210 + second: joint35 + - first: + 1: 100212 + second: joint36 + - first: + 1: 100214 + second: joint37 + - first: + 1: 100216 + second: joint38 + - first: + 1: 100218 + second: joint39 + - first: + 1: 100220 + second: joint4 + - first: + 1: 100222 + second: joint40 + - first: + 1: 100224 + second: joint41 + - first: + 1: 100226 + second: joint42 + - first: + 1: 100228 + second: joint43 + - first: + 1: 100230 + second: joint44 + - first: + 1: 100232 + second: joint45 + - first: + 1: 100234 + second: joint46 + - first: + 1: 100236 + second: joint47 + - first: + 1: 100238 + second: joint5 + - first: + 1: 100240 + second: joint6 + - first: + 1: 100242 + second: joint7 + - first: + 1: 100244 + second: joint8 + - first: + 1: 100246 + second: joint9 + - first: + 1: 100248 + second: Knee_L + - first: + 1: 100250 + second: Knee_R + - first: + 1: 100252 + second: Main + - first: + 1: 100254 + second: MiddleFinger1_L + - first: + 1: 100256 + second: MiddleFinger1_R + - first: + 1: 100258 + second: MiddleFinger2_L + - first: + 1: 100260 + second: MiddleFinger2_R + - first: + 1: 100262 + second: MiddleFinger3_L + - first: + 1: 100264 + second: MiddleFinger3_R + - first: + 1: 100266 + second: MiddleFinger4_L + - first: + 1: 100268 + second: MiddleFinger4_R + - first: + 1: 100270 + second: MotionSystem + - first: + 1: 100272 + second: nurbsCircle1 + - first: + 1: 100274 + second: nurbsCircle10 + - first: + 1: 100276 + second: nurbsCircle11 + - first: + 1: 100278 + second: nurbsCircle12 + - first: + 1: 100280 + second: nurbsCircle13 + - first: + 1: 100282 + second: nurbsCircle14 + - first: + 1: 100284 + second: nurbsCircle15 + - first: + 1: 100286 + second: nurbsCircle17 + - first: + 1: 100288 + second: nurbsCircle19 + - first: + 1: 100290 + second: nurbsCircle2 + - first: + 1: 100292 + second: nurbsCircle21 + - first: + 1: 100294 + second: nurbsCircle23 + - first: + 1: 100296 + second: nurbsCircle25 + - first: + 1: 100298 + second: nurbsCircle27 + - first: + 1: 100300 + second: nurbsCircle28 + - first: + 1: 100302 + second: nurbsCircle29 + - first: + 1: 100304 + second: nurbsCircle3 + - first: + 1: 100306 + second: nurbsCircle31 + - first: + 1: 100308 + second: nurbsCircle32 + - first: + 1: 100310 + second: nurbsCircle33 + - first: + 1: 100312 + second: nurbsCircle35 + - first: + 1: 100314 + second: nurbsCircle37 + - first: + 1: 100316 + second: nurbsCircle38 + - first: + 1: 100318 + second: nurbsCircle4 + - first: + 1: 100320 + second: nurbsCircle40 + - first: + 1: 100322 + second: nurbsCircle41 + - first: + 1: 100324 + second: nurbsCircle42 + - first: + 1: 100326 + second: nurbsCircle5 + - first: + 1: 100328 + second: nurbsCircle7 + - first: + 1: 100330 + second: nurbsCircle8 + - first: + 1: 100332 + second: nurbsCircle9 + - first: + 1: 100334 + second: PinkyFinger1_L + - first: + 1: 100336 + second: PinkyFinger1_R + - first: + 1: 100338 + second: PinkyFinger2_L + - first: + 1: 100340 + second: PinkyFinger2_R + - first: + 1: 100342 + second: PinkyFinger3_L + - first: + 1: 100344 + second: PinkyFinger3_R + - first: + 1: 100346 + second: PinkyFinger4_L + - first: + 1: 100348 + second: PinkyFinger4_R + - first: + 1: 100350 + second: RingFinger1_L + - first: + 1: 100352 + second: RingFinger1_R + - first: + 1: 100354 + second: RingFinger2_L + - first: + 1: 100356 + second: RingFinger2_R + - first: + 1: 100358 + second: RingFinger3_L + - first: + 1: 100360 + second: RingFinger3_R + - first: + 1: 100362 + second: RingFinger4_L + - first: + 1: 100364 + second: RingFinger4_R + - first: + 1: 100366 + second: Sad + - first: + 1: 100368 + second: sap + - first: + 1: 100370 + second: Scapula_L + - first: + 1: 100372 + second: Scapula_R + - first: + 1: 100374 + second: Shoulder_L + - first: + 1: 100376 + second: Shoulder_R + - first: + 1: 100378 + second: Skirt_La + - first: + 1: 100380 + second: Skirt_Ra + - first: + 1: 100382 + second: SkirtLb + - first: + 1: 100384 + second: SkirtLc + - first: + 1: 100386 + second: SkirtRb + - first: + 1: 100388 + second: SkirtRc + - first: + 1: 100390 + second: Smile2 + - first: + 1: 100392 + second: ThumbFinger1_L + - first: + 1: 100394 + second: ThumbFinger1_R + - first: + 1: 100396 + second: ThumbFinger2_L + - first: + 1: 100398 + second: ThumbFinger2_R + - first: + 1: 100400 + second: ThumbFinger3_L + - first: + 1: 100402 + second: ThumbFinger3_R + - first: + 1: 100404 + second: ThumbFinger4_L + - first: + 1: 100406 + second: ThumbFinger4_R + - first: + 1: 100408 + second: Toes_L + - first: + 1: 100410 + second: Toes_R + - first: + 1: 100412 + second: ToesEnd_L + - first: + 1: 100414 + second: ToesEnd_R + - first: + 1: 100416 + second: Wrist_L + - first: + 1: 100418 + second: Wrist_R + - first: + 4: 400000 + second: Brow + - first: + 4: 400002 + second: cheek + - first: + 4: 400004 + second: Chest_M + - first: + 4: 400006 + second: //RootNode + - first: + 4: 400008 + second: Eye + - first: + 4: 400010 + second: Eye_base + - first: + 4: 400012 + second: Face_A + - first: + 4: 400014 + second: FaceB + - first: + 4: 400016 + second: Head_M + - first: + 4: 400018 + second: Lash + - first: + 4: 400020 + second: Neck_M + - first: + 4: 400022 + second: Root_M + - first: + 4: 400024 + second: RootPart1_M + - first: + 4: 400026 + second: Spine1_M + - first: + 4: 400028 + second: Ang1 + - first: + 4: 400030 + second: Ang2 + - first: + 4: 400032 + second: Ang3 + - first: + 4: 400034 + second: Ankle_L + - first: + 4: 400036 + second: Ankle_R + - first: + 4: 400038 + second: blen + - first: + 4: 400040 + second: Chest_L + - first: + 4: 400042 + second: Chest_R + - first: + 4: 400044 + second: Cup_L + - first: + 4: 400046 + second: Cup_R + - first: + 4: 400048 + second: Elbow_L + - first: + 4: 400050 + second: Elbow_R + - first: + 4: 400052 + second: Eye_c + - first: + 4: 400054 + second: Eye_Down + - first: + 4: 400056 + second: Eye_L + - first: + 4: 400058 + second: Eye_L 1 + - first: + 4: 400060 + second: Eye_R + - first: + 4: 400062 + second: Eye_R 1 + - first: + 4: 400064 + second: Eye_sDwon + - first: + 4: 400066 + second: Eye_sL + - first: + 4: 400068 + second: Eye_sR + - first: + 4: 400070 + second: Eye_sTop + - first: + 4: 400072 + second: Eye_Top + - first: + 4: 400074 + second: EyeEnd_L + - first: + 4: 400076 + second: EyeEnd_R + - first: + 4: 400078 + second: FKExtraRoot_M + - first: + 4: 400080 + second: FKIKParentConstraintSpine_M + - first: + 4: 400082 + second: FKIKSpine_M + - first: + 4: 400084 + second: FKIKSystem + - first: + 4: 400086 + second: FKOffsetRoot_M + - first: + 4: 400088 + second: FKRoot_M + - first: + 4: 400090 + second: FKSystem + - first: + 4: 400092 + second: FKXRoot_M + - first: + 4: 400094 + second: Group + - first: + 4: 400096 + second: Hair_Root + - first: + 4: 400098 + second: HeadEnd_M + - first: + 4: 400100 + second: Hip_L + - first: + 4: 400102 + second: Hip_R + - first: + 4: 400104 + second: HipSwingerStabilizer + - first: + 4: 400106 + second: IKExtraSpine1_M + - first: + 4: 400108 + second: IKExtraSpine2_M + - first: + 4: 400110 + second: IKHandle + - first: + 4: 400112 + second: IKJoints + - first: + 4: 400114 + second: IKOffsetSpine1_M + - first: + 4: 400116 + second: IKOffsetSpine2_M + - first: + 4: 400118 + second: IKParentConstraintRoot_M + - first: + 4: 400120 + second: IKRootConstraint + - first: + 4: 400122 + second: IKScalerRoot_M + - first: + 4: 400124 + second: IKSpine1_M + - first: + 4: 400126 + second: IKSpine2_M + - first: + 4: 400128 + second: IKSpRoot_M + - first: + 4: 400130 + second: IKSpRootFollowOffset_M + - first: + 4: 400132 + second: IKSpSpineOffset_M + - first: + 4: 400134 + second: IKSystem + - first: + 4: 400136 + second: IKXOffsetRoot_M + - first: + 4: 400138 + second: IKXRoot_M + - first: + 4: 400140 + second: IndexFinger1_L + - first: + 4: 400142 + second: IndexFinger1_R + - first: + 4: 400144 + second: IndexFinger2_L + - first: + 4: 400146 + second: IndexFinger2_R + - first: + 4: 400148 + second: IndexFinger3_L + - first: + 4: 400150 + second: IndexFinger3_R + - first: + 4: 400152 + second: IndexFinger4_L + - first: + 4: 400154 + second: IndexFinger4_R + - first: + 4: 400156 + second: Jaw_M + - first: + 4: 400158 + second: JawEnd_M + - first: + 4: 400160 + second: joint10 + - first: + 4: 400162 + second: joint11 + - first: + 4: 400164 + second: joint12 + - first: + 4: 400166 + second: joint13 + - first: + 4: 400168 + second: joint14 + - first: + 4: 400170 + second: joint15 + - first: + 4: 400172 + second: joint16 + - first: + 4: 400174 + second: joint17 + - first: + 4: 400176 + second: joint18 + - first: + 4: 400178 + second: joint2 + - first: + 4: 400180 + second: joint21 + - first: + 4: 400182 + second: joint22 + - first: + 4: 400184 + second: joint23 + - first: + 4: 400186 + second: joint24 + - first: + 4: 400188 + second: joint25 + - first: + 4: 400190 + second: joint26 + - first: + 4: 400192 + second: joint27 + - first: + 4: 400194 + second: joint28 + - first: + 4: 400196 + second: joint29 + - first: + 4: 400198 + second: joint3 + - first: + 4: 400200 + second: joint30 + - first: + 4: 400202 + second: joint31 + - first: + 4: 400204 + second: joint32 + - first: + 4: 400206 + second: joint33 + - first: + 4: 400208 + second: joint34 + - first: + 4: 400210 + second: joint35 + - first: + 4: 400212 + second: joint36 + - first: + 4: 400214 + second: joint37 + - first: + 4: 400216 + second: joint38 + - first: + 4: 400218 + second: joint39 + - first: + 4: 400220 + second: joint4 + - first: + 4: 400222 + second: joint40 + - first: + 4: 400224 + second: joint41 + - first: + 4: 400226 + second: joint42 + - first: + 4: 400228 + second: joint43 + - first: + 4: 400230 + second: joint44 + - first: + 4: 400232 + second: joint45 + - first: + 4: 400234 + second: joint46 + - first: + 4: 400236 + second: joint47 + - first: + 4: 400238 + second: joint5 + - first: + 4: 400240 + second: joint6 + - first: + 4: 400242 + second: joint7 + - first: + 4: 400244 + second: joint8 + - first: + 4: 400246 + second: joint9 + - first: + 4: 400248 + second: Knee_L + - first: + 4: 400250 + second: Knee_R + - first: + 4: 400252 + second: Main + - first: + 4: 400254 + second: MiddleFinger1_L + - first: + 4: 400256 + second: MiddleFinger1_R + - first: + 4: 400258 + second: MiddleFinger2_L + - first: + 4: 400260 + second: MiddleFinger2_R + - first: + 4: 400262 + second: MiddleFinger3_L + - first: + 4: 400264 + second: MiddleFinger3_R + - first: + 4: 400266 + second: MiddleFinger4_L + - first: + 4: 400268 + second: MiddleFinger4_R + - first: + 4: 400270 + second: MotionSystem + - first: + 4: 400272 + second: nurbsCircle1 + - first: + 4: 400274 + second: nurbsCircle10 + - first: + 4: 400276 + second: nurbsCircle11 + - first: + 4: 400278 + second: nurbsCircle12 + - first: + 4: 400280 + second: nurbsCircle13 + - first: + 4: 400282 + second: nurbsCircle14 + - first: + 4: 400284 + second: nurbsCircle15 + - first: + 4: 400286 + second: nurbsCircle17 + - first: + 4: 400288 + second: nurbsCircle19 + - first: + 4: 400290 + second: nurbsCircle2 + - first: + 4: 400292 + second: nurbsCircle21 + - first: + 4: 400294 + second: nurbsCircle23 + - first: + 4: 400296 + second: nurbsCircle25 + - first: + 4: 400298 + second: nurbsCircle27 + - first: + 4: 400300 + second: nurbsCircle28 + - first: + 4: 400302 + second: nurbsCircle29 + - first: + 4: 400304 + second: nurbsCircle3 + - first: + 4: 400306 + second: nurbsCircle31 + - first: + 4: 400308 + second: nurbsCircle32 + - first: + 4: 400310 + second: nurbsCircle33 + - first: + 4: 400312 + second: nurbsCircle35 + - first: + 4: 400314 + second: nurbsCircle37 + - first: + 4: 400316 + second: nurbsCircle38 + - first: + 4: 400318 + second: nurbsCircle4 + - first: + 4: 400320 + second: nurbsCircle40 + - first: + 4: 400322 + second: nurbsCircle41 + - first: + 4: 400324 + second: nurbsCircle42 + - first: + 4: 400326 + second: nurbsCircle5 + - first: + 4: 400328 + second: nurbsCircle7 + - first: + 4: 400330 + second: nurbsCircle8 + - first: + 4: 400332 + second: nurbsCircle9 + - first: + 4: 400334 + second: PinkyFinger1_L + - first: + 4: 400336 + second: PinkyFinger1_R + - first: + 4: 400338 + second: PinkyFinger2_L + - first: + 4: 400340 + second: PinkyFinger2_R + - first: + 4: 400342 + second: PinkyFinger3_L + - first: + 4: 400344 + second: PinkyFinger3_R + - first: + 4: 400346 + second: PinkyFinger4_L + - first: + 4: 400348 + second: PinkyFinger4_R + - first: + 4: 400350 + second: RingFinger1_L + - first: + 4: 400352 + second: RingFinger1_R + - first: + 4: 400354 + second: RingFinger2_L + - first: + 4: 400356 + second: RingFinger2_R + - first: + 4: 400358 + second: RingFinger3_L + - first: + 4: 400360 + second: RingFinger3_R + - first: + 4: 400362 + second: RingFinger4_L + - first: + 4: 400364 + second: RingFinger4_R + - first: + 4: 400366 + second: Sad + - first: + 4: 400368 + second: sap + - first: + 4: 400370 + second: Scapula_L + - first: + 4: 400372 + second: Scapula_R + - first: + 4: 400374 + second: Shoulder_L + - first: + 4: 400376 + second: Shoulder_R + - first: + 4: 400378 + second: Skirt_La + - first: + 4: 400380 + second: Skirt_Ra + - first: + 4: 400382 + second: SkirtLb + - first: + 4: 400384 + second: SkirtLc + - first: + 4: 400386 + second: SkirtRb + - first: + 4: 400388 + second: SkirtRc + - first: + 4: 400390 + second: Smile2 + - first: + 4: 400392 + second: ThumbFinger1_L + - first: + 4: 400394 + second: ThumbFinger1_R + - first: + 4: 400396 + second: ThumbFinger2_L + - first: + 4: 400398 + second: ThumbFinger2_R + - first: + 4: 400400 + second: ThumbFinger3_L + - first: + 4: 400402 + second: ThumbFinger3_R + - first: + 4: 400404 + second: ThumbFinger4_L + - first: + 4: 400406 + second: ThumbFinger4_R + - first: + 4: 400408 + second: Toes_L + - first: + 4: 400410 + second: Toes_R + - first: + 4: 400412 + second: ToesEnd_L + - first: + 4: 400414 + second: ToesEnd_R + - first: + 4: 400416 + second: Wrist_L + - first: + 4: 400418 + second: Wrist_R + - first: + 23: 2300000 + second: Brow + - first: + 23: 2300002 + second: cheek + - first: + 23: 2300004 + second: Eye + - first: + 23: 2300006 + second: Eye_base + - first: + 23: 2300008 + second: Face_A + - first: + 23: 2300010 + second: FaceB + - first: + 23: 2300012 + second: Lash + - first: + 33: 3300000 + second: Brow + - first: + 33: 3300002 + second: cheek + - first: + 33: 3300004 + second: Eye + - first: + 33: 3300006 + second: Eye_base + - first: + 33: 3300008 + second: Face_A + - first: + 33: 3300010 + second: FaceB + - first: + 33: 3300012 + second: Lash + - first: + 43: 4300000 + second: FaceB + - first: + 43: 4300002 + second: Lash + - first: + 43: 4300004 + second: Face_A + - first: + 43: 4300006 + second: Eye_base + - first: + 43: 4300008 + second: Eye + - first: + 43: 4300010 + second: cheek + - first: + 43: 4300012 + second: Brow + - first: + 74: 7400000 + second: Face_SmileA + - first: + 95: 9500000 + second: //RootNode + - first: + 137: 13700000 + second: Brow + - first: + 137: 13700002 + second: Eye + - first: + 137: 13700004 + second: Face_A + - first: + 137: 13700006 + second: FaceB + - first: + 137: 13700008 + second: Lash + - first: + 41386430: 2186277476908879412 + second: ImportLogs externalObjects: {} materials: - importMaterials: 0 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 0 @@ -463,11 +1361,12 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: "Copied Avatar Rig Configuration mis-match. Bone length in - copied configuration does not match position in animation file:\n\t'Hip_L' : - position error = 10.547441 mm\n\t'Ankle_L' : position error = 2.049482 mm\n" + copied configuration does not match position in animation file:\n\t'Hip_L' + : position error = 10.547441 mm\n\t'Ankle_L' : position error = 2.049482 mm\n" animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -485,6 +1384,7 @@ ModelImporter: - serializedVersion: 16 name: Face_SmileA takeName: Aki@Face_SmileA + internalID: 0 firstFrame: 2000.9999 lastFrame: 2050 wrapMode: 0 @@ -842,32 +1742,49 @@ ModelImporter: globalScale: 13 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 0 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: - boneName: Root_M humanName: Hips @@ -2108,15 +3025,20 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 13 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: dd4fe296533713342b6bc2ebe4faedbd, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Res_Addr/Animations/pcanim_bluntshield.controller b/Assets/Res_Addr/Animations/pcanim_bluntshield.controller index 7b764cb89..24344b436 100644 --- a/Assets/Res_Addr/Animations/pcanim_bluntshield.controller +++ b/Assets/Res_Addr/Animations/pcanim_bluntshield.controller @@ -438,7 +438,7 @@ AnimatorController: m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 + m_DefaultBool: 1 m_Controller: {fileID: 9100000} - m_Name: emo2 m_Type: 9 diff --git a/Assets/Script/Character/PC/PCUIActor.cs b/Assets/Script/Character/PC/PCUIActor.cs index e665ae2ee..5c7bdfb1a 100644 --- a/Assets/Script/Character/PC/PCUIActor.cs +++ b/Assets/Script/Character/PC/PCUIActor.cs @@ -1,30 +1,11 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; public class PCUIActor : MonoBehaviour { - public void Set() - { - Play_UIAttack(); - } + public Transform tf_Head; - private void OnEnable() + public void Set(int costumeid) { - Play_UIAttack(); - } - void Play_UIAttack() - { - if (gameObject.activeInHierarchy) - StartCoroutine(Co_UIAttack()); - } - - IEnumerator Co_UIAttack() - { - var anim = GetComponent(); - anim.Play("uiattack"); - yield return new WaitForSeconds(anim["uiattack"].length); - anim.Play("idle"); } }