Skip to content

Commit

Permalink
Merge pull request #35 from AJpon/dev
Browse files Browse the repository at this point in the history
リリースに向けて灯体とREADMEを更新
  • Loading branch information
AJpon authored Jul 10, 2024
2 parents 0dc0236 + 51611ba commit 1ffb87f
Show file tree
Hide file tree
Showing 106 changed files with 20 additions and 15 deletions.
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,18 @@ DMXやArtnetで制御される照明コントロールシステムを参考に
## プリセット灯体
`/Resources/SLSAssets/Lights/` 以下に URP/HDRP対応のセットアップ済み灯体を5つ同梱しています
`/Resources/SLSAssets/Lights/` 以下に URP対応のセットアップ済み灯体を同梱しています
| Light Type | File Name | RenderPipeLine | Rendering Image |
|:-----------|:----------|:--------------:|:---------------:|
| LED Strobe | `SLM_LEDStrobe.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/c3df799b-4bd5-484b-a7c0-0a35c22a008a" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_HDRP.prefab` | HDRP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/009226e2-5918-4609-9cbc-82bc733783c2" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_URP_HD.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/2f0b3b68-dda4-4a40-b3a4-1f33cb2f0b96" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_URP_SD.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/2f0b3b68-dda4-4a40-b3a4-1f33cb2f0b96" width="64"> |
| Moving Wash Light | `SLM_MovingWashLight_URl.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/d4e6141c-5407-4c85-8fd4-371b039ced32" width="64"> |
| Rotating Wash Light | `SLM_RotatingWashLight_URP.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/6fca80dc-6d36-42de-8a76-15c92b396573" width="64"> |
| LED Strobe | `SLM_LEDStrobe_URP.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/9ec8d8da-bb7d-4592-b10d-e672d2564feb" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_URP.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/748592c8-13c9-46a2-8706-4f44d19fd7c4" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_URP_VLB_HD.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/748592c8-13c9-46a2-8706-4f44d19fd7c4" width="64"> |
| Moving Beam Light | `SLM_MovingBeamLight_URP_VLB_SD.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/748592c8-13c9-46a2-8706-4f44d19fd7c4" width="64"> |
| Moving Wash Light | `SLM_MovingWashLight_URP.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/5bbdb09e-9554-43a9-ad40-7bf0e0941d3c" width="64"> |
| Moving Wash Light | `SLM_MovingWashLight_URP_VLB.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/5bbdb09e-9554-43a9-ad40-7bf0e0941d3c" width="64"> |
| Rotating Wash Light | `SLM_RotatingWashLight_URP.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/f2a705c5-4260-4ccc-8a56-caf522ec8975" width="64"> |
| Rotating Wash Light | `SLM_RotatingWashLight_URP_VLB.prefab` | URP | <img src="https://github.com/murasaqi/Unity_StageLightManeuver/assets/49616225/f2a705c5-4260-4ccc-8a56-caf522ec8975" width="64"> |
## 使い方
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GameObject:
- component: {fileID: 588513960569361035}
- component: {fileID: 2679935268127646435}
m_Layer: 0
m_Name: SLM_MovingBeamLight
m_Name: SLM_MovingBeamLight_URP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ PrefabInstance:
- target: {fileID: 919132149155446097, guid: 01d72afcfc16e9e43a5b9c82c39fefde,
type: 3}
propertyPath: m_Name
value: SLM_MovingWashLight
value: SLM_MovingWashLight_URP
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Material:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
Expand Down Expand Up @@ -64,7 +63,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 681c2ae8ddfaffa4cb20ce74f32109af, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand Down Expand Up @@ -98,7 +97,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
Expand All @@ -107,6 +108,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
Expand All @@ -121,13 +123,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

0 comments on commit 1ffb87f

Please sign in to comment.