saipo/Warcorrespondents
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决某个文件的冲突问题

Browse Source
This commit is contained in:
Roman 2021-08-29 22:38:46 +08:00
parent 5b661c128a
commit 2cb35fe4a8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat
View File

@ -44,14 +44,6 @@ Material:
- WaveIntensity_2: 1
- WaveSpread_Value: 0
m_Colors:
<<<<<<< HEAD
<<<<<<< HEAD
- Center: {r: 0.56684387, g: 0.49269864, b: 0, a: 0}
=======
- Center: {r: 0.25187644, g: 0.20082444, b: 0, a: 0}
>>>>>>> a13c05b3eab9e2a66d92a816f6ef2f1a55ad0d78
=======
- Center: {r: -0.32060638, g: 0.25792563, b: 0, a: 0}
>>>>>>> 6695d40b997c7ac29d2761c9a2352f7df13beaa2
- Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
m_BuildTextureStacks: []

12
UserSettings/EditorUserSettings.asset
View File

@ -18,22 +18,22 @@ EditorUserSettings:
value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba95e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b1968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7