From e769e0d64c7b3fa05db8e7183cd00e353294ea1e Mon Sep 17 00:00:00 2001 From: taosuqi <2274240467@qq.com> Date: Mon, 26 May 2025 17:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A2=B0=E6=92=9E=E8=BF=99?= =?UTF-8?q?=E4=B8=80=E5=9D=97./?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/CultivationOfBrewing-2/v17/.suo | Bin 4165632 -> 4165632 bytes .../UI_Panel/UI_SessionPanel/教师.png.meta | 16 +++++------ .../HQB/Scene/10002_2002_03_OfficeScene.unity | 27 +++++++++++++++--- UserSettings/EditorUserSettings.asset | 10 +++---- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index f9f3505e301e144b317d1ebc0fccbcfcb99febe2..cf9ccddcbb1a160f6c358f5d032e589f815c5372 100644 GIT binary patch delta 1358 zcmajee@q)?7zgn8y?A1d3zoKP5vm{ex&?qKPIW8~h<8F5#M0NGR9DPMk=o2CrosXKWDxhMK-Ed3b=z1Q$h=I;kGH za!y~m+_d0Qpn#%6m=}vpm9iHG?RG8X$m7947PO4e$t9tZ%K_q#vgLcGjtC8t&oZ|OJC?MEq;ek^6xm%j5 zQn=t{OSkIv$MDyO&?M5xJC2$Au7uy?+CDMS5K<4H zGUTcg69!p5&~GTB!{J!$GQP(9y^MV`$Jm)x#%g88KH10Ea}wT;UdEnuF?RI?WAkl) zR~GT4FX`VM#=rmXq`leBlktbV{Ds!ums)!{2w(saj37Y{n7|CVU;!)SferG(4(mXM z0#Kk39N>f^aKU;gh7#BS8(|ZaLK&2U8!BKk+yNf&LM2pz531o#@WWjYfEoxwE!4pl Y*b3X=Zm5R_XoL_nL3pOMxA}_yPv`yMc>n+a delta 1601 zcmYk+dr(wW9Ki8&E_YYJ1unY_61&L;m`JD~1tPdGy+$1qZ5ru0k%jgkEMuI;ngOyh zvj^-+u2B|lWcjFsHL*7qTA5V*W0s|4Oc_~e;~$OXZr{V8)0z3q?{|Lp?7hFcd(Jj@ zMrAWvE2O7w_GIa8t2^q*7DD*creaUX(-ku6lRLMp-#0RFST3S2s?{pvj8QJt%D9fJ zofMJ~jm2U`L_$pG%i@Hnhn|n4o{4lUL<$_x*UrKeYOy)dp{G&RW@f2cnIRKYx9M># z*SAoE=5jS;#z(3g1=86Xo4fJEKxBnsNTW=smE$_n^e1%_I_jYth^k5EWbXv3`Vo3q z^4G6a#e0}m)*L~S>Py@LJX@xUyd5`c}Ml9RGiOst9)WYfRP~xzqJN*BMoKAGf zo_Str+>oWxuNhIfi5ZcMrN?D>nn5q4-%U(8Qvb1!{bkO#JIg9FBTHv=r1UJfPI?z- z2~mUVq2J>c{VsP_ZwOy$^enhTn&;rsL z9Bc3d*5XO5!&7(~&)`|Kq75M^JcspYhm8$*9vyfAFJdEJ!prD%izcy&B#c+kg;%i| zuiy_co+rc}l8^BT`mq=L z@F_mS=h%-gZ~z1N5?|qK4B{KGf4p^vNWR5)IE?S{1CHP*hVUbf;U^5^XXxGV3-LI9 z#Rz`G3H%PdWBw$bM5aEPoD$1-hS@fL_J4_I5k(BbBkWT(;}`X|?g;KM)PXrws%mPV zU9~gVY#-?kRz>l$(#g3|!Uf)Re!{I|EAq#> zF^jg-iC*TSfpg3KF@RL3T~Dh8&`Wx zrOR&J>oDz!yMx*6T)(}lC+L#+HU@aREF3fHT0~%1zuj13K2I`>*n-Kjvh_ zUCU;a4V5`X)uKUMA?n3l;&yS5$P*8UMzMlfgIFd4VhOVbu|V7=?iF=n3b#nI2fKq0 zg>N+54>}v|!k9GGgC+Cr{)5iK$mx8SR9(f^YO8jQRV!g24kjFMVjSX;fJBUk3rR>u z3M{0;4G+9XLpmlP0~a6@KKOAVCL#*~T!d`oAQzKxF(xAqQ;?5KP=KkJhUq9o5oVwm am*O&%pcFGvhFK^_1!g1IYt>esoc-W 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