24070-TheGreatTipsy
/
Unity-24070-Display
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

Browse Source
main
reng 2 months ago
parent 1f33a4be28
commit 4e0c8bf685
11 changed files with 857 additions and 680 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1262
      Assets/Fonts/NotoSansTC-Regular SDF.asset
  2. 82
      Assets/Fonts/NotoSerifTC-Regular SDF-Postcard.asset
  3. 84
      Assets/Fonts/NotoSerifTC-Regular SDF.asset
  4. 50
      Assets/Scenes/SampleScene.unity
  5. 23
      Assets/Scripts/OscHandler.cs
  6. 1
      Assets/Scripts/SetLightStrength.cs
  7. 6
      Assets/Scripts/UploadToGoogleDrive.cs
  8. 5
      Assets/Shaders/Material-light.mat
  9. 4
      Assets/Shaders/blur.shader
  10. 18
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
  11. 2
      Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user

1262
Assets/Fonts/NotoSansTC-Regular SDF.asset
View File

File diff suppressed because one or more lines are too long

82
Assets/Fonts/NotoSerifTC-Regular SDF-Postcard.asset
View File

File diff suppressed because one or more lines are too long

84
Assets/Fonts/NotoSerifTC-Regular SDF.asset
View File

File diff suppressed because one or more lines are too long

50
Assets/Scenes/SampleScene.unity
Unescape View File

@ -1167,8 +1167,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 122.5, y: 0}
m_SizeDelta: {x: 245, y: 0}
m_AnchoredPosition: {x: 123.75, y: 0}
m_SizeDelta: {x: 247.5, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &366298495
MonoBehaviour:
@ -3413,8 +3413,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 783.4286, y: -245}
m_SizeDelta: {x: 261.14288, y: 0}
m_AnchoredPosition: {x: 896.5715, y: -247.5}
m_SizeDelta: {x: 298.85715, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &696492449
MonoBehaviour:
@ -4069,8 +4069,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 163.2143, y: 0}
m_SizeDelta: {x: 245, y: 0}
m_AnchoredPosition: {x: 186.78572, y: 0}
m_SizeDelta: {x: 247.5, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &830016229
MonoBehaviour:
@ -4438,7 +4438,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1020432301
RectTransform:
m_ObjectHideFlags: 0
@ -4455,8 +4455,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 102}
m_SizeDelta: {x: 0, y: 50}
m_AnchoredPosition: {x: 0, y: 45}
m_SizeDelta: {x: -40, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1020432302
MonoBehaviour:
@ -4478,17 +4478,17 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 20250731-A-02
m_text: 601
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 9be227ebe9d11454dbc86faa54b27df8, type: 2}
m_sharedMaterial: {fileID: -6120210280381436959, guid: 9be227ebe9d11454dbc86faa54b27df8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
rgba: 4292269782
m_fontColor: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@ -4505,25 +4505,25 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 32
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterSpacing: 2.5
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacing: 66
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_overflowMode: 3
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
@ -4541,7 +4541,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: -0.4312693, y: 0.035682723, z: 1.5968323, w: -0.3304651}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@ -4765,8 +4765,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 122.5, y: 0}
m_SizeDelta: {x: 245, y: 0}
m_AnchoredPosition: {x: 123.75, y: 0}
m_SizeDelta: {x: 247.5, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1060364296
MonoBehaviour:
@ -6770,8 +6770,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 489.64288, y: 0}
m_SizeDelta: {x: 275.625, y: 0}
m_AnchoredPosition: {x: 560.3572, y: 0}
m_SizeDelta: {x: 278.4375, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1811530096
MonoBehaviour:

23
Assets/Scripts/OscHandler.cs
Unescape View File

@ -99,16 +99,16 @@ public class OscHandler : MonoBehaviour
{
elapsed += Time.deltaTime;
if (duration - elapsed > _lastDurationToShow)
{
mask.fillAmount = 0;
mask.gameObject.SetActive(false);
}
else
{
// if (duration - elapsed > _lastDurationToShow)
// {
// mask.fillAmount = 0;
// mask.gameObject.SetActive(false);
// }
// else
// {
mask.gameObject.SetActive(true);
mask.fillAmount = Mathf.Lerp(0f, 1f, (duration - elapsed) / _lastDurationToShow);
}
mask.fillAmount = Mathf.Lerp(0f, 1f, (duration - elapsed) / duration);
// }
yield return null;
}
@ -182,13 +182,16 @@ public class OscHandler : MonoBehaviour
if (mask != null)
{
if (coroutine_countdown != null) StopCoroutine(coroutine_countdown);
if (time == "0")
{
mask.fillAmount = 0f;
mask.gameObject.SetActive(false);
}
else
{
if (coroutine_countdown != null) StopCoroutine(coroutine_countdown);
coroutine_countdown = DecreaseFill(float.Parse(time));
StartCoroutine(coroutine_countdown);
}

1
Assets/Scripts/SetLightStrength.cs
Unescape View File

@ -66,6 +66,7 @@ public class SetLightStrength : MonoBehaviour
if (material != null)
{
material.SetFloat("_Strength", strength);
material.SetFloat("_AlphaCutoff", Mathf.Clamp01(strength));
}
}

6
Assets/Scripts/UploadToGoogleDrive.cs
Unescape View File

@ -73,6 +73,12 @@ public class UploadToGoogleDrive : MonoBehaviour
string uploadDest = parmas[0].Trim();
string id = parmas[1].Trim();
var id_paths = id.Split('/');
if (id_paths.Length > 0)
{
id = id_paths[id_paths.Length - 1];
}
string summary = parmas[2].Trim();
string filename = parmas.Length > 3 ? parmas[3].Trim() : System.DateTime.Now.ToString("yyyyMMdd_hhmmss");
bool discard = parmas.Length > 4 && (parmas[4].Trim().ToLower() == "discard");

5
Assets/Shaders/Material-light.mat
Unescape View File

@ -61,6 +61,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaCutoff: 0.044205
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
@ -78,7 +79,7 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Strength: 0
- _Strength: 0.044205
- _UVSec: 0
- _ZWrite: 1
m_Colors:
@ -87,5 +88,5 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _LightPosition: {r: 0.5, g: 1.25, b: 0, a: 0}
- _LightPostion: {r: 0.5, g: 1.25, b: 0, a: 0}
- _TopColor: {r: 1, g: 0.8584145, b: 0.58018863, a: 0.49803922}
- _TopColor: {r: 1, g: 0.8584145, b: 0.5801887, a: 0.49803922}
m_BuildTextureStacks: []

4
Assets/Shaders/blur.shader
Unescape View File

@ -12,6 +12,7 @@ Shader "Unlit/LightEffect"
_LightPosition("Light Position", Vector) = (0.5, 1.0, 0, 0)
_NoiseScale1("Noise Scale 1", Float) = 12.0
_NoiseScale2("Noise Scale 2", Float) = 2.0
_AlphaCutoff("Alpha Cutoff", Range(0,1)) = 0.0
}
SubShader
@ -48,6 +49,7 @@ Shader "Unlit/LightEffect"
float4 _LightPosition;
float _NoiseScale1;
float _NoiseScale2;
float _AlphaCutoff;
v2f vert(appdata v)
{
@ -120,6 +122,8 @@ Shader "Unlit/LightEffect"
float4 gradColor = _BottomColor*(1.0-t)+_TopColor*t;
// float4 texColor = tex2D(_MainTex, i.uv);
// return lerp(float4(0.0, 0.0, 0.0, 0.0), gradColor, _Strength);
gradColor.a*=_AlphaCutoff;
return gradColor;
// return gradColor;
}

18
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
Unescape View File

@ -11,8 +11,7 @@ Material:
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- GLOW_ON
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
@ -58,20 +57,22 @@ Material:
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0
- _FaceShininess: 0
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 1
- _GlowPower: 0.158
- _GlowPower: 1
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineShininess: 1
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0
- _OutlineWidth: 0.12
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.9
@ -93,19 +94,22 @@ Material:
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0
- _UseUIAlphaClip: 0
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 1, g: 1, b: 1, a: 0.5}
- _FaceColor: {r: 0, g: 0, b: 0, a: 1}
- _GlowColor: {r: 1, g: 0.15566039, b: 0.15566039, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: []

2
Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user
Unescape View File

@ -1 +1 @@
{"access_token":"ya29.a0AS3H6NyFVBEDi4XN5hswszzpP642SUWFSALfzA-Zn_xxA-BHd6sARV6_4xdwPOU6eq-FCYc-PTrMa1is1XXkuigjg66gluYqUdYgs3ai_mNgMY0q49nWBy9fE-jgH8F0lT9ZAaPyZomCnw-EKZZ2fmjvQIS3BsrtbLuBnXlaLlKz7smNPYn3oNzKxp6xDIZkFzRRBnhwaCgYKAWwSARESFQHGX2MitZVeQGetQ96x8A2Pd4z2_g0207","token_type":"Bearer","expires_in":3599,"refresh_token":"1//0e-urCtqMVSK6CgYIARAAGA4SNwF-L9IrTWfNUsKFuBn8-mJmQxbXhkBlRW8776bD9xuFk1rFTaMH0dA9yRyESXHTchyXJDAJgkU","scope":"https://www.googleapis.com/auth/drive","Issued":"2025-09-13T18:25:08.132+08:00","IssuedUtc":"2025-09-13T10:25:08.132Z"}
{"access_token":"ya29.a0AQQ_BDRB0mwyPQC3aXZIG4xmz_E_SNOxehto2az0prdgZ5ou9HMWtIiJgk5_fwGnepvkTxpWxkVGx_zluOYZ4CeKsYrn5TWtFd4eOlLpIDDlahML2M0_065tVb1Q-03MCHeaBc4hgpkK6q-sjNALTcqqP434KWqPE4P_vFvwC5vIl62ts4eO_NIeV7M2AdGNwLb8bgI0wAaCgYKAVgSARESFQHGX2MitizpUCkg-Ms3K3h44M7fVQ0209","token_type":"Bearer","expires_in":3599,"refresh_token":"1//0e-urCtqMVSK6CgYIARAAGA4SNwF-L9IrTWfNUsKFuBn8-mJmQxbXhkBlRW8776bD9xuFk1rFTaMH0dA9yRyESXHTchyXJDAJgkU","scope":"https://www.googleapis.com/auth/drive","Issued":"2025-10-09T17:18:10.707+08:00","IssuedUtc":"2025-10-09T09:18:10.707Z"}
Write Preview
Loading…
Cancel
Save