浏览代码

Merge branch 'art-assets' into main

/main
Ciro Continisio 4 年前
当前提交
019c7796
共有 22 个文件被更改,包括 620 次插入630 次删除
  1. 4
      UOP1_Project/Assets/Art/Characters/BardHare/BardHare.mat
  2. 2
      UOP1_Project/Assets/Art/Characters/FryKing/FryKing.mat
  3. 2
      UOP1_Project/Assets/Art/Characters/PigChef/PigChef.mat
  4. 2
      UOP1_Project/Assets/Art/Characters/PigChef/Pig_Specular.png.meta
  5. 2
      UOP1_Project/Assets/Art/Characters/RockCritter/RockCritter.mat
  6. 2
      UOP1_Project/Assets/Art/Characters/Townsfolk_F/Townsfolk_F.mat
  7. 12
      UOP1_Project/Assets/Art/Characters/Townsfolk_F/townsfolk_F_Roughness.png.meta
  8. 2
      UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_M.mat
  9. 14
      UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph
  10. 298
      UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph
  11. 92
      UOP1_Project/Assets/Shaders/Toon.shadergraph
  12. 80
      UOP1_Project/Assets/Shaders/Toon_DetailMaskTint.shadergraph
  13. 68
      UOP1_Project/Assets/Shaders/Toon_Dissolve.shadergraph
  14. 228
      UOP1_Project/Assets/Shaders/Toon_Fresnel.shadergraph
  15. 48
      UOP1_Project/Assets/Shaders/Toon_RandomPositionTint.shadergraph
  16. 38
      UOP1_Project/Assets/Shaders/Toon_Wind.shadergraph
  17. 186
      UOP1_Project/Assets/Shaders/SubGraphs/Albedo.shadersubgraph
  18. 10
      UOP1_Project/Assets/Shaders/SubGraphs/Albedo.shadersubgraph.meta
  19. 8
      UOP1_Project/Assets/Art/Props/Furniture/Materials.meta
  20. 8
      UOP1_Project/Assets/Art/Props/Tableware/Materials.meta
  21. 134
      UOP1_Project/Assets/Shaders/SubGraphs/TextureAndTint.shadersubgraph
  22. 10
      UOP1_Project/Assets/Shaders/SubGraphs/TextureAndTint.shadersubgraph.meta

4
UOP1_Project/Assets/Art/Characters/BardHare/BardHare.mat


- _OutlineThickness: 3
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.3
- _Smoothness: 0.101
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1

- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0}
- _SpecularColor: {r: 0.3999999, g: 0.3999999, b: 0.3999999, a: 0.14901961}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

2
UOP1_Project/Assets/Art/Characters/FryKing/FryKing.mat


- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.4, g: 0.4, b: 0.4, a: 0}
- _SpecularColor: {r: 0.3999999, g: 0.3999999, b: 0.3999999, a: 0.5019608}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

2
UOP1_Project/Assets/Art/Characters/PigChef/PigChef.mat


- _MixedShadowsColor: {r: 0.52380735, g: 0.5930185, b: 0.745283, a: 1}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0}
- _SpecularColor: {r: 0.95686275, g: 0.65882355, b: 0.46666658, a: 0.14901961}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
- _Tint: {r: 1, g: 1, b: 1, a: 0}
--- !u!114 &3217464616716757470

2
UOP1_Project/Assets/Art/Characters/PigChef/Pig_Specular.png.meta


maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 1
aniso: -1
mipBias: -100
wrapU: -1

2
UOP1_Project/Assets/Art/Characters/RockCritter/RockCritter.mat


- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.27224994, g: 0.39032564, b: 0.4339623, a: 0}
- _SpecularColor: {r: 0.20545867, g: 0.375099, b: 0.43529397, a: 0.14901961}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

2
UOP1_Project/Assets/Art/Characters/Townsfolk_F/Townsfolk_F.mat


- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0}
- _SpecularColor: {r: 0.3999999, g: 0.3999999, b: 0.3999999, a: 0.2}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

12
UOP1_Project/Assets/Art/Characters/Townsfolk_F/townsfolk_F_Roughness.png.meta


overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []

2
UOP1_Project/Assets/Art/Characters/Townsfolk_M/Townsfolk_M.mat


- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0}
- _SpecularColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0.2}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

14
UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph
文件差异内容过多而无法显示
查看文件

298
UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph
文件差异内容过多而无法显示
查看文件

92
UOP1_Project/Assets/Shaders/Toon.shadergraph
文件差异内容过多而无法显示
查看文件

80
UOP1_Project/Assets/Shaders/Toon_DetailMaskTint.shadergraph
文件差异内容过多而无法显示
查看文件

68
UOP1_Project/Assets/Shaders/Toon_Dissolve.shadergraph
文件差异内容过多而无法显示
查看文件

228
UOP1_Project/Assets/Shaders/Toon_Fresnel.shadergraph
文件差异内容过多而无法显示
查看文件

48
UOP1_Project/Assets/Shaders/Toon_RandomPositionTint.shadergraph
文件差异内容过多而无法显示
查看文件

38
UOP1_Project/Assets/Shaders/Toon_Wind.shadergraph
文件差异内容过多而无法显示
查看文件

186
UOP1_Project/Assets/Shaders/SubGraphs/Albedo.shadersubgraph
文件差异内容过多而无法显示
查看文件

10
UOP1_Project/Assets/Shaders/SubGraphs/Albedo.shadersubgraph.meta


fileFormatVersion: 2
guid: e5a8c819ad3623244a943a45dac4ffa4
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}

8
UOP1_Project/Assets/Art/Props/Furniture/Materials.meta


fileFormatVersion: 2
guid: 430fa2bf399a7d947850d44a29b9df4e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/Art/Props/Tableware/Materials.meta


fileFormatVersion: 2
guid: cebf0139daa25054e9a55db4013a5926
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

134
UOP1_Project/Assets/Shaders/SubGraphs/TextureAndTint.shadersubgraph
文件差异内容过多而无法显示
查看文件

10
UOP1_Project/Assets/Shaders/SubGraphs/TextureAndTint.shadersubgraph.meta


fileFormatVersion: 2
guid: 4e91c4acaff9ecc42866a9b218b08e49
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
正在加载...
取消
保存