Compare commits
No commits in common. "c13f73903bd436656b66406b3f752703011e4e74" and "2da0d866885515b2d11f003f7af32f4dd7be7196" have entirely different histories.
c13f73903b
...
2da0d86688
@ -149,7 +149,6 @@
|
|||||||
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
|
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF.shader" />
|
||||||
<None Include="Assets\Shaders\UVGlow.shader" />
|
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile SSD.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile SSD.shader" />
|
||||||
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
|
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMPro_Properties.cginc" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMPro_Properties.cginc" />
|
||||||
|
|||||||
@ -37,7 +37,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: {x: 1, y: 1, z: 1}
|
value: {x: 1, y: 1, z: 0.005}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
@ -208,7 +208,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 1
|
value: 0.005
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
|
|||||||
@ -64,7 +64,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: {x: 1, y: 1, z: 1}
|
value: {x: 1, y: 1, z: 0.005}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
@ -93,14 +93,14 @@ AnimationClip:
|
|||||||
time: 2.6166666
|
time: 2.6166666
|
||||||
value: {x: 1.35, y: 1.35, z: 1}
|
value: {x: 1.35, y: 1.35, z: 1}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: Infinity, y: Infinity, z: 0}
|
outSlope: {x: Infinity, y: Infinity, z: Infinity}
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 5
|
time: 5
|
||||||
value: {x: 1, y: 1, z: 1}
|
value: {x: 1, y: 1, z: 0.005}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
@ -111,46 +111,7 @@ AnimationClip:
|
|||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
path: SM_StaticEffect
|
path: SM_StaticEffect
|
||||||
m_FloatCurves:
|
m_FloatCurves: []
|
||||||
- serializedVersion: 2
|
|
||||||
curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 1.5
|
|
||||||
value: 1
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 5
|
|
||||||
value: 0
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_IsActive
|
|
||||||
path: SM_StaticEffect
|
|
||||||
classID: 1
|
|
||||||
script: {fileID: 0}
|
|
||||||
flags: 0
|
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
@ -177,15 +138,6 @@ AnimationClip:
|
|||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
isIntCurve: 0
|
isIntCurve: 0
|
||||||
isSerializeReferenceCurve: 0
|
isSerializeReferenceCurve: 0
|
||||||
- serializedVersion: 2
|
|
||||||
path: 1930323159
|
|
||||||
attribute: 2086281974
|
|
||||||
script: {fileID: 0}
|
|
||||||
typeID: 1
|
|
||||||
customType: 0
|
|
||||||
isPPtrCurve: 0
|
|
||||||
isIntCurve: 0
|
|
||||||
isSerializeReferenceCurve: 0
|
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@ -214,7 +166,7 @@ AnimationClip:
|
|||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0
|
time: 0
|
||||||
value: 1
|
value: 0.005
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: Infinity
|
outSlope: Infinity
|
||||||
tangentMode: 97
|
tangentMode: 97
|
||||||
@ -248,6 +200,15 @@ AnimationClip:
|
|||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 5
|
||||||
|
value: 0.005
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
@ -496,45 +457,6 @@ AnimationClip:
|
|||||||
classID: 4
|
classID: 4
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 8
|
flags: 8
|
||||||
- serializedVersion: 2
|
|
||||||
curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 1.5
|
|
||||||
value: 1
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 5
|
|
||||||
value: 0
|
|
||||||
inSlope: Infinity
|
|
||||||
outSlope: Infinity
|
|
||||||
tangentMode: 103
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0
|
|
||||||
outWeight: 0
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_IsActive
|
|
||||||
path: SM_StaticEffect
|
|
||||||
classID: 1
|
|
||||||
script: {fileID: 0}
|
|
||||||
flags: 0
|
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 0
|
m_HasGenericRootTransform: 0
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
|
|||||||
@ -1,95 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!21 &2100000
|
|
||||||
Material:
|
|
||||||
serializedVersion: 8
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: M_UVNeon
|
|
||||||
m_Shader: {fileID: 4800000, guid: 68bb4901ce4fd904ba3b7c99b826e57d, type: 3}
|
|
||||||
m_Parent: {fileID: 0}
|
|
||||||
m_ModifiedSerializedProperties: 0
|
|
||||||
m_ValidKeywords:
|
|
||||||
- _EMISSION
|
|
||||||
- _ENABLE_GEOMETRIC_SPECULAR_AA
|
|
||||||
- _GLOSSYREFLECTIONS_OFF
|
|
||||||
- _SPECULARHIGHLIGHTS_OFF
|
|
||||||
m_InvalidKeywords: []
|
|
||||||
m_LightmapFlags: 0
|
|
||||||
m_EnableInstancingVariants: 1
|
|
||||||
m_DoubleSidedGI: 0
|
|
||||||
m_CustomRenderQueue: -1
|
|
||||||
stringTagMap: {}
|
|
||||||
disabledShaderPasses: []
|
|
||||||
m_LockedProperties:
|
|
||||||
m_SavedProperties:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_TexEnvs:
|
|
||||||
- _BumpMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _DetailAlbedoMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _DetailMask:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _DetailNormalMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _EmissionMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _MainTex:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _MetallicGlossMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _OcclusionMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _ParallaxMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
m_Ints: []
|
|
||||||
m_Floats:
|
|
||||||
- _Bicubic: 0
|
|
||||||
- _BumpScale: 1
|
|
||||||
- _Cutoff: 0.5
|
|
||||||
- _DetailNormalMapScale: 1
|
|
||||||
- _DstBlend: 0
|
|
||||||
- _EnableGeometricSpecularAA: 1
|
|
||||||
- _GlossMapScale: 1
|
|
||||||
- _Glossiness: 1
|
|
||||||
- _GlossyReflections: 0
|
|
||||||
- _LightmapType: 0
|
|
||||||
- _Metallic: 0
|
|
||||||
- _Mode: 0
|
|
||||||
- _OcclusionStrength: 1
|
|
||||||
- _Parallax: 0.02
|
|
||||||
- _SmoothnessTextureChannel: 0
|
|
||||||
- _SpecularAAScreenSpaceVariance: 0.1
|
|
||||||
- _SpecularAAThreshold: 0.2
|
|
||||||
- _SpecularHighlights: 0
|
|
||||||
- _SrcBlend: 1
|
|
||||||
- _UVSec: 0
|
|
||||||
- _ZWrite: 1
|
|
||||||
m_Colors:
|
|
||||||
- _Color: {r: 0, g: 0, b: 0, a: 1}
|
|
||||||
- _Colour1: {r: 0, g: 0, b: 0, a: 1}
|
|
||||||
- _Colour2: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
- _Emission: {r: 1, g: 0, b: 0, a: 1}
|
|
||||||
- _EmissionColor: {r: 8, g: 0, b: 0, a: 1}
|
|
||||||
m_BuildTextureStacks: []
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: b4ebc3728120eee449696f9b988eebcb
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 2100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -27,5 +27,5 @@ Material:
|
|||||||
m_Ints: []
|
m_Ints: []
|
||||||
m_Floats: []
|
m_Floats: []
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 1}
|
- _Color: {r: 0, g: 0, b: 0, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
Binary file not shown.
@ -15,7 +15,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!4 &6417972481979237589
|
--- !u!4 &6417972481979237589
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -134,6 +134,7 @@ MonoBehaviour:
|
|||||||
SerializationNodes: []
|
SerializationNodes: []
|
||||||
_udonSharpBackingUdonBehaviour: {fileID: 932720169245821887}
|
_udonSharpBackingUdonBehaviour: {fileID: 932720169245821887}
|
||||||
_ModemActivationObject: {fileID: 497488136702045868}
|
_ModemActivationObject: {fileID: 497488136702045868}
|
||||||
|
_ModemTeleportEffect: {fileID: 5032756485913580084}
|
||||||
_ModemDestination: {fileID: 0}
|
_ModemDestination: {fileID: 0}
|
||||||
_AudioManager: {fileID: 0}
|
_AudioManager: {fileID: 0}
|
||||||
_ModemAnimator: {fileID: 0}
|
_ModemAnimator: {fileID: 0}
|
||||||
@ -250,13 +251,19 @@ PrefabInstance:
|
|||||||
- target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
|
- target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 21f939804f0f9c742b2f0205797b740b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 21f939804f0f9c742b2f0205797b740b, type: 3}
|
||||||
|
--- !u!1 &5032756485913580084 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 5266564533062807397}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!4 &5664439777900644494 stripped
|
--- !u!4 &5664439777900644494 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
|
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,78 +0,0 @@
|
|||||||
// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
|
|
||||||
|
|
||||||
// Simplified Diffuse shader. Differences from regular Diffuse one:
|
|
||||||
// - no Main Color
|
|
||||||
// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH.
|
|
||||||
|
|
||||||
Shader "Carmen/UVGlow"
|
|
||||||
{
|
|
||||||
Properties
|
|
||||||
{
|
|
||||||
}
|
|
||||||
SubShader
|
|
||||||
{
|
|
||||||
Tags { "RenderType"="Opaque" }
|
|
||||||
LOD 200
|
|
||||||
|
|
||||||
Pass {
|
|
||||||
Cull Off
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
|
|
||||||
#pragma vertex vert
|
|
||||||
#pragma fragment frag
|
|
||||||
|
|
||||||
sampler2D _MainTex;
|
|
||||||
float4 _MainTex_ST;
|
|
||||||
|
|
||||||
CBUFFER_START(UnityPerMaterial)
|
|
||||||
uniform float4 _Emission;
|
|
||||||
CBUFFER_END
|
|
||||||
|
|
||||||
struct Data
|
|
||||||
{
|
|
||||||
float4 vertex : POSITION;
|
|
||||||
float2 uv : TEXCOORD0;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct V2F
|
|
||||||
{
|
|
||||||
float2 uv : TEXCOORD0;
|
|
||||||
float4 position : SV_POSITION;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
float3 Hue(float H)
|
|
||||||
{
|
|
||||||
return saturate(
|
|
||||||
float3(abs(H * 6 - 3) - 1,
|
|
||||||
2 - abs(H * 6 - 2),
|
|
||||||
2 - abs(H * 6 - 4)));
|
|
||||||
}
|
|
||||||
|
|
||||||
float4 HSVtoRGB(in float3 HSV)
|
|
||||||
{
|
|
||||||
return float4(((Hue(HSV.x) - 1) * HSV.y + 1) * HSV.z, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
V2F vert(Data v)
|
|
||||||
{
|
|
||||||
V2F o;
|
|
||||||
o.uv = TRANSFORM_TEX(v.uv, _MainTex);
|
|
||||||
o.position = UnityObjectToClipPos(v.vertex);
|
|
||||||
return o;
|
|
||||||
}
|
|
||||||
|
|
||||||
fixed4 frag(V2F i) : SV_TARGET
|
|
||||||
{
|
|
||||||
return HSVtoRGB(float3(i.uv.x, 1.0, 1.0)) * (i.uv.y * 100.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
ENDCG
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FallBack "VRChat/Mobile/Standard Lite"
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 68bb4901ce4fd904ba3b7c99b826e57d
|
|
||||||
ShaderImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
defaultTextures: []
|
|
||||||
nonModifiableTextures: []
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -417,7 +417,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
|
|||||||
|
|
||||||
public override void OnVideoEnd()
|
public override void OnVideoEnd()
|
||||||
{
|
{
|
||||||
_SwapToScreen(ClueScreenType.Blank, false);
|
PlayVideo = false;
|
||||||
|
ShowScreen = ClueScreenType.Blank;
|
||||||
|
|
||||||
base.OnVideoEnd();
|
base.OnVideoEnd();
|
||||||
}
|
}
|
||||||
@ -442,7 +443,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void _SwapToScreen(ClueScreenType Screen, bool StopAllVideos = true)
|
private void _SwapToScreen(ClueScreenType Screen)
|
||||||
{
|
{
|
||||||
if (ShowScreen == Screen) return;
|
if (ShowScreen == Screen) return;
|
||||||
|
|
||||||
@ -454,7 +455,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
|
|||||||
_VideoScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
_VideoScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
||||||
_MapScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
_MapScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
||||||
|
|
||||||
if (StopAllVideos) PlayVideo = false;
|
PlayVideo = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ClueScreenType.Video:
|
case ClueScreenType.Video:
|
||||||
@ -470,7 +471,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
|
|||||||
_VideoScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
_VideoScreenMesh.transform.localPosition = new Vector3(0.0f, -1000.0f, 0.0f);
|
||||||
_MapScreenMesh.transform.localPosition = new Vector3(0.0f, 0.0f, 0.0f);
|
_MapScreenMesh.transform.localPosition = new Vector3(0.0f, 0.0f, 0.0f);
|
||||||
|
|
||||||
if (StopAllVideos) PlayVideo = false;
|
PlayVideo = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,7 +44,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 8
|
Data: 9
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data:
|
Data:
|
||||||
@ -236,16 +236,70 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: $k
|
- Name: $k
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _ModemDestination
|
Data: _ModemTeleportEffect
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
|
- Name: <Name>k__BackingField
|
||||||
|
Entry: 1
|
||||||
|
Data: _ModemTeleportEffect
|
||||||
|
- Name: <UserType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 12
|
||||||
|
- Name: <SystemType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 12
|
||||||
|
- Name: <SyncMode>k__BackingField
|
||||||
|
Entry: 7
|
||||||
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 6
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name: <IsSerialized>k__BackingField
|
||||||
|
Entry: 5
|
||||||
|
Data: true
|
||||||
|
- Name: _fieldAttributes
|
||||||
|
Entry: 7
|
||||||
|
Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 12
|
||||||
|
Data: 1
|
||||||
|
- Name:
|
||||||
|
Entry: 7
|
||||||
|
Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 13
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 7
|
||||||
|
Data:
|
||||||
|
- Name: $k
|
||||||
|
Entry: 1
|
||||||
|
Data: _ModemDestination
|
||||||
|
- Name: $v
|
||||||
|
Entry: 7
|
||||||
|
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _ModemDestination
|
Data: _ModemDestination
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 16|System.RuntimeType, mscorlib
|
Data: 19|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: Modem, Assembly-CSharp
|
Data: Modem, Assembly-CSharp
|
||||||
@ -254,7 +308,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <SystemType>k__BackingField
|
- Name: <SystemType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 17|System.RuntimeType, mscorlib
|
Data: 20|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: VRC.Udon.UdonBehaviour, VRC.Udon
|
Data: VRC.Udon.UdonBehaviour, VRC.Udon
|
||||||
@ -275,13 +329,13 @@ MonoBehaviour:
|
|||||||
Data: true
|
Data: true
|
||||||
- Name: _fieldAttributes
|
- Name: _fieldAttributes
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 1
|
Data: 1
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
|
Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 8
|
Entry: 8
|
||||||
Data:
|
Data:
|
||||||
@ -305,13 +359,13 @@ MonoBehaviour:
|
|||||||
Data: _AudioManager
|
Data: _AudioManager
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _AudioManager
|
Data: _AudioManager
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 21|System.RuntimeType, mscorlib
|
Data: 24|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: AudioManager, Assembly-CSharp
|
Data: AudioManager, Assembly-CSharp
|
||||||
@ -320,7 +374,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <SystemType>k__BackingField
|
- Name: <SystemType>k__BackingField
|
||||||
Entry: 9
|
Entry: 9
|
||||||
Data: 17
|
Data: 20
|
||||||
- Name: <SyncMode>k__BackingField
|
- Name: <SyncMode>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
@ -335,13 +389,13 @@ MonoBehaviour:
|
|||||||
Data: true
|
Data: true
|
||||||
- Name: _fieldAttributes
|
- Name: _fieldAttributes
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 2
|
Data: 2
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||||
- Name: height
|
- Name: height
|
||||||
Entry: 4
|
Entry: 4
|
||||||
Data: 8
|
Data: 8
|
||||||
@ -350,7 +404,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule
|
Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 8
|
Entry: 8
|
||||||
Data:
|
Data:
|
||||||
@ -374,13 +428,13 @@ MonoBehaviour:
|
|||||||
Data: _ModemAnimator
|
Data: _ModemAnimator
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _ModemAnimator
|
Data: _ModemAnimator
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 26|System.RuntimeType, mscorlib
|
Data: 29|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||||
@ -389,61 +443,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <SystemType>k__BackingField
|
- Name: <SystemType>k__BackingField
|
||||||
Entry: 9
|
Entry: 9
|
||||||
Data: 26
|
Data: 29
|
||||||
- Name: <SyncMode>k__BackingField
|
|
||||||
Entry: 7
|
|
||||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
|
||||||
- Name:
|
|
||||||
Entry: 6
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 8
|
|
||||||
Data:
|
|
||||||
- Name: <IsSerialized>k__BackingField
|
|
||||||
Entry: 5
|
|
||||||
Data: true
|
|
||||||
- Name: _fieldAttributes
|
|
||||||
Entry: 7
|
|
||||||
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
|
||||||
- Name:
|
|
||||||
Entry: 12
|
|
||||||
Data: 1
|
|
||||||
- Name:
|
|
||||||
Entry: 7
|
|
||||||
Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule
|
|
||||||
- Name:
|
|
||||||
Entry: 8
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 13
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 8
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 8
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 8
|
|
||||||
Data:
|
|
||||||
- Name:
|
|
||||||
Entry: 7
|
|
||||||
Data:
|
|
||||||
- Name: $k
|
|
||||||
Entry: 1
|
|
||||||
Data: _ModemDestinationAnimator
|
|
||||||
- Name: $v
|
|
||||||
Entry: 7
|
|
||||||
Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
|
||||||
- Name: <Name>k__BackingField
|
|
||||||
Entry: 1
|
|
||||||
Data: _ModemDestinationAnimator
|
|
||||||
- Name: <UserType>k__BackingField
|
|
||||||
Entry: 9
|
|
||||||
Data: 26
|
|
||||||
- Name: <SystemType>k__BackingField
|
|
||||||
Entry: 9
|
|
||||||
Data: 26
|
|
||||||
- Name: <SyncMode>k__BackingField
|
- Name: <SyncMode>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
@ -485,16 +485,70 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: $k
|
- Name: $k
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _EnteredPlayers
|
Data: _ModemDestinationAnimator
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
|
- Name: <Name>k__BackingField
|
||||||
|
Entry: 1
|
||||||
|
Data: _ModemDestinationAnimator
|
||||||
|
- Name: <UserType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 29
|
||||||
|
- Name: <SystemType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 29
|
||||||
|
- Name: <SyncMode>k__BackingField
|
||||||
|
Entry: 7
|
||||||
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 6
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name: <IsSerialized>k__BackingField
|
||||||
|
Entry: 5
|
||||||
|
Data: true
|
||||||
|
- Name: _fieldAttributes
|
||||||
|
Entry: 7
|
||||||
|
Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 12
|
||||||
|
Data: 1
|
||||||
|
- Name:
|
||||||
|
Entry: 7
|
||||||
|
Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 13
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 7
|
||||||
|
Data:
|
||||||
|
- Name: $k
|
||||||
|
Entry: 1
|
||||||
|
Data: _EnteredPlayers
|
||||||
|
- Name: $v
|
||||||
|
Entry: 7
|
||||||
|
Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _EnteredPlayers
|
Data: _EnteredPlayers
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 33|System.RuntimeType, mscorlib
|
Data: 36|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: System.String[], mscorlib
|
Data: System.String[], mscorlib
|
||||||
@ -503,7 +557,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <SystemType>k__BackingField
|
- Name: <SystemType>k__BackingField
|
||||||
Entry: 9
|
Entry: 9
|
||||||
Data: 33
|
Data: 36
|
||||||
- Name: <SyncMode>k__BackingField
|
- Name: <SyncMode>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
@ -518,13 +572,13 @@ MonoBehaviour:
|
|||||||
Data: false
|
Data: false
|
||||||
- Name: _fieldAttributes
|
- Name: _fieldAttributes
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 1
|
Data: 1
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 8
|
Entry: 8
|
||||||
Data:
|
Data:
|
||||||
|
|||||||
@ -13,6 +13,7 @@ public class Modem : UdonSharpBehaviour
|
|||||||
[UdonSynced, FieldChangeCallback(nameof(BeginTeleport))] private bool _BeginTeleport = false;
|
[UdonSynced, FieldChangeCallback(nameof(BeginTeleport))] private bool _BeginTeleport = false;
|
||||||
|
|
||||||
[SerializeField] private GameObject _ModemActivationObject;
|
[SerializeField] private GameObject _ModemActivationObject;
|
||||||
|
[SerializeField] private GameObject _ModemTeleportEffect;
|
||||||
[SerializeField] private Modem _ModemDestination;
|
[SerializeField] private Modem _ModemDestination;
|
||||||
|
|
||||||
[Space]
|
[Space]
|
||||||
@ -138,6 +139,7 @@ public class Modem : UdonSharpBehaviour
|
|||||||
{
|
{
|
||||||
_ActivateModem = value;
|
_ActivateModem = value;
|
||||||
_ModemActivationObject.SetActive(_ActivateModem);
|
_ModemActivationObject.SetActive(_ActivateModem);
|
||||||
|
_ModemTeleportEffect.SetActive(_ActivateModem);
|
||||||
}
|
}
|
||||||
get => _ActivateModem;
|
get => _ActivateModem;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user