mark/sota
Archived
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: mark:e1cdd4a1514556af3f5f70b3bea7a4dc36a9d9dc
Branches Tags
mark:main
mark:vfinal
...
compare: mark:5f8b0f167073082ef501379fefbf16ace275f5a1
Branches Tags
mark:main
mark:vfinal

2 commits
e1cdd4a151 ... 5f8b0f1670

Author SHA1 Message Date
Mark Joshwel 5f8b0f1670 modelling: texture bed, remove debug.log 2024-08-11 02:59:29 +08:00
Sc0rch-thinks 54e10279e8 game: edit bulb material 2024-08-11 02:56:55 +08:00
13 changed files with 1164 additions and 89 deletions
Show stats Expand all files Collapse all files

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_AlbedoTransparency.1001.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_AlbedoTransparency.1001_sRGB_ACEScg.png.tx Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_MetallicSmoothness.1001.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_MetallicSmoothness.1001_Raw_ACEScg.png.tx Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_Normal.1001.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_modular_assets/bedframe/trimsheet_bedframe_standardSurface1_Normal.1001_Raw_ACEScg.png.tx Normal file
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_mesh/trimsheet_bedframe.fbx (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/.mayaSwatches/Bedframe.ma.swatches Normal file
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/Bedframe.ma (Stored with Git LFS)
View file

Binary file not shown.

4
Modelling/Sources/Substance/debug.log
View file

@ -1,4 +0,0 @@
[0807/200943.932:WARNING:resource_bundle_qt.cpp(119)] locale_file_path.empty() for locale
[0808/173156.673:WARNING:resource_bundle_qt.cpp(119)] locale_file_path.empty() for locale
[0808/213148.828:WARNING:resource_bundle_qt.cpp(119)] locale_file_path.empty() for locale
[0809/172801.993:WARNING:resource_bundle_qt.cpp(119)] locale_file_path.empty() for locale

BIN
Modelling/Sources/Substance/trimsheet_bedframe.spp (Stored with Git LFS) Normal file
View file

Binary file not shown.

29
RunningLateGame/Assets/Material/Bulb.mat
View file

@ -24,15 +24,20 @@ Material:
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _EMISSION
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 2
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Transparent
disabledShaderPasses: [] disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -106,8 +111,8 @@ Material:
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailAlbedoMapScale: 1 - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 10
- _DstBlendAlpha: 0 - _DstBlendAlpha: 10
- _EnvironmentReflections: 1 - _EnvironmentReflections: 1
- _GlossMapScale: 0 - _GlossMapScale: 0
- _Glossiness: 0 - _Glossiness: 0
@ -122,12 +127,12 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Surface: 0 - _Surface: 1
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 0.99607843, g: 0.9921568, b: 0.7019608, a: 0.7019608}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.99607843, g: 0.9921568, b: 0.7019608, a: 0.7019608}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.92452836, g: 0.3999364, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

1201
RunningLateGame/Assets/Scenes/Playgrounds/RyanAIPlayground.unity
View file

File diff suppressed because it is too large Load diff