lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理合并冲突

Browse Source
This commit is contained in:
lishuo committed 2021-03-30 20:00:11 +08:00
1 parent 8638cd97de
commit b0f6c39118
49 files changed
+119 -5434
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/DOTweenSettings.asset
+1 -1
View File
@@ -9,7 +9,7 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 16995157, guid: 5e6e2c06c5086844cb05b97b1c7b71f1, type: 3}
m_Script: {fileID: 16995157, guid: 08cc7e0f66446b04ba75e45c7b24653c, type: 3}
m_Name: DOTweenSettings
m_EditorClassIdentifier:
useSafeMode: 1