Skip to content

Commit

Permalink
branch for testing mppm
Browse files Browse the repository at this point in the history
  • Loading branch information
gregk-unity committed Jul 5, 2024
1 parent 74afaeb commit 1cdac31
Show file tree
Hide file tree
Showing 199 changed files with 49,043 additions and 627 deletions.
3 changes: 3 additions & 0 deletions Assets/DefaultVolumeProfile.asset
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/DefaultVolumeProfile.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Assets/Material/Characters/Character_Shadow.mat
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Material:
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -132,6 +133,7 @@ Material:
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2085413229483183920
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -144,4 +146,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
4 changes: 3 additions & 1 deletion Assets/Material/Characters/Enemy_Eyes_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Material:
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -127,6 +128,7 @@ Material:
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2746495770331472876
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -139,4 +141,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
4 changes: 3 additions & 1 deletion Assets/Material/Characters/Enemy_Mouth_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -36,6 +36,7 @@ Material:
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -145,3 +146,4 @@ Material:
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
4 changes: 3 additions & 1 deletion Assets/Material/Characters/Hero_Eyes_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Material:
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -127,6 +128,7 @@ Material:
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &4340826014879142409
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -139,4 +141,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
4 changes: 3 additions & 1 deletion Assets/Material/Characters/Hero_Mouth_sheet.mat
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Material:
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -132,6 +133,7 @@ Material:
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &1900546452016667472
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -144,4 +146,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Archer_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -102,6 +103,7 @@ Material:
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &4864082934053653154
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -114,4 +116,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Archer_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -102,6 +103,7 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6413572590179603764
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -114,4 +116,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Mage_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -33,7 +33,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -115,3 +116,4 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Mage_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -115,6 +116,7 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8325592805791008449
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -127,4 +129,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -33,7 +33,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -115,3 +116,4 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -102,6 +103,7 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8814935330546915290
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -114,4 +116,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Tank_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -33,7 +33,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -115,3 +116,4 @@ Material:
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Hair_Tank_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -102,6 +103,7 @@ Material:
- _RimColor: {r: 3.9999995, g: 3.9999995, b: 3.9999995, a: 1}
- _SpecularColor: {r: 1.8039216, g: 1.8039216, b: 1.8039216, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &77699869095076743
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -114,4 +116,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Head_Archer_Boy.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -32,7 +32,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -114,3 +115,4 @@ Material:
- _RimColor: {r: 1.6941177, g: 1.6941177, b: 1.6941177, a: 1}
- _SpecularColor: {r: 2.0078433, g: 2.0078433, b: 2.0078433, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Head_Archer_Girl.mat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
Expand All @@ -32,7 +32,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -114,3 +115,4 @@ Material:
- _RimColor: {r: 3.3882349, g: 3.3882349, b: 3.3882349, a: 1}
- _SpecularColor: {r: 4.0156865, g: 4.0156865, b: 4.0156865, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
6 changes: 4 additions & 2 deletions Assets/Material/Characters/Toon/Head_Boss.mat
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -114,6 +115,7 @@ Material:
- _RimColor: {r: 1.6941177, g: 1.6941177, b: 1.6941177, a: 1}
- _SpecularColor: {r: 4.0156865, g: 4.0156865, b: 4.0156865, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8635471332786235124
MonoBehaviour:
m_ObjectHideFlags: 11
Expand All @@ -126,4 +128,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
Loading

0 comments on commit 1cdac31

Please sign in to comment.