浏览代码
Merge branch 'main' of https://github.com/UnityTechnologies/LoadyDungeons
Merge branch 'main' of https://github.com/UnityTechnologies/LoadyDungeons
# Conflicts: # Packages/manifest.json # Packages/packages-lock.json # ProjectSettings/ProjectSettings.asset # ProjectSettings/ProjectVersion.txt # UserSettings/EditorUserSettings.asset/main
vrejhezaran
3 年前
当前提交
54678265
共有 138 个文件被更改,包括 5826 次插入 和 4514 次删除
-
8Assets/AddressableAssetsData/Android/addressables_content_state.bin
-
51Assets/Materials/Dino.mat
-
49Assets/Materials/Environment/Cardboard 1_Ruins.mat
-
49Assets/Materials/Environment/Cardboard.mat
-
49Assets/Materials/Environment/Cardboard_Castle.mat
-
49Assets/Materials/Environment/Cardboard_CaveBlue.mat
-
49Assets/Materials/Environment/Cardboard_ForestDark.mat
-
51Assets/Materials/Environment/Cardboard_sides.mat
-
51Assets/Materials/Environment/Castle_Column_Castle_Column_AlbedoTransparency.mat
-
51Assets/Materials/Environment/Castle_Flag_Castle_Flag_AlbedoTransparency.mat
-
51Assets/Materials/Environment/Castle_Wall_Castle_Wall_AlbedoTransparency.mat
-
49Assets/Materials/Environment/Cave_Crystals.mat
-
49Assets/Materials/Environment/Desert_Diff.mat
-
51Assets/Materials/Environment/Forest_Bridge_Forest_Bridge_AlbedoTransparency.mat
-
51Assets/Materials/Environment/Forest_Trees_Forest_trees_AlbedoTransparency.mat
-
49Assets/Materials/Environment/Forest_Vegetation.mat
-
51Assets/Materials/Environment/Ruins_Columns_Ruins_Column_AlbedoTransparency.mat
-
51Assets/Materials/Environment/Ruins_PalmTree_Ruins_PalmTree_AlbedoTransparency.mat
-
51Assets/Materials/Environment/Ruins_Platforms_Ruins_Platforms_AlbedoTransparency 1.mat
-
51Assets/Materials/Environment/Ruins_Platforms_Ruins_Platforms_AlbedoTransparency.mat
-
51Assets/Materials/Gameplay Elements/Chest_Chest_AlbedoTransparency.mat
-
51Assets/Materials/Gameplay Elements/Goal_Door_Goal_AlbedoTransparency.mat
-
51Assets/Materials/Gameplay Elements/Key_Key_AlbedoTransparency.mat
-
49Assets/Materials/Hats/Hat00Mat.mat
-
49Assets/Materials/Hats/Hat01Mat.mat
-
49Assets/Materials/Hats/Hat02Mat.mat
-
51Assets/Materials/Hats/Hats_Hat_AlbedoTransparency.mat
-
51Assets/Materials/Hats/Hats_Hat_Bunny_AlbedoTransparency.mat
-
51Assets/Materials/Hats/Hats_Hat_Crown_AlbedoTransparency.mat
-
51Assets/Materials/Hats/Hats_Hat_Pajama_AlbedoTransparency.mat
-
35Assets/Materials/Particles/FX_Chest.mat
-
42Assets/Materials/Particles/FX_JumpDust.mat
-
35Assets/Materials/Particles/FX_Star.mat
-
10Assets/Prefabs/Door.prefab
-
98Assets/Scenes/Level_00.unity
-
14Assets/Scenes/Level_00/LightingData.asset
-
2Assets/Scenes/Level_00/LightingData.asset.meta
-
732Assets/Scenes/Level_00/Lightmap-0_comp_dir.png
-
6Assets/Scenes/Level_00/Lightmap-0_comp_dir.png.meta
-
1001Assets/Scenes/Level_00/Lightmap-0_comp_light.exr
-
4Assets/Scenes/Level_00/Lightmap-0_comp_light.exr.meta
-
426Assets/Scenes/Level_00/Lightmap-0_comp_shadowmask.png
-
8Assets/Scenes/Level_00/Lightmap-0_comp_shadowmask.png.meta
-
4Assets/Scenes/Level_00/ReflectionProbe-0.exr.meta
-
195Assets/Scenes/Level_01.unity
-
45Assets/Scenes/Level_01/LightingData.asset
-
2Assets/Scenes/Level_01/LightingData.asset.meta
-
326Assets/Scenes/Level_01/Lightmap-0_comp_dir.png
-
6Assets/Scenes/Level_01/Lightmap-0_comp_dir.png.meta
-
1001Assets/Scenes/Level_01/Lightmap-0_comp_light.exr
-
4Assets/Scenes/Level_01/Lightmap-0_comp_light.exr.meta
-
287Assets/Scenes/Level_01/Lightmap-0_comp_shadowmask.png
-
20Assets/Scenes/Level_01/Lightmap-0_comp_shadowmask.png.meta
-
4Assets/Scenes/Level_01/ReflectionProbe-0.exr.meta
-
252Assets/Scenes/Level_02.unity
-
22Assets/Scenes/Level_02/LightingData.asset
-
2Assets/Scenes/Level_02/LightingData.asset.meta
-
999Assets/Scenes/Level_02/Lightmap-0_comp_dir.png
-
6Assets/Scenes/Level_02/Lightmap-0_comp_dir.png.meta
-
1001Assets/Scenes/Level_02/Lightmap-0_comp_light.exr
-
4Assets/Scenes/Level_02/Lightmap-0_comp_light.exr.meta
-
4Assets/Scenes/Level_02/ReflectionProbe-0.exr.meta
-
165Assets/Scenes/Level_03.unity
-
18Assets/Scenes/Level_03/LightingData.asset
-
2Assets/Scenes/Level_03/LightingData.asset.meta
-
152Assets/Scenes/Level_03/Lightmap-0_comp_dir.png
-
6Assets/Scenes/Level_03/Lightmap-0_comp_dir.png.meta
-
569Assets/Scenes/Level_03/Lightmap-0_comp_light.exr
-
4Assets/Scenes/Level_03/Lightmap-0_comp_light.exr.meta
-
4Assets/Scenes/Level_03/ReflectionProbe-0.exr.meta
-
105Assets/Scenes/Store.unity
-
30Assets/Textures/Particles/FX_JumpDust.png.meta
-
3ProjectSettings/GraphicsSettings.asset
-
192ProjectSettings/InputManager.asset
-
9README.md
-
8Assets/Audio.meta
-
78Assets/Rendering/CustomPostProcessData.asset
-
8Assets/Rendering/CustomPostProcessData.asset.meta
-
61Assets/Rendering/UniversalRenderPipelineAsset.asset
-
8Assets/Rendering/UniversalRenderPipelineAsset.asset.meta
-
42Assets/Rendering/UniversalRenderPipelineAsset_Renderer.asset
-
8Assets/Rendering/UniversalRenderPipelineAsset_Renderer.asset.meta
-
116Assets/Scenes/Level_00/PostProcessing Profile.asset
-
8Assets/Scenes/Level_00/PostProcessing Profile.asset.meta
-
169Assets/Scenes/Level_01/PostProcessing Profile.asset
-
8Assets/Scenes/Level_01/PostProcessing Profile.asset.meta
-
63Assets/Scenes/Level_01Settings.lighting
-
8Assets/Scenes/Level_01Settings.lighting.meta
-
8Assets/Scenes/Level_01_Profiles.meta
-
91Assets/Scenes/Level_02/PostProcessing Profile.asset
-
8Assets/Scenes/Level_02/PostProcessing Profile.asset.meta
-
63Assets/Scenes/Level_02Settings.lighting
-
8Assets/Scenes/Level_02Settings.lighting.meta
-
169Assets/Scenes/Level_03/PostProcessing Profile.asset
-
8Assets/Scenes/Level_03/PostProcessing Profile.asset.meta
-
63Assets/Scenes/Level_03Settings.lighting
-
8Assets/Scenes/Level_03Settings.lighting.meta
-
8Assets/Scenes/Store.meta
|
|||
|