shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wulongxiao 2024-12-20 22:28:06 +08:00
parent 4d3aea9f99
commit e1045eb00a
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meng_yao/Assets/Scenes/scene_Main.unity
View File

@ -154397,11 +154397,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 6
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!114 &924268791607708460
MonoBehaviour:
m_ObjectHideFlags: 0
@ -154417,11 +154413,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 4
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!114 &924268792840249349
MonoBehaviour:
m_ObjectHideFlags: 0
@ -154437,11 +154429,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 2
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!114 &1066468052626369803
MonoBehaviour:
m_ObjectHideFlags: 0
@ -158807,11 +158795,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 1
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!224 &1635682451688820537
RectTransform:
m_ObjectHideFlags: 0
@ -162470,11 +162454,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 7
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!1 &5030294901345889888
GameObject:
m_ObjectHideFlags: 0
@ -162713,11 +162693,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 8
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!1 &5886320606151238136
GameObject:
m_ObjectHideFlags: 0
@ -163948,11 +163924,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 3
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!222 &7864017317208561165
CanvasRenderer:
m_ObjectHideFlags: 0
@ -164274,11 +164246,7 @@ MonoBehaviour:
DropBtn: {fileID: 0}
targetPosition: {fileID: 1477323885343120432}
flyDuration: 1
<<<<<<< HEAD
id: 0
=======
id: 5
>>>>>>> e2fbb81bb59a0ed69d725bd46f177ea0d8fee509
--- !u!114 &8533826443837745445
MonoBehaviour:
m_ObjectHideFlags: 0

2
meng_yao/Assets/common

@ -1 +1 @@
Subproject commit 1e50006cf9e2a255ad0ae6c91abbef15075f7dd6
Subproject commit 8fec6273a4346583fb36152f04a9a9ac7c7f00dc