比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/devlogs-1-toon-shading
unity-tech-cn:/release
unity-tech-cn:/devlogs-2-scriptable-objects
unity-tech-cn:/devlogs-3-input
unity-tech-cn:/UI
unity-tech-cn:/devlogs-4-addressable-assets
拉取从: unity-tech-cn:devlogs-1-toon-shading
unity-tech-cn:/main
unity-tech-cn:/devlogs-1-toon-shading
unity-tech-cn:/release
unity-tech-cn:/devlogs-2-scriptable-objects
unity-tech-cn:/devlogs-3-input
unity-tech-cn:/UI
unity-tech-cn:/devlogs-4-addressable-assets
此合并请求有变更与目标分支冲突。
/README.md
/UOP1_Project/Packages/manifest.json
/UOP1_Project/Packages/packages-lock.json
/UOP1_Project/ProjectSettings/ProjectVersion.txt
/UOP1_Project/ProjectSettings/URPProjectSettings.asset
/UOP1_Project/Assets/Shaders/CustomHLSL/CustomLighting.hlsl
/UOP1_Project/Assets/Settings/Graphics/ToonRenderer.asset
/UOP1_Project/ProjectSettings/PackageManagerSettings.asset
/UOP1_Project/Assets/Materials/Obstacles.mat
/UOP1_Project/Assets/Materials/White.mat
/UOP1_Project/Assets/Scenes/ToonShading.unity
/UOP1_Project/Assets/Shaders/CustomLighting.shadergraph
6 次代码提交
| 作者 | SHA1 | 备注 | 提交日期 |
|---|---|---|---|
GitHub
|
8cc6e6db | Update README.md | 4 年前 |
|
GitHub
|
47d6ab96 | Update README.md | 4 年前 |
|
GitHub
|
683c7d98 | Update README.md | 4 年前 |
|
GitHub
|
d8c4780b | Update README.md | 4 年前 |
Ciro Continisio
|
ed93e8a2 | New Readme for the branch | 4 年前 |
|
GitHub
|
999566a9 |
OP Devlog #1: Toon shading (#173)
* upgrade to 2020.2 * add else condition in CustomLighting * fix missing material in ToonShading scene Co-authored-by: doJester13 <minarini.work@gmail.com> Co-authored-by: doJester13 <minairni.work@gmail.com> |
4 年前 |
共有 19 个文件被更改，包括 1194 次插入 和 303 次删除
-
36UOP1_Project/Assets/Materials/Obstacles.mat
-
36UOP1_Project/Assets/Materials/White.mat
-
90UOP1_Project/Assets/Scenes/ToonShading.unity
-
7UOP1_Project/Assets/Settings/Graphics/ToonRenderer.asset
-
18UOP1_Project/Assets/Shaders/CustomHLSL/CustomLighting.hlsl
-
995UOP1_Project/Assets/Shaders/CustomLighting.shadergraph
-
10UOP1_Project/Packages/manifest.json
-
61UOP1_Project/Packages/packages-lock.json
-
4UOP1_Project/ProjectSettings/ProjectVersion.txt
-
2UOP1_Project/ProjectSettings/URPProjectSettings.asset
-
29README.md
-
63UOP1_Project/Assets/Scenes/ToonShadingSettings.lighting
-
8UOP1_Project/Assets/Scenes/ToonShadingSettings.lighting.meta
-
40UOP1_Project/Assets/Shaders/Shader Graphs_CustomLighting.mat
-
8UOP1_Project/Assets/Shaders/Shader Graphs_CustomLighting.mat.meta
-
43UOP1_Project/ProjectSettings/PackageManagerSettings.asset
-
8UOP1_Project/ProjectSettings/VersionControlSettings.asset
-
39UOP1_Project/UserSettings/EditorUserSettings.asset
995
UOP1_Project/Assets/Shaders/CustomLighting.shadergraph
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
m_EditorVersion: 2019.4.11f1 |
|||
m_EditorVersionWithRevision: 2019.4.11f1 (2d9804dddde7) |
|||
m_EditorVersion: 2020.2.0b9 |
|||
m_EditorVersionWithRevision: 2020.2.0b9 (ef2968fa77ae) |
|||
|
|||
 |
|||
# Unity Open Project #1 |
|||
 |
|||
### Unity Open Project #1: Chop Chop |
|||
# Devlog 1: The toon shading |
|||
Welcome! This is the repository for the first Unity **Open Project**, an initiative where Unity and the community collaborate together to create **a small game**, in an open source way. As of now the game is still unnamed so we just refer to it as *Open Project #1*. |
|||
You've landed on the repository for the first Unity **Open Project**, an initiative where Unity and the community collaborate together to create a small **open-source game demo**. The first game is an action-adventure titled _Chop Chop_ ([more info](https://open.codecks.io/unity-open-project-1/decks/32/card/126-what-is-this)). |
|||
## Follow the progress |
|||
The [dedicated sub-forum](https://forum.unity.com/forums/open-projects.531/) on the Unity Forums is where the Unity team and the whole community discuss and brainstorm ideas. |
|||
This branch in particular contains the **demo assets** associated with the first "devlog" video, which takes an in-depth look at **the toon look** created for the game. You can find the video [on YouTube](https://www.youtube.com/watch?v=GGTTHOpUQDE). |
|||
The [public roadmap](https://open.codecks.io/unity-open-project-1) is the central location to know what's coming to the game. Also a great way to find something to contribute on! |
|||
**Note:** This branch (`devlog-1-toon-shading`) doesn't contain the full project, but a trimmed-down version which focuses specifically on the toon shading. We did it so it's faster for you to import, and easier to explore and learn from. We also updated it to a newer Unity version (see below) so you can take its learnings and apply them to the games you are developing now. In time, we will make small updates to this branch or backport fixes when needed, but don't expect it to be updated with new features and to stay in sync with `main`. |
|||
## Contribute |
|||
We would love to get your contributions into the game! Whether you create code, art, narrative, sounds; whether you feel you are experienced enough or not; there is probably something you can add to it. |
|||
To find the full project and contribute to it, go to the [main branch](https://github.com/UnityTechnologies/open-project-1). |
|||
To learn all about contributing, head to the [Contribution Guidelines](https://docs.google.com/document/d/1PwBF4yQl69RxvVHZ2m2iiy5pYjd9QO-VcuXWDjB7QwA/edit#). |
|||
⚠ Please **create a thread [on the forum](https://forum.unity.com/forums/open-projects.531/) there before starting to work on big contributions!** |
|||
## Unity version |
|||
Normally, development on the game takes place in Unity 2019.4 LTS. However for this video we branched off and upgraded it to **Unity 2020.2 beta**. On the [main branch](https://github.com/UnityTechnologies/open-project-1) development continues on 2019.4 LTS as usual. |
|||
If you feel like taking on some **bugs**, check out the [Issues page](https://github.com/UnityTechnologies/open-project-1/issues) on this very repo. In fact, another thing you could help with is by doing some **QA testing**: download the [latest release](https://github.com/UnityTechnologies/open-project-1/releases) of the game, play it, and report issues in the appropriate page. That's also a great way to be part of this project! |
|||
|
|||
This project is built on **Unity 2019.4 LTS**, whatever latest patch is available. |
|||
## License |
|||
The assets contained in this branch are covered by the same open-source license that covers the rest of the game ([Apache License 2.0](https://github.com/UnityTechnologies/open-project-1/blob/main/LICENSE)), so you are free to use them for your own projects. |
|||
## Play the game |
|||
Just want to try the game out? Head to the [release page](https://github.com/UnityTechnologies/open-project-1/releases) and grab the latest version. |
|||
## Contribute |
|||
Open Projects is an open-source game, so we'd love your contributions! However, we don't take contributions on this branch so please don't open PRs against it. |
|||
To take part in the development, go to [the main branch](https://github.com/UnityTechnologies/open-project-1) and find all the instructions on how to contribute in its [Readme](https://github.com/UnityTechnologies/open-project-1/blob/main/README.md). |
|||
|
|||
## |
|||
|
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!850595691 &4890085278179872738 |
|||
LightingSettings: |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: ToonShadingSettings |
|||
serializedVersion: 3 |
|||
m_GIWorkflowMode: 1 |
|||
m_EnableBakedLightmaps: 1 |
|||
m_EnableRealtimeLightmaps: 0 |
|||
m_RealtimeEnvironmentLighting: 1 |
|||
m_BounceScale: 1 |
|||
m_AlbedoBoost: 1 |
|||
m_IndirectOutputScale: 1 |
|||
m_UsingShadowmask: 0 |
|||
m_BakeBackend: 2 |
|||
m_LightmapMaxSize: 1024 |
|||
m_BakeResolution: 40 |
|||
m_Padding: 2 |
|||
m_TextureCompression: 0 |
|||
m_AO: 1 |
|||
m_AOMaxDistance: 1 |
|||
m_CompAOExponent: 1 |
|||
m_CompAOExponentDirect: 0 |
|||
m_ExtractAO: 0 |
|||
m_MixedBakeMode: 1 |
|||
m_LightmapsBakeMode: 1 |
|||
m_FilterMode: 1 |
|||
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} |
|||
m_ExportTrainingData: 0 |
|||
m_TrainingDataDestination: TrainingData |
|||
m_RealtimeResolution: 2 |
|||
m_ForceWhiteAlbedo: 0 |
|||
m_ForceUpdates: 0 |
|||
m_FinalGather: 0 |
|||
m_FinalGatherRayCount: 256 |
|||
m_FinalGatherFiltering: 1 |
|||
m_PVRCulling: 0 |
|||
m_PVRSampling: 1 |
|||
m_PVRDirectSampleCount: 64 |
|||
m_PVRSampleCount: 512 |
|||
m_PVREnvironmentSampleCount: 512 |
|||
m_PVREnvironmentReferencePointCount: 2048 |
|||
m_LightProbeSampleCountMultiplier: 4 |
|||
m_PVRBounces: 2 |
|||
m_PVRMinBounces: 2 |
|||
m_PVREnvironmentMIS: 0 |
|||
m_PVRFilteringMode: 2 |
|||
m_PVRDenoiserTypeDirect: 2 |
|||
m_PVRDenoiserTypeIndirect: 2 |
|||
m_PVRDenoiserTypeAO: 2 |
|||
m_PVRFilterTypeDirect: 0 |
|||
m_PVRFilterTypeIndirect: 0 |
|||
m_PVRFilterTypeAO: 0 |
|||
m_PVRFilteringGaussRadiusDirect: 5 |
|||
m_PVRFilteringGaussRadiusIndirect: 5 |
|||
m_PVRFilteringGaussRadiusAO: 2 |
|||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5 |
|||
m_PVRFilteringAtrousPositionSigmaIndirect: 2 |
|||
m_PVRFilteringAtrousPositionSigmaAO: 1 |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 1cd6dce37f83fc645af919771a22d2e1 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Shader Graphs_CustomLighting |
|||
m_Shader: {fileID: -6465566751694194690, guid: ce3adfe50c31dcd48a286c93f30a7a37, |
|||
type: 3} |
|||
m_ShaderKeywords: |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- unity_Lightmaps: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- unity_LightmapsInd: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- unity_ShadowMasks: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _Smoothness: 0.9 |
|||
m_Colors: |
|||
- _MixedShadowsColor: {r: 0.52380735, g: 0.5930185, b: 0.745283, a: 1} |
|||
- _SpecularColor: {r: 0, g: 0.6742267, b: 1, a: 0} |
|||
m_BuildTextureStacks: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: d232df9868d0ee24d81aa9d7b49021f1 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &1 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 61 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} |
|||
m_Name: |
|||
m_EditorClassIdentifier: |
|||
m_EnablePreviewPackages: 0 |
|||
m_EnablePackageDependencies: 0 |
|||
m_AdvancedSettingsExpanded: 1 |
|||
m_ScopedRegistriesSettingsExpanded: 1 |
|||
oneTimeWarningShown: 0 |
|||
m_Registries: |
|||
- m_Id: main |
|||
m_Name: |
|||
m_Url: https://packages.unity.com |
|||
m_Scopes: [] |
|||
m_IsDefault: 1 |
|||
m_Capabilities: 7 |
|||
m_UserSelectedRegistryName: |
|||
m_UserAddingNewScopedRegistry: 0 |
|||
m_RegistryInfoDraft: |
|||
m_ErrorMessage: |
|||
m_Original: |
|||
m_Id: |
|||
m_Name: |
|||
m_Url: |
|||
m_Scopes: [] |
|||
m_IsDefault: 0 |
|||
m_Capabilities: 0 |
|||
m_Modified: 0 |
|||
m_Name: |
|||
m_Url: |
|||
m_Scopes: |
|||
- |
|||
m_SelectedScopeIndex: 0 |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!890905787 &1 |
|||
VersionControlSettings: |
|||
m_ObjectHideFlags: 0 |
|||
m_Mode: Visible Meta Files |
|||
m_CollabEditorSettings: |
|||
inProgressEnabled: 1 |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!162 &1 |
|||
EditorUserSettings: |
|||
m_ObjectHideFlags: 0 |
|||
serializedVersion: 4 |
|||
m_ConfigSettings: |
|||
RecentlyUsedScenePath-0: |
|||
value: 22424703114646680e0b0227036c7c1817053b25223c343f21251821acf53a31f6fe |
|||
flags: 0 |
|||
RecentlyUsedScenePath-1: |
|||
value: 22424703114646680e0b0227036c7a1e00231d393866333e243d04 |
|||
flags: 0 |
|||
RecentlyUsedScenePath-2: |
|||
value: 22424703114646680e0b0227036c7005021b11242966333e243d04 |
|||
flags: 0 |
|||
RecentlyUsedScenePath-3: |
|||
value: 22424703114646680e0b0227036c6b1f19192b222d2c2f3e2a67083debf42d |
|||
flags: 0 |
|||
UnityEditor.ShaderGraph.FloatingWindowsLayout2: |
|||
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b81ec869c8395949c9483d58a8e97ddbd90eed2a5a892a2af949aa48bafb19f85bd75a7ed3a7d25658598b7b58bb4b76aaf777690ca2863946c72c6cd81b6b6708f9f879f88769589d91c8f888e64d20f935e796571755c6b546677696a486c781c07356f23696429450074652134203e56454c514e4352305f7862141e6a730c0c00615e4e54185d4f1e4e1b0d5872716d5e6f603a6b7c4176795978363400 |
|||
flags: 0 |
|||
UnityEditor.ShaderGraph.InspectorWindow: |
|||
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed909c968797a7cf |
|||
flags: 0 |
|||
vcSharedLogLevel: |
|||
value: 0d5e400f0650 |
|||
flags: 0 |
|||
m_VCAutomaticAdd: 1 |
|||
m_VCDebugCom: 0 |
|||
m_VCDebugCmd: 0 |
|||
m_VCDebugOut: 0 |
|||
m_SemanticMergeMode: 2 |
|||
m_VCShowFailedCheckout: 1 |
|||
m_VCOverwriteFailedCheckoutAssets: 1 |
|||
m_VCProjectOverlayIcons: 1 |
|||
m_VCHierarchyOverlayIcons: 1 |
|||
m_VCOtherOverlayIcons: 1 |
|||
m_VCAllowAsyncUpdate: 1 |
|||
撰写
预览
正在加载...
取消
保存
Reference in new issue