foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_mapDev'

Browse Source 
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
#	Assets/GameRes/AutoSource/Part/Part2.prefab
#	Assets/GameRes/AutoSource/Part/Part2Img.prefab
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
This commit is contained in:
Foldcc_b1
2024-10-24 00:09:42 +08:00
parent b7c3557bd0 009ab64b0d
commit 7db07358ae
3 changed files with 62161 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/GameRes/AutoSource/Part/Part1.prefab
View File

@@ -3583,11 +3583,11 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} objectReference: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3} - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 5.24 value: 7.2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3} - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 24.85 value: 26.02
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3} - target: {fileID: 3764562316046112427, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
@@ -3627,11 +3627,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8934092677024438432, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3} - target: {fileID: 8934092677024438432, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 2.13 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8934092677024438432, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3} - target: {fileID: 8934092677024438432, guid: 4ca287cb936f39840b70bbbf05e3d6b4, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 1.15 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []

18542
Assets/GameRes/AutoSource/Part/Part2.prefab
View File

File diff suppressed because it is too large Load Diff

45183
Assets/GameRes/AutoSource/Part/Part2Img.prefab
View File

File diff suppressed because it is too large Load Diff