Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1cb697895e | |||
| 33ce30f1cd |
@@ -121,25 +121,6 @@ NavMeshSettings:
|
|||||||
debug:
|
debug:
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
--- !u!1 &1225456327 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 3879199596957987718, guid: 740597e7089a21d45a1319a929d4a6fd,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 1352860386}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!114 &1225456328
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1225456327}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 229740497, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
contentType: 0
|
|
||||||
--- !u!1 &1253151849
|
--- !u!1 &1253151849
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -210,73 +210,73 @@ AnimatorController:
|
|||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: VRCFaceBlendH
|
- m_Name: VRCFaceBlendH
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: VRCFaceBlendV
|
- m_Name: VRCFaceBlendV
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: VRCEmote
|
- m_Name: VRCEmote
|
||||||
m_Type: 3
|
m_Type: 3
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: GestureLeft
|
- m_Name: GestureLeft
|
||||||
m_Type: 3
|
m_Type: 3
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: GestureRight
|
- m_Name: GestureRight
|
||||||
m_Type: 3
|
m_Type: 3
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: GestureLeftWeight
|
- m_Name: GestureLeftWeight
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: GestureRightWeight
|
- m_Name: GestureRightWeight
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: NegiL
|
- m_Name: NegiL
|
||||||
m_Type: 4
|
m_Type: 4
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: NegiR
|
- m_Name: NegiR
|
||||||
m_Type: 4
|
m_Type: 4
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: Viseme
|
- m_Name: Viseme
|
||||||
m_Type: 3
|
m_Type: 3
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: Collider
|
- m_Name: Collider
|
||||||
m_Type: 4
|
m_Type: 4
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
- serializedVersion: 5
|
- serializedVersion: 5
|
||||||
m_Name: Default
|
m_Name: Default
|
||||||
@@ -2591,7 +2591,7 @@ AnimatorState:
|
|||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
m_WriteDefaultValues: 0
|
m_WriteDefaultValues: 1
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
@@ -2644,7 +2644,7 @@ AnimatorState:
|
|||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
m_WriteDefaultValues: 0
|
m_WriteDefaultValues: 1
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
@@ -2870,7 +2870,7 @@ AnimatorState:
|
|||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
m_WriteDefaultValues: 0
|
m_WriteDefaultValues: 1
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
@@ -3005,7 +3005,7 @@ AnimatorState:
|
|||||||
- {fileID: -2345005783867971587}
|
- {fileID: -2345005783867971587}
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
m_WriteDefaultValues: 0
|
m_WriteDefaultValues: 1
|
||||||
m_Mirror: 0
|
m_Mirror: 0
|
||||||
m_SpeedParameterActive: 0
|
m_SpeedParameterActive: 0
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
@@ -3181,7 +3181,7 @@ AnimatorStateMachine:
|
|||||||
m_ChildStates:
|
m_ChildStates:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102501015888213112}
|
m_State: {fileID: 1102501015888213112}
|
||||||
m_Position: {x: 264, y: 108, z: 0}
|
m_Position: {x: 260, y: 110, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102710260805419016}
|
m_State: {fileID: 1102710260805419016}
|
||||||
m_Position: {x: 260, y: 60, z: 0}
|
m_Position: {x: 260, y: 60, z: 0}
|
||||||
@@ -3214,10 +3214,10 @@ AnimatorStateMachine:
|
|||||||
m_Position: {x: 250, y: 0, z: 0}
|
m_Position: {x: 250, y: 0, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102043934929588874}
|
m_State: {fileID: 1102043934929588874}
|
||||||
m_Position: {x: 444, y: 108, z: 0}
|
m_Position: {x: 440, y: 110, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102267413919561022}
|
m_State: {fileID: 1102267413919561022}
|
||||||
m_Position: {x: 444, y: 156, z: 0}
|
m_Position: {x: 440, y: 160, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102322072613105370}
|
m_State: {fileID: 1102322072613105370}
|
||||||
m_Position: {x: 444, y: 204, z: 0}
|
m_Position: {x: 444, y: 204, z: 0}
|
||||||
@@ -3379,7 +3379,7 @@ AnimatorStateMachine:
|
|||||||
m_ChildStates:
|
m_ChildStates:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -8469556962929076888}
|
m_State: {fileID: -8469556962929076888}
|
||||||
m_Position: {x: 359, y: 143, z: 0}
|
m_Position: {x: 360, y: 140, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -7108868774300807807}
|
m_State: {fileID: -7108868774300807807}
|
||||||
m_Position: {x: 360, y: 60, z: 0}
|
m_Position: {x: 360, y: 60, z: 0}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Body
|
m_Name: Body
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: a5ae7f40ac53e274ea0bc1262e1f6895, type: 3}
|
||||||
m_ShaderKeywords: _TL_ENABLE
|
m_ShaderKeywords: _TL_ENABLE
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Costume
|
m_Name: Costume
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: a5ae7f40ac53e274ea0bc1262e1f6895, type: 3}
|
||||||
m_ShaderKeywords: _BK_ENABLE _ES_ENABLE _TL_ENABLE
|
m_ShaderKeywords: _BK_ENABLE _ES_ENABLE _TL_ENABLE
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Eye
|
m_Name: Eye
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: 2efe527cfcbf0e1408b67463225f552f, type: 3}
|
||||||
m_ShaderKeywords:
|
m_ShaderKeywords:
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2449
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Hair
|
m_Name: Hair
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: a5ae7f40ac53e274ea0bc1262e1f6895, type: 3}
|
||||||
m_ShaderKeywords: _BK_ENABLE _TL_ENABLE
|
m_ShaderKeywords: _BK_ENABLE _TL_ENABLE
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2000
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: HairF
|
m_Name: HairF
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: 9350854c6e88f3f4eb873d2f94ff3328, type: 3}
|
||||||
m_ShaderKeywords: _BK_ENABLE _TL_ENABLE
|
m_ShaderKeywords: _BK_ENABLE _TL_ENABLE
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2449
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Transparent
|
m_Name: Transparent
|
||||||
m_Shader: {fileID: 4800000, guid: affc81f3d164d734d8f13053effb1c5c, type: 3}
|
m_Shader: {fileID: 4800000, guid: 5523e041d29d259439fa14bd131f5c82, type: 3}
|
||||||
m_ShaderKeywords: _ES_ENABLE _TL_ENABLE
|
m_ShaderKeywords: _ES_ENABLE _TL_ENABLE
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2450
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
|||||||
@@ -319,6 +319,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Opaque" {
|
|||||||
"RenderType" = "Opaque"
|
"RenderType" = "Opaque"
|
||||||
"Queue" = "Geometry"
|
"Queue" = "Geometry"
|
||||||
"DisableBatching" = "True"
|
"DisableBatching" = "True"
|
||||||
|
"VRCFallback" = "Toon"
|
||||||
}
|
}
|
||||||
|
|
||||||
Pass {
|
Pass {
|
||||||
|
|||||||
@@ -334,6 +334,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent" {
|
|||||||
"RenderType" = "Transparent"
|
"RenderType" = "Transparent"
|
||||||
"Queue" = "Transparent"
|
"Queue" = "Transparent"
|
||||||
"DisableBatching" = "True"
|
"DisableBatching" = "True"
|
||||||
|
"VRCFallback" = "Toon"
|
||||||
}
|
}
|
||||||
|
|
||||||
GrabPass { "_UnToonOutlineCancel" }
|
GrabPass { "_UnToonOutlineCancel" }
|
||||||
|
|||||||
@@ -338,6 +338,7 @@ Shader "UnlitWF/UnToon_Outline/WF_UnToon_Outline_Transparent_MaskOut" {
|
|||||||
"RenderType" = "Transparent"
|
"RenderType" = "Transparent"
|
||||||
"Queue" = "Transparent+1"
|
"Queue" = "Transparent+1"
|
||||||
"DisableBatching" = "True"
|
"DisableBatching" = "True"
|
||||||
|
"VRCFallback" = "Toon"
|
||||||
}
|
}
|
||||||
|
|
||||||
GrabPass { "_UnToonOutlineCancelLater" }
|
GrabPass { "_UnToonOutlineCancelLater" }
|
||||||
|
|||||||
@@ -308,6 +308,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" {
|
|||||||
Tags {
|
Tags {
|
||||||
"RenderType" = "Transparent"
|
"RenderType" = "Transparent"
|
||||||
"Queue" = "Transparent"
|
"Queue" = "Transparent"
|
||||||
|
"VRCFallback" = "Toon"
|
||||||
}
|
}
|
||||||
|
|
||||||
Pass {
|
Pass {
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ AudioManager:
|
|||||||
Default Speaker Mode: 2
|
Default Speaker Mode: 2
|
||||||
m_SampleRate: 48000
|
m_SampleRate: 48000
|
||||||
m_DSPBufferSize: 1024
|
m_DSPBufferSize: 1024
|
||||||
m_VirtualVoiceCount: 32
|
m_VirtualVoiceCount: 64
|
||||||
m_RealVoiceCount: 24
|
m_RealVoiceCount: 32
|
||||||
m_EnableOutputSuspension: 1
|
m_EnableOutputSuspension: 1
|
||||||
m_SpatializerPlugin:
|
m_SpatializerPlugin:
|
||||||
m_AmbisonicDecoderPlugin:
|
m_AmbisonicDecoderPlugin:
|
||||||
|
|||||||
Reference in New Issue
Block a user