ElPoyo/AwesomeRunner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
GreenHal0 2025-01-09 11:12:50 +01:00
commit 39560c1490
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scenes/DeathScreen.unity.meta
View File

@ -1,9 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta guid: 43c23d1fff294aa4b90d180240a2295a
guid: 97f4ab700605cdb42a6814eff80fb25c
========
guid: 9fc0d4010bbf28b4594072e72b8655ab
>>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200:Assets/Scenes/DeathScreen.unity.meta
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

2
Assets/Scenes/GameScene.unity
View File

@ -343,7 +343,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3} m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
<CurveStrengthY>k__BackingField: 0 <CurveStrengthY>k__BackingField: 0.0005
<CurveStrengthX>k__BackingField: 0 <CurveStrengthX>k__BackingField: 0
curveOrigin: {fileID: 1053166410} curveOrigin: {fileID: 1053166410}
--- !u!1 &100036927 --- !u!1 &100036927