浏览代码
Merge branch 'art-assets' into big-merge
Merge branch 'art-assets' into big-merge
# Conflicts: # UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab/main
Ciro Continisio
4 年前
当前提交
2c91dabf
共有 54 个文件被更改,包括 7980 次插入 和 3212 次删除
-
930UOP1_Project/Assets/Art/Nature/Bamboo/Bamboo.FBX
-
4UOP1_Project/Assets/Art/Nature/Bamboo/Bamboo.FBX.meta
-
6UOP1_Project/Assets/Art/Nature/Bamboo/BambooCane.mat
-
240UOP1_Project/Assets/Art/Nature/Bush/Bush.FBX
-
4UOP1_Project/Assets/Art/Nature/Bush/Bush.FBX.meta
-
6UOP1_Project/Assets/Art/Nature/Bush/Bush.mat
-
1001UOP1_Project/Assets/Art/Nature/Fern/FernPlant.FBX
-
6UOP1_Project/Assets/Art/Nature/Fern/FernPlant.mat
-
201UOP1_Project/Assets/Art/Nature/Flower/Flower.FBX
-
6UOP1_Project/Assets/Art/Nature/Flower/Flower.mat
-
193UOP1_Project/Assets/Art/Nature/Grass/Grass.FBX
-
6UOP1_Project/Assets/Art/Nature/Grass/Grass.mat
-
724UOP1_Project/Assets/Art/Nature/Palm/Palm.FBX
-
4UOP1_Project/Assets/Art/Nature/Palm/Palm.FBX.meta
-
10UOP1_Project/Assets/Art/Nature/Palm/Palm.mat
-
451UOP1_Project/Assets/Art/Nature/Tree/Tree.FBX
-
4UOP1_Project/Assets/Art/Nature/Tree/Tree.FBX.meta
-
6UOP1_Project/Assets/Art/Nature/Tree/Tree.mat
-
119UOP1_Project/Assets/Materials/Water.mat
-
2UOP1_Project/Assets/Materials/Water.mat.meta
-
15UOP1_Project/Assets/Prefabs/Nature/Bamboo.prefab
-
15UOP1_Project/Assets/Prefabs/Nature/Bush.prefab
-
15UOP1_Project/Assets/Prefabs/Nature/Palm.prefab
-
17UOP1_Project/Assets/Prefabs/Nature/Tree.prefab
-
999UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
-
296UOP1_Project/Assets/Scenes/ArtShowcase.unity
-
2UOP1_Project/Assets/Settings/Graphics/UniversalRP-HighQuality.asset
-
575UOP1_Project/Assets/Shaders/Toon.shadergraph
-
995UOP1_Project/Assets/Shaders/Water.shadergraph
-
2UOP1_Project/Assets/Shaders/Water.shadergraph.meta
-
2UOP1_Project/Assets/Shaders/Toon_Wind.shadergraph.meta
-
116UOP1_Project/Assets/Materials/Campfire.mat
-
8UOP1_Project/Assets/Materials/Campfire.mat.meta
-
1001UOP1_Project/Assets/Materials/FireMask.png
-
92UOP1_Project/Assets/Materials/FireMask.png.meta
-
8UOP1_Project/Assets/Scenes/ArtShowcase.meta
-
893UOP1_Project/Assets/Shaders/Fire.shadergraph
-
10UOP1_Project/Assets/Shaders/Fire.shadergraph.meta
-
164UOP1_Project/Assets/Shaders/SubGraphs/DepthFade.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/DepthFade.shadersubgraph.meta
-
338UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/ToonLightingModel.shadersubgraph.meta
-
341UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph.meta
-
265UOP1_Project/Assets/Shaders/SubGraphs/ToonSpecular.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/ToonSpecular.shadersubgraph.meta
-
266UOP1_Project/Assets/Shaders/SubGraphs/WaterNoise.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/WaterNoise.shadersubgraph.meta
-
374UOP1_Project/Assets/Shaders/SubGraphs/WindAddon.shadersubgraph
-
10UOP1_Project/Assets/Shaders/SubGraphs/WindAddon.shadersubgraph.meta
-
392UOP1_Project/Assets/Shaders/Toon_Wind.shadergraph
-
8UOP1_Project/Assets/Shaders/ToonWater.meta
-
0/UOP1_Project/Assets/Shaders/Toon_Wind.shadergraph.meta
930
UOP1_Project/Assets/Art/Nature/Bamboo/Bamboo.FBX
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
Kaydara FBX Binary L � |
|||
|