diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index f9f3505..cf9ccdd 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png.meta b/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png.meta index fdecc17..42f462f 100644 --- a/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png.meta +++ b/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -36,13 +36,13 @@ TextureImporter: filterMode: 1 aniso: 2 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -143,7 +143,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity index 727f605..5e71a9c 100644 --- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity +++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity @@ -3278,6 +3278,25 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 1268371127622009216, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1446204050 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4918415018653565539, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} + m_PrefabInstance: {fileID: 1774722050} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1446204051 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446204050} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2786107500292733626, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} --- !u!1 &1505325484 GameObject: m_ObjectHideFlags: 0 @@ -3740,8 +3759,8 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 112, y: 0.20000686, z: 77} - m_Center: {x: 36.978424, y: 0.00000074505806, z: -20.949902} + m_Size: {x: 112.9983, y: 0.20000686, z: 78.09934} + m_Center: {x: 36.479275, y: 0.00000074505806, z: -21.499577} --- !u!64 &1774722061 MeshCollider: m_ObjectHideFlags: 0 @@ -4208,8 +4227,8 @@ MonoBehaviour: m_EditorClassIdentifier: fieldArea: {fileID: 1196400089} randomRotate: 1 - rowDistance: 3 - strainDistance: 3 + rowDistance: 2 + strainDistance: 2 diseasedRate: 0.5 --- !u!114 &1986188609 MonoBehaviour: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index ebae35d..4f086ca 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,17 +18,17 @@ EditorUserSettings: value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b flags: 0 RecentlyUsedSceneGuid-4: - value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d - flags: 0 - RecentlyUsedSceneGuid-5: value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-6: value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a flags: 0 + RecentlyUsedSceneGuid-7: + value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d + flags: 0 RecentlyUsedSceneGuid-8: value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e flags: 0