diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 40b027bf..23ff3b72 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.28290388 + - _EdgeValue: 0.9463588 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.7170961 + - _Opacity: 0.0536412 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset index a02a5bef..08c46a75 100644 --- a/Assets/DefaultVolumeProfile.asset +++ b/Assets/DefaultVolumeProfile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91bf1f93ba9c55d550b64740f3b27f44b2d7902f372a684089ce24ff14e3d120 -size 30813 +oid sha256:f15d4b4de327fcea274fd7fff2afa3f5907697948de0998f0c72fd63a462a93e +size 30877 diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index ed909c27..34ebd5f3 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:765132af93e225010cb5bec70add8109926cd3450bfc95a654e7cdbcbec5c0c0 -size 8020282 +oid sha256:7733e39b790db1fd3e77062f1af9fdef4dfd26e16fe8abeee0d3cf4078e2e6e9 +size 8017547 diff --git a/Assets/Prefabs/BasePrefabsCollection.asset b/Assets/Prefabs/BasePrefabsCollection.asset index 2742cf90..a184f174 100644 --- a/Assets/Prefabs/BasePrefabsCollection.asset +++ b/Assets/Prefabs/BasePrefabsCollection.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:076d565f11855ab0b705da4a4e3578cf5871843baf9d3decb14f76d25fa09471 -size 8900 +oid sha256:1a1e4ed45485b74be25deba9a9fc57fe89fa818f6db0292ca0bcf829a08412ee +size 8270 diff --git a/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab b/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab new file mode 100644 index 00000000..9201f41b --- /dev/null +++ b/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab @@ -0,0 +1,180 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4179914404395760092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4793278966605267409} + - component: {fileID: 3144517396823347096} + - component: {fileID: 5649858463350041749} + m_Layer: 0 + m_Name: ObjectTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4793278966605267409 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179914404395760092} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3144517396823347096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179914404395760092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: acb0592a986cebb4287d41702ab6ea22, type: 3} + m_Name: + m_EditorClassIdentifier: + updateMethod: 0 + _spline: {fileID: 0} + _autoUpdate: 1 + _rotationModifier: + blend: 1 + useClippedPercent: 0 + keys: [] + _offsetModifier: + blend: 1 + useClippedPercent: 0 + keys: [] + _colorModifier: + blend: 1 + useClippedPercent: 0 + keys: [] + _sizeModifier: + blend: 1 + useClippedPercent: 0 + keys: [] + _clipFromSample: + position: {x: 0, y: 0, z: 0} + up: {x: 0, y: 0, z: 0} + forward: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 0} + size: 0 + percent: 0 + _clipToSample: + position: {x: 0, y: 0, z: 0} + up: {x: 0, y: 0, z: 0} + forward: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 0} + size: 0 + percent: 0 + _loopSamples: 0 + _clipFrom: 0 + _clipTo: 1 + animClipFrom: 0 + animClipTo: 1 + multithreaded: 0 + buildOnAwake: 1 + buildOnEnable: 0 + objects: [] + _evaluateOffset: 0 + _spawnMethod: 0 + _spawnCount: 0 + _retainPrefabInstancesInEditor: 1 + _objectPositioning: 0 + _iteration: 0 + _randomSeed: 1 + _minOffset: {x: 0, y: 0, z: 0} + _maxOffset: {x: 0, y: 0, z: 0} + _offsetUseWorldCoords: 0 + _minRotation: {x: 0, y: 0, z: 0} + _maxRotation: {x: 0, y: 0, z: 0} + _uniformScaleLerp: 1 + _minScaleMultiplier: {x: 1, y: 1, z: 1} + _maxScaleMultiplier: {x: 1, y: 1, z: 1} + _shellOffset: 0 + _applyRotation: 0 + _rotateByOffset: 0 + _applyScale: 0 + _objectMethod: 0 + delayedSpawn: 0 + spawnDelay: 0.1 + lastChildCount: 0 + lastPointCount: 0 + spawned: [] + _useCustomObjectDistance: 0 + _minObjectDistance: 0 + _maxObjectDistance: 0 + _customOffsetRule: {fileID: 0} + _customRotationRule: {fileID: 0} + _customScaleRule: {fileID: 0} +--- !u!114 &5649858463350041749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179914404395760092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb900d6a5df01384481372f1fdeca79f, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Ichni.RhythmGame.ObjectTracker + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: elementGuid + Entry: 2 + Data: 00000000000000000000000000000000 + - Name: submoduleList + Entry: 7 + Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + elementName: + tags: [] + parentElement: {fileID: 0} + childElementList: [] + track: {fileID: 0} + objectController: {fileID: 3144517396823347096} + objectPrefab: {fileID: 0} + themeBundleName: + objectName: + playTime: 0 + stopTime: 0 + spawnCount: 0 + positionOffsetMin: {x: 0, y: 0} + positionOffsetMax: {x: 0, y: 0} + customPositionRuleName: + applyRotationOffset: 0 + rotationOffsetMin: {x: 0, y: 0, z: 0} + rotationOffsetMax: {x: 0, y: 0, z: 0} + customRotationRuleName: + applyScaleOffset: 0 + scaleOffsetMin: {x: 1, y: 1, z: 1} + scaleOffsetMax: {x: 1, y: 1, z: 1} + customScaleRuleName: diff --git a/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab.meta b/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab.meta new file mode 100644 index 00000000..b1315132 --- /dev/null +++ b/Assets/Prefabs/GameElements/Track/ObjectTracker.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f0debcd3b25df1546b976a04672d2e6f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special.meta b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special.meta new file mode 100644 index 00000000..a8281388 --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1501ffe885c2449438946c44a354b79d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes new file mode 100644 index 00000000..4d091922 Binary files /dev/null and b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes.meta new file mode 100644 index 00000000..773ec52e --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/Beatmap.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af6f1decfdfe6064587ed356fcd11cc8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes new file mode 100644 index 00000000..1304e159 --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes @@ -0,0 +1,5 @@ ++V›#*‡x­©Ý/›,…²þŽ”¤œ!ý º–dIŸ]íœìâfËþ0a¯± "³l¢ ®•¸00‰æÎ +E£'7“ªÚÛš +‚d`Þ¤•AßžsB.œ¼Ô_ PbÏAõá!<;‡Û‰ØqŸ1 ÔŒg!¨¼ñ SA–w%Hk YÓ¦dp˜FTTÉ·i¹¹ùùdÒXϾ«ŒyNq¿Ñ +ƒµ)ºû¼k$ +šgݨYQø¸$N’0 @Ü“*°¹ðPY \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes.meta new file mode 100644 index 00000000..e7b8fbeb --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/CommandScripts.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7701c20e06b8aa42ba4ef23f0e03491 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes new file mode 100644 index 00000000..984d08d2 --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes @@ -0,0 +1,4 @@ +N¼S,gA-G)Ê9TT/»>’ùÔ?ó ŽL,./ˆç/Q£qlÌF>‘l$ˆ*ݹškÅ.¹kîªF‘=‹Ëß Ô“\ðümâ(>!°-sârv(´ +1(:<Ìö~Þüz:ß î¬Œ  ic‹-3Ð ÍKÛÐñ‡šˆÏ^<Ýäs +~ÖÁU{¹ïàq•ð D\¯pp&±FÜPçRQ\èêȨ ý*|†U™o‰¥‰ Õ™)üüìÊÆìG<_nãé!¸þ]–N…•UÏì¦&²„ëÉC3!Ó$f­ö…®fýŠa•3ýÑ!³Ö}í‘Ð.jKЭ?] +;c¿"YL€Ô•-{?ê;[rãäK€á· ìЇ†òü ŒgJãçm… GyöL±ò@‚UÐ’SšêÛŸÑœîÔ£Ah+°è8qõÞ„™î‹¥·kDŠ×ö€r4•›m ?Á«ªÓ›ÿk3KÌtN \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes.meta new file mode 100644 index 00000000..8e9aa836 --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/ProjectInfo.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 25c731803add7274989b91013dff8639 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes new file mode 100644 index 00000000..4cab8b1f --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes @@ -0,0 +1 @@ +ÎF¯È8uçžÞÚôÕÞ›g¤ §†)R¿—¡¿•ו û>+­2½1år¶P „ D·óPÖ‰8I×Ù­Q5“Vž[#Ž‚Dÿ½z™ kzΉaà9'õÖèø?Â,cþšG}ت#fêð z lüM]DDÿ‡ á²ì×ZÃXøjR1àÞéø8óÄ0µÏŠò¡ÓV®ÁŽ®úí³µªìªœ³­*ý´LèM#VôÁíœ1Þ}£P„w_@?¹•O~7&S9Ÿë(ùè°<µg£ã;ÐÁÍ>ì „j \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes.meta new file mode 100644 index 00000000..ae9bdc3f --- /dev/null +++ b/Assets/Resources/Beatmaps/Chapter0/Space Rain/Special/SongInfo.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb76f0f963b6e3746972c79fa7d00eb6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/Beatmap.bytes index ceba4eee..eb3d97f3 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/CommandScripts.bytes index 7430576b..689ed395 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/CommandScripts.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/CommandScripts.bytes @@ -1 +1,2 @@ -à"朤öï““ÌASãÙŠI§+;ø6ûÝ,¿?¼"yÛ”ÙXbø‹û3ƒMO¨úlB ¨J˜æiAõ*q&_áŽzyþÉ);ã¬"%15v¤åÆoHÄRõÞ×u«|ma’ƒUÅ]äôˆÖ;ž֌ͅS]Å[A«A,ÞS.ÊâŠÝ<‹¡q2fOÙ¥¡XU™¬ùãR2“*S+ÀSqÃÀàôæ OôÍù5|ü_@4UæïÈ-[W!ª5† ÷Ž¥ªS¢ \ No newline at end of file +ɉý‚¢}‰cá~ݪ›­Á¬ƒµ®ÕÿoU¸#ŽÑb1h><¢I—wÿwé»»»éÏ× Ú}°°!í…ÑÝ¥ÇhÉóûÍñi`âž:ů”Ø1®ª@ªX¡Mçj†V +Â~É#™r9„«q×Úïò¿Žà§j[{Ì“ÿ‚鮯_æós‘Ø‚“ì¾Ëuz—µ¤Îì±·Ç£ÕÇñ–ûKbp·iÊ‚;ŒÂøüì åVQ>ÏÏ©qÈ~]AïÛ¨>ˆ \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/ProjectInfo.bytes index 5c4826a8..a3f5d60f 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/SongInfo.bytes index 2eb3bd6a..32c5f0a6 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Your Shadow/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Chapter0.asset b/Assets/Resources/Chapter0.asset index 7f6b6924..b4541fc3 100644 --- a/Assets/Resources/Chapter0.asset +++ b/Assets/Resources/Chapter0.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:690164213dc2f9ba58980cf3971c9a75dfb490d3be362cd6f715680d4bb854da -size 14632 +oid sha256:8f59be91981810dd5d5a9d6051a932feace3b5f9cb1a35e961bfde75a66fb87b +size 14835 diff --git a/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs b/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs new file mode 100644 index 00000000..81f79bc3 --- /dev/null +++ b/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Ichni.RhythmGame.Beatmap +{ + public class ObjectTracker_BM : GameElement_BM + { + public string themeBundleName; + public string objectName; + + public float playTime; + public float stopTime; + + public int spawnCount; + public Vector2 positionOffsetMin; + public Vector2 positionOffsetMax; + public string customPositionRuleName; + + public bool applyRotationOffset; + public Vector3 rotationOffsetMin; + public Vector3 rotationOffsetMax; + public string customRotationRuleName; + + public bool applyScaleOffset; + public Vector3 scaleOffsetMin; + public Vector3 scaleOffsetMax; + public string customScaleRuleName; + + public ObjectTracker_BM() + { + + } + + public ObjectTracker_BM(string elementName, Guid elementGuid, List tags, GameElement_BM attachedElement, + string themeBundleName, string objectName, + float playTime, float stopTime, + int spawnCount, + Vector2 positionOffsetMin, Vector2 positionOffsetMax, string customPositionRuleName, + bool applyRotationOffset, Vector3 rotationOffsetMin, Vector3 rotationOffsetMax, string customRotationRuleName, + bool applyScaleOffset, Vector3 scaleOffsetMin, Vector3 scaleOffsetMax, string customScaleRuleName) + : base(elementName, elementGuid, tags, attachedElement) + { + this.themeBundleName = themeBundleName; + this.objectName = objectName; + + this.playTime = playTime; + this.stopTime = stopTime; + + this.spawnCount = spawnCount; + this.positionOffsetMin = positionOffsetMin; + this.positionOffsetMax = positionOffsetMax; + this.customPositionRuleName = customPositionRuleName; + + this.applyRotationOffset = applyRotationOffset; + this.rotationOffsetMin = rotationOffsetMin; + this.rotationOffsetMax = rotationOffsetMax; + this.customRotationRuleName = customRotationRuleName; + + this.applyScaleOffset = applyScaleOffset; + this.scaleOffsetMin = scaleOffsetMin; + this.scaleOffsetMax = scaleOffsetMax; + this.customScaleRuleName = customScaleRuleName; + } + + public override void ExecuteBM() + { + matchedElement = ObjectTracker.GenerateElement( + elementName, elementGuid, tags, false, + GetElement(attachedElementGuid) as Track, + themeBundleName, objectName, + spawnCount, + positionOffsetMin, positionOffsetMax, customPositionRuleName, + applyRotationOffset, rotationOffsetMin, rotationOffsetMax, customRotationRuleName, + applyScaleOffset, scaleOffsetMin, scaleOffsetMax, customScaleRuleName); + } + } +} diff --git a/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs.meta b/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs.meta new file mode 100644 index 00000000..16e91534 --- /dev/null +++ b/Assets/Scripts/DataCore/GameElements_BM/Track/ObjectTracker_BM.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 70dc1a61f3299c642b9c9775d8446595 \ No newline at end of file diff --git a/Assets/Scripts/Game/GameElements/Essential/GameCamera.cs b/Assets/Scripts/Game/GameElements/Essential/GameCamera.cs index 1f283f90..d672e84e 100644 --- a/Assets/Scripts/Game/GameElements/Essential/GameCamera.cs +++ b/Assets/Scripts/Game/GameElements/Essential/GameCamera.cs @@ -57,16 +57,23 @@ namespace Ichni.RhythmGame gameCamera.orthographicSize = orthographicSize; gameCamera.cameraTransform = gameCamera.transform; - float ratioDifference = UIManager.GetScreenRatio() - UIManager.StandardRatio; - if (ratioDifference > 0) + float currentAspect = UIManager.GetScreenRatio(); + float targetAspect = UIManager.StandardRatio; + + if (currentAspect < targetAspect) { - //gameCamera.perspectiveOffset = 12.5f * ratioDifference; + // å±å¹•æ¯”较方 (如 4:3 å¹³æ¿)，需è¦å¢žåŠ åž‚ç›´ FOV 以ä¿æŒ 16:9 标准下的水平ç»å¯¹è§†é‡Ž + float hFovRad = 2.0f * Mathf.Atan(Mathf.Tan(perspectiveAngle * Mathf.Deg2Rad / 2.0f) * targetAspect); + float newVFovRad = 2.0f * Mathf.Atan(Mathf.Tan(hFovRad / 2.0f) / currentAspect); + + // 设置 perspectiveOffset 以完美补足被è£åˆ‡çš„空间 + gameCamera.perspectiveOffset = (newVFovRad * Mathf.Rad2Deg) - perspectiveAngle; } else { - gameCamera.perspectiveOffset = -25f * ratioDifference; + // å±å¹•æ¯”较长 (如 20:9 手机)，维æŒåŽŸæœ‰åž‚ç›´ FOV，左å³å»¶å±•å±å¹•ç”¨äºŽæ¸²æŸ“环境背景 + gameCamera.perspectiveOffset = 0f; } - gameCamera.RefreshFOV(); return gameCamera; } diff --git a/Assets/Scripts/Game/GameElements/Essential/GameElement.cs b/Assets/Scripts/Game/GameElements/Essential/GameElement.cs index 0772e8e5..4289717d 100644 --- a/Assets/Scripts/Game/GameElements/Essential/GameElement.cs +++ b/Assets/Scripts/Game/GameElements/Essential/GameElement.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace Ichni.RhythmGame { - public abstract partial class GameElement : SerializedMonoBehaviour, IBaseElement, IComparable + public abstract partial class GameElement : SerializedMonoBehaviour, IBaseElement, IComparable, IScheduledElement { #region [属性和标记] Essential & Tracking Info //物体å @@ -145,6 +145,19 @@ namespace Ichni.RhythmGame return HierarchyPriority.CompareTo(other.HierarchyPriority); } #endregion + + #region [调度更新] IScheduledElement Implementation + /// + /// ç”± ElementUpdateScheduler 在对应阶段调用。 + /// å­ç±»æŒ‰éœ€é‡å†™ä»¥å®žçŽ°ç‰¹å®šé˜¶æ®µçš„更新逻辑。 + /// + public virtual void ScheduledUpdate(UpdatePhase phase, float songTime) { } + + /// + /// 元素是å¦å¤„于活跃状æ€ã€‚调度器跳过éžæ´»è·ƒå…ƒç´ ä»¥èŠ‚çœå¼€é”€ã€‚ + /// + public virtual bool IsScheduledActive => isActiveAndEnabled; + #endregion } #region [é¢å¤–交互åŠå­˜æ¡£é‡å†™é¢„ç•™] Editor Interaction & Interfaces Overrides diff --git a/Assets/Scripts/Game/GameElements/Track/Trackers/ObjectTracker.cs b/Assets/Scripts/Game/GameElements/Track/Trackers/ObjectTracker.cs index 42b2eb47..aae883ad 100644 --- a/Assets/Scripts/Game/GameElements/Track/Trackers/ObjectTracker.cs +++ b/Assets/Scripts/Game/GameElements/Track/Trackers/ObjectTracker.cs @@ -1,5 +1,137 @@ +using System; +using System.Collections.Generic; +using Dreamteck.Splines; using UnityEngine; -public class ObjectTracker : MonoBehaviour +namespace Ichni.RhythmGame { + public partial class ObjectTracker : GameElement + { + #region [è¿è¡Œæ—¶ç¼“存数æ®] Property Caches + public Track track; + public ObjectController objectController; + public GameObject objectPrefab; + private List themeBundleList; + private List objectNameList; + public string themeBundleName; + public string objectName; + + public float playTime; + public float stopTime; + + public int spawnCount; + public Vector2 positionOffsetMin = Vector2.zero; + public Vector2 positionOffsetMax = Vector2.zero; + public string customPositionRuleName; + + public bool applyRotationOffset = false; + public Vector3 rotationOffsetMin = Vector3.zero; + public Vector3 rotationOffsetMax = Vector3.zero; + public string customRotationRuleName; + + public bool applyScaleOffset = false; + public Vector3 scaleOffsetMin = Vector3.one; + public Vector3 scaleOffsetMax = Vector3.one; + public string customScaleRuleName; + #endregion + + #region [生æˆä¸Žåˆå§‹åŒ–] Generation & Initialization + public static ObjectTracker GenerateElement(string elementName, Guid id, List tags, + bool isFirstGenerated, Track track, string themeBundleName, string objectName, int spawnCount, + Vector2 positionOffsetMin, Vector2 positionOffsetMax, string customPositionRuleName, + bool applyRotationOffset, Vector3 rotationOffsetMin, Vector3 rotationOffsetMax, string customRotationRuleName, + bool applyScaleOffset, Vector3 scaleOffsetMin, Vector3 scaleOffsetMax, string customScaleRuleName) + { + ObjectTracker objectTracker = Instantiate(GameManager.Instance.basePrefabs.objectTracker, track.transform) + .GetComponent(); + objectTracker.objectPrefab = ThemeBundleManager.instance.GetObject(themeBundleName, objectName); + + objectTracker.objectController.objects = new[] { objectTracker.objectPrefab }; + objectTracker.Initialize(elementName, id, tags, isFirstGenerated, track); + objectTracker.track = track; + objectTracker.objectController.spline = track.trackPathSubmodule.path; + objectTracker.themeBundleList = ThemeBundleManager.instance.loadedThemeBundleList.ConvertAll(x => x.themeBundleName); + objectTracker.objectNameList = new List(); + objectTracker.themeBundleName = themeBundleName; + objectTracker.objectName = objectName; + objectTracker.SetSpawnSettings(spawnCount, + positionOffsetMin, positionOffsetMax, customPositionRuleName, + applyRotationOffset, rotationOffsetMin, rotationOffsetMax, customRotationRuleName, + applyScaleOffset, scaleOffsetMin, scaleOffsetMax, customScaleRuleName); + + if (isFirstGenerated) objectTracker.AfterInitialize(); + return objectTracker; + } + + public override void AfterInitialize() + { + base.AfterInitialize(); + // å‘ ElementUpdateScheduler 注册 Phase.TrackFollower + CoreServices.UpdateScheduler.Register(UpdatePhase.TrackFollower, this); + } + + public void SetSpawnSettings(int spawnCount, + Vector2 positionOffsetMin, Vector2 positionOffsetMax, string customPositionRuleName, + bool applyRotationOffset, Vector3 rotationOffsetMin, Vector3 rotationOffsetMax, string customRotationRuleName, + bool applyScaleOffset, Vector3 scaleOffsetMin, Vector3 scaleOffsetMax, string customScaleRuleName) + { + this.spawnCount = spawnCount; + this.positionOffsetMin = positionOffsetMin; + this.positionOffsetMax = positionOffsetMax; + this.customPositionRuleName = customPositionRuleName; + this.applyRotationOffset = applyRotationOffset; + this.rotationOffsetMin = rotationOffsetMin; + this.rotationOffsetMax = rotationOffsetMax; + this.customRotationRuleName = customRotationRuleName; + this.applyScaleOffset = applyScaleOffset; + this.scaleOffsetMin = scaleOffsetMin; + this.scaleOffsetMax = scaleOffsetMax; + this.customScaleRuleName = customScaleRuleName; + + objectController.spawnCount = spawnCount; + objectController.minOffset = positionOffsetMin; + objectController.maxOffset = positionOffsetMax; + + objectController.applyRotation = applyRotationOffset; + objectController.minRotation = rotationOffsetMin; + objectController.maxRotation = rotationOffsetMax; + + objectController.applyScale = applyScaleOffset; + objectController.minScaleMultiplier = scaleOffsetMin; + objectController.maxScaleMultiplier = scaleOffsetMax; + + objectController.Spawn(); + } + #endregion + + #region [è¿è¡Œæ—¶æŽ§åˆ¶] Update + /// + /// IScheduledElement 实现：在 Phase.TrackFollower 阶段控制 objectController çš„å¯ç”¨/ç¦ç”¨ã€‚ + /// + public override void ScheduledUpdate(UpdatePhase phase, float songTime) + { + if (phase == UpdatePhase.TrackFollower) + { + if (playTime > songTime || stopTime < songTime) + { + if (objectController.enabled) + objectController.enabled = false; + } + else + { + if (!objectController.enabled) + { + objectController.enabled = true; + objectController.Spawn(); + } + } + } + } + + public override void OnDelete() + { + CoreServices.UpdateScheduler.Unregister(UpdatePhase.TrackFollower, this); + } + #endregion + } } diff --git a/Assets/Scripts/Manager/BasePrefabsCollection.cs b/Assets/Scripts/Manager/BasePrefabsCollection.cs index 92af9663..942a38ca 100644 --- a/Assets/Scripts/Manager/BasePrefabsCollection.cs +++ b/Assets/Scripts/Manager/BasePrefabsCollection.cs @@ -21,6 +21,7 @@ public partial class BasePrefabsCollection : SerializedScriptableObject public GameObject crossTrackPoint; public GameObject trackPercentPoint; public GameObject trackHeadPoint; + public GameObject objectTracker; [Title("Trail相关")] public GameObject trail; public Material defaultTrailMaterial; diff --git a/Assets/Scripts/UI/StartPage/StartUIPage.cs b/Assets/Scripts/UI/StartPage/StartUIPage.cs index b101c745..a1ea1bb3 100644 --- a/Assets/Scripts/UI/StartPage/StartUIPage.cs +++ b/Assets/Scripts/UI/StartPage/StartUIPage.cs @@ -44,7 +44,7 @@ namespace Ichni.UI AudioManager.Post(AK.EVENTS.TOUCHTOSTART); // 已有登录缓存 → 跳过 LoginPage，直接进入章节选择 - if (LoginCacheManager.HasValidSession) + //if (LoginCacheManager.HasValidSession) { FadeOut(); floatingParticles.GetComponent().material.DOColor(Color.clear, "_BaseColor", 0.5f).Play(); diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index d2ac9a60..fddb979c 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09413b95b02a1b93ec133a17c99f28ac1b9fb2c9e0a9e5760c2fd93a406a526a -size 7520 +oid sha256:87cd4916053948bb199abd845da9a0d44dcf19349d7a3715b4b1405bf53fcf77 +size 7585 diff --git a/Assets/Shaders/ScriptablePostProcessor/Base/InternalShaderHelpers.cs b/Assets/Shaders/ScriptablePostProcessor/Base/InternalShaderHelpers.cs index fe7ce27d..e886ea4f 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Base/InternalShaderHelpers.cs +++ b/Assets/Shaders/ScriptablePostProcessor/Base/InternalShaderHelpers.cs @@ -60,7 +60,10 @@ namespace Echovoid.Runtime.Behavior.Rendering public static readonly int _BloomParams = Shader.PropertyToID("_BloomParams"); public static readonly int _BloomTint = Shader.PropertyToID("_BloomTint"); public static readonly int _AnimeBloom_BlurRadius = Shader.PropertyToID("_BlurRadius"); + public static readonly int _AnimeBloom_KernelScale = Shader.PropertyToID("_KernelScale"); public static readonly int _BloomTex = Shader.PropertyToID("_BloomTex"); + public static readonly int _SourceTexLowMip = Shader.PropertyToID("_SourceTexLowMip"); + public static readonly int _BloomScatterParams = Shader.PropertyToID("_BloomScatterParams"); // --- Anime ACES --- public static readonly int _TonemapParams = Shader.PropertyToID("_TonemapParams"); diff --git a/Assets/Shaders/ScriptablePostProcessor/Shaders/AnimeBloom.shader b/Assets/Shaders/ScriptablePostProcessor/Shaders/AnimeBloom.shader index e2a3aa1b..e1de6905 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Shaders/AnimeBloom.shader +++ b/Assets/Shaders/ScriptablePostProcessor/Shaders/AnimeBloom.shader @@ -9,118 +9,170 @@ Shader "SLS/Postprocessing/AnimeBloom" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" #include "Packages/com.unity.render-pipelines.core/Runtime/Utilities/Blit.hlsl" - // --- å‚数定义 --- - float4 _BloomParams; // x: Intensity, y: Threshold, z: SoftKnee, w: Clamp - float4 _BloomTint; // 泛光染色 - float _BlurRadius; // 模糊扩散åŠå¾„ (控制光晕大å°çš„关键) + // ===================================================== + // å‚数定义（与 Unity 原生 Bloom.shader 对é½ï¼‰ + // ===================================================== + // _BloomScatterParams: + // x: scatter (å·²ç»è¿‡ C# 侧 Lerp(0.05, 0.95, userValue) 映射) + // y: clamp (最大亮度é™åˆ¶ï¼Œé˜²è¤ç«è™«) + // z: threshold (线性空间，C# ä¾§å·²åš GammaToLinear) + // w: thresholdKnee (= threshold * 0.5fï¼Œç¡¬ç¼–ç  soft knee) + float4 _BloomScatterParams; + #define Scatter _BloomScatterParams.x + #define ClampMax _BloomScatterParams.y + #define Threshold _BloomScatterParams.z + #define ThresholdKnee _BloomScatterParams.w - // çº¹ç† + // Composite 阶段å‚数：x=intensity, y/z/w=tint.rgb (已归一化亮度) + float4 _BloomParams; + float4 _BloomTint; // ä¿ç•™å…¼å®¹ï¼Œä¸å†ä½¿ç”¨ + + float _KernelScale; // 采样跨度放大乘数，默认 1.0 + + // SourceTexLowMip: upsample 时的"低频大光晕"çº¹ç† (lowMip) + TEXTURE2D(_SourceTexLowMip); + SAMPLER(sampler_SourceTexLowMip); + + // 最终 bloom 结果纹ç†ï¼ˆä¼ å…¥ Composite Pass） TEXTURE2D(_BloomTex); SAMPLER(sampler_BloomTex); - // --- 辅助函数：Prefilter (æå–高亮) --- - half3 Prefilter(half3 color) + // ===================================================== + // HDR 编解ç ï¼ˆä¸Ž Unity 原生 Bloom.shader 完全一致） + // 在线性工作æµä¸‹ encode/decode 是 no-op，但写清楚以防 gamma 空间项目 + // ===================================================== + half4 EncodeHDR(half3 color) { - float threshold = _BloomParams.y; - float softKnee = _BloomParams.z; - float clampVal = _BloomParams.w; - - // 1. é™åˆ¶æœ€å¤§äº®åº¦ (防闪çƒ/è¤ç«è™«å™ªç‚¹) - color = min(color, clampVal); - - // 2. 阈值计算 (使用 Soft Knee 曲线让过渡更自然) - // 标准公å¼ï¼š(Brightness - Threshold) / max(Brightness, 0.0001) - // 这里使用一个更平滑的曲线版本，防止高光边缘切å˜å¤ªç¡¬ - float brightness = Max3(color.r, color.g, color.b); - float soft = brightness - threshold + softKnee; - soft = clamp(soft, 0, 2 * softKnee); - soft = soft * soft / (4 * softKnee + 1e-4); - - float contribution = max(soft, brightness - threshold); - contribution /= max(brightness, 1e-4); - - return color * contribution; - } - - // --- Pass 0: Prefilter --- - half4 FragPrefilter(Varyings input) : SV_Target - { - // 采样原图 - half4 color = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, input.texcoord); - // æå–高亮 - half3 bloom = Prefilter(color.rgb); - return half4(bloom, 1.0); - } - - // --- Pass 1: Downsample (Kawase 4-Tap) --- - // é™é‡‡æ ·ï¼šå– 4 个对角åƒç´ çš„å¹³å‡å€¼ï¼ŒèŒƒå›´éšåˆ†è¾¨çŽ‡é™ä½Žè€Œæ‰©å¤§ - half4 FragDownsample(Varyings input) : SV_Target - { - float2 uv = input.texcoord; - float4 texelSize = _BlitTexture_TexelSize; - - // 原生的 Kawase Offset 是 1.0ï¼ˆå³ 0.5 个对角åƒç´ è·ç¦»ï¼‰ï¼Œ - // 这里加入 _BlurRadius 按比例扩大步幅，能够使用 3 次迭代跑出原版 6 次的扩散é¢ç§¯ - float spreadOffset = 1.0 + _BlurRadius * 0.5; - float2 offset = texelSize.xy * spreadOffset; - - half3 c0 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv - offset).rgb; - half3 c1 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(offset.x, -offset.y)).rgb; - half3 c2 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv - float2(offset.x, -offset.y)).rgb; - half3 c3 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + offset).rgb; - - half3 color = (c0 + c1 + c2 + c3) * 0.25; + #if UNITY_COLORSPACE_GAMMA + color = sqrt(color); + #endif return half4(color, 1.0); } - TEXTURE2D(_BloomMipDown); - SAMPLER(sampler_BloomMipDown); - - // --- Pass 2: Upsample (Kawase 4-Tap + Scatter) --- - half4 FragUpsample(Varyings input) : SV_Target + half3 DecodeHDR(half4 data) { - float2 uv = input.texcoord; - float4 texelSize = _BlitTexture_TexelSize; - - // 原生的 Kawase å‡é‡‡æ ·å移是 0.5。 - // é…åˆå®½å¹…é™é‡‡æ ·ï¼Œè¿™é‡Œç¨å¾®æ”¾å¤§ä¸€ç‚¹ç‚¹å°±å¯ä»¥èŽ·å¾—éžå¸¸æŸ”顺的大é¢ç§¯æ³›å…‰ - float spreadOffset = 0.5 + _BlurRadius * 0.2; - float2 offset = texelSize.xy * spreadOffset; - - // 4-Tap ä»Žæ›´ä½Žåˆ†è¾¨çŽ‡çº¹ç† (Up[i+1]) 采样外围光晕 - half3 c0 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv - offset * float2(1, 1)).rgb; - half3 c1 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + offset * float2(1, -1)).rgb; - half3 c2 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv - offset * float2(1, -1)).rgb; - half3 c3 = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + offset * float2(1, 1)).rgb; - half3 lowRes = (c0 + c1 + c2 + c3) * 0.25; - - // 采样当å‰å±‚çº§çš„é«˜æ¸…çº¹ç† (Down[i]) - half3 highRes = SAMPLE_TEXTURE2D_X(_BloomMipDown, sampler_LinearClamp, uv).rgb; - - // ã€å®Œå…¨å¤åˆ» Unity 原生逻辑】： highRes + lowRes * scatter - // 这既ä¿è¯äº†å…‰æ™•å‘外漫射（低迭代扩散广），åˆä¿è¯äº†æ ¸å¿ƒäº®åŒºçš„能é‡å®ˆæ’ï¼ - float scatter = saturate(_BlurRadius); - half3 bloom = highRes + lowRes * scatter; - - return half4(bloom, 1.0); + half3 color = data.xyz; + #if UNITY_COLORSPACE_GAMMA + color *= color; + #endif + return color; } - // --- Pass 3: Composite (最终åˆæˆ) --- + // ===================================================== + // Pass 0: Prefilter — æå–超过阈值的高亮åƒç´  + // 与原生完全一致的 soft knee å…¬å¼ + // ===================================================== + half4 FragPrefilter(Varyings input) : SV_Target + { + float2 uv = input.texcoord; + half3 color = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv)); + + // 1. 亮度钳制（防止æžäº®è¤ç«è™«åƒç´ è·³å˜ï¼‰ + color = min(color, ClampMax); + + // 2. Soft Knee 阈值（与 Unity 原生公å¼å®Œå…¨ä¸€è‡´ï¼‰ + half brightness = Max3(color.r, color.g, color.b); + half softness = clamp(brightness - Threshold + ThresholdKnee, 0.0, 2.0 * ThresholdKnee); + softness = (softness * softness) / (4.0 * ThresholdKnee + 1e-4); + half multiplier = max(brightness - Threshold, softness) / max(brightness, 1e-4); + color *= multiplier; + + // 3. 防止 NaN 传播（负值在 EncodeHDR sqrt 时会产生 NaN） + color = max(color, 0); + + return EncodeHDR(color); + } + + // ===================================================== + // Pass 1: Dual Kawase Downsample + // å…¬å¼ï¼š1/8 * (center*4 + 4corners) + // 采样次数：5次（相当于 3×3 box + åŒçº¿æ€§æƒé‡ï¼Œæ•ˆæžœéžå¸¸æŸ”和） + // 与 Unity 原生 Bloom.shader FragDualDownsample 完全一致 + // ===================================================== + half4 FragDualDownsample(Varyings input) : SV_Target + { + float2 uv = input.texcoord; + // 乘以 _KernelScale，在æžä½Žè¿­ä»£æ¬¡æ•°ä¸‹å¼ºåˆ¶å‘外大跨步拉扯光晕 + float2 ts = _BlitTexture_TexelSize.xy * _KernelScale; + + // 中心点（æƒé‡ 4） + half3 c0 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv)); + + // 4 个对角åç§»å„ 0.5 åƒç´ ï¼ˆæ°å¥½è½åœ¨ 4 åƒç´ çš„åŒçº¿æ€§æ’值中心） + half3 c1 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.5, 0.5) * ts)); + half3 c2 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(-0.5, 0.5) * ts)); + half3 c3 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(-0.5, -0.5) * ts)); + half3 c4 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.5, -0.5) * ts)); + + // 加æƒå¹³å‡ï¼š(c0*4 + c1+c2+c3+c4) / 8 + half3 color = (1.0 / 8.0) * (c0 * 4.0 + c1 + c2 + c3 + c4); + return EncodeHDR(color); + } + + // ===================================================== + // Pass 2: Dual Kawase Upsample + Energy-Conserving Lerp + // + // 关键核心：与 Unity 原生 FragUpsample 一致的混åˆå…¬å¼ + // result = lerp(highMip, lowMip, Scatter) + // + // highMip (_BlitTexture) = 当å‰å±‚çš„é™é‡‡æ ·çº¹ç† Down[i]（高分辨率，细节） + // lowMip (_SourceTexLowMip) = 上一层的å‡é‡‡æ ·ç»“æžœ Up[i+1]（低分辨率，扩散光晕） + // + // lerp 是能é‡å®ˆæ’的：总亮度 = (1-s)*high + s*low，永远 ≤ max(high,low) + // 这是防止"死白"çš„æ•°å­¦ä¿è¯ã€‚ + // ===================================================== + half4 FragDualUpsample(Varyings input) : SV_Target + { + float2 uv = input.texcoord; + // åŒæ ·ä¹˜ä»¥ _KernelScale + float2 ts = _BlitTexture_TexelSize.xy * _KernelScale; + + // Dual Kawase 8-tap å‡é‡‡æ ·ï¼š4 对角 + 4 正交 + // 正交è·ç¦» = 1.0 texel，对角è·ç¦» = 0.5 texel（与原生完全一致） + half3 c1 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.5, 0.5) * ts)); + half3 c2 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(-0.5, 0.5) * ts)); + half3 c3 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(-0.5, -0.5) * ts)); + half3 c4 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.5, -0.5) * ts)); + + half3 c5 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2(-1.0, 0.0) * ts)); + half3 c6 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 1.0, 0.0) * ts)); + half3 c7 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.0, 1.0) * ts)); + half3 c8 = DecodeHDR(SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv + float2( 0.0, -1.0) * ts)); + + // 加æƒå¹³å‡ (4角×2 + 4正交×1) / 12，产生柔和的钟形分布 + half3 highMip = (1.0 / 12.0) * ((c1 + c2 + c3 + c4) * 2.0 + c5 + c6 + c7 + c8); + + // lowMip = æ¥è‡ªæ›´ä½Žåˆ†è¾¨çŽ‡å±‚（Up[i+1]）的扩散光晕，åŒçº¿æ€§é‡‡æ · + half3 lowMip = DecodeHDR(SAMPLE_TEXTURE2D(_SourceTexLowMip, sampler_LinearClamp, uv)); + + // ã€æ ¸å¿ƒå…¬å¼ï¼Œä¸ŽåŽŸç”Ÿå®Œå…¨ä¸€è‡´ã€‘ + // Scatter 控制光晕扩散程度：0=åªæœ‰å½“å‰å±‚细节，1=完全使用模糊层 + // 始终能é‡å®ˆæ’，ç»å¯¹ä¸ä¼šäº§ç”Ÿæ­»ç™½ + half3 result = lerp(highMip, lowMip, Scatter); + return EncodeHDR(result); + } + + // ===================================================== + // Pass 3: Composite — 将最终 bloom å åŠ å›žåŽŸå§‹ç”»é¢ + // _BloomParams.x = intensity + // _BloomParams.yzw = tint.rgb (亮度已归一化，仅æºå¸¦è‰²ç›¸/饱和度) + // ===================================================== half4 FragComposite(Varyings input) : SV_Target { float2 uv = input.texcoord; - - // åŽŸå§‹ç”»é¢ + + // 原始 HDR ç”»é¢ half4 baseColor = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uv); - - // 泛光结果 (ç»è¿‡å¤šæ¬¡å‡é‡‡æ ·åŽçš„最终纹ç†) - half3 bloom = SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv).rgb; - // 应用强度和染色 - bloom *= _BloomParams.x * _BloomTint.rgb; + // Bloom 纹ç†ï¼ˆå·²ç»è¿‡å¤šè½® Dual Kawase å‡é™é‡‡æ ·ï¼‰ + half3 bloom = DecodeHDR(SAMPLE_TEXTURE2D(_BloomTex, sampler_BloomTex, uv)); - // å åŠ  (Additive) - // 也å¯ä»¥å°è¯• Screen æ··åˆæ¨¡å¼è®©å…‰å˜å¾—更柔和，但 Additive 最符åˆç‰©ç†å‘å…‰ + // 应用强度和染色（_BloomParams.yzw 是亮度归一化的 tint） + float intensity = _BloomParams.x; + half3 tint = _BloomParams.yzw; + bloom *= intensity * tint; + + // Additive åˆå¹¶ï¼ˆç‰©ç†æ­£ç¡®çš„å‘å…‰å åŠ ï¼‰ return half4(baseColor.rgb + bloom, baseColor.a); } @@ -129,9 +181,9 @@ Shader "SLS/Postprocessing/AnimeBloom" SubShader { Tags { "RenderType"="Opaque" "RenderPipeline"="UniversalPipeline" } - ZWrite Off Cull Off + ZWrite Off Cull Off ZTest Always - // 0: Prefilter + // Pass 0: Prefilter Pass { Name "Bloom Prefilter" @@ -141,28 +193,27 @@ Shader "SLS/Postprocessing/AnimeBloom" ENDHLSL } - // 1: Downsample + // Pass 1: Dual Kawase Downsample Pass { - Name "Bloom Downsample" + Name "Bloom Dual Downsample" HLSLPROGRAM #pragma vertex Vert - #pragma fragment FragDownsample + #pragma fragment FragDualDownsample ENDHLSL } - // 2: Upsample + // Pass 2: Dual Kawase Upsample + lerp(high, low, scatter) Pass { - Name "Bloom Upsample" - // 已在内部 Lerp，无需外部 Additive Blend + Name "Bloom Dual Upsample" HLSLPROGRAM #pragma vertex Vert - #pragma fragment FragUpsample + #pragma fragment FragDualUpsample ENDHLSL } - // 3: Composite + // Pass 3: Composite Pass { Name "Bloom Composite" diff --git a/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs b/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs index b2332993..10c9e10e 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs +++ b/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs @@ -8,39 +8,50 @@ namespace SLSUtilities.Rendering.PostProcessing [System.Serializable, VolumeComponentMenu("SLS/Postprocessing/Anime Bloom")] public class AnimeBloom : ScriptablePostProcessorVolume { - // ã€æ ¸å¿ƒä¿®æ”¹ã€‘：放在 ToneMapping 之å‰æ‰§è¡Œï¼ˆBeforePostProcess），é…åˆ ACES æ‰èƒ½å½»åº•è§£å†³â€œé«˜å…‰æ³›ç™½â€é—®é¢˜ + // BeforePostProcess: 在 ToneMapping 之å‰è¿è¡Œï¼Œç¡®ä¿ HDR bloom 颜色ä¸è¢«æˆªæ–­ + // 这与 Unity 原生 Bloom 的执行阶段完全一致 public override CustomPostProcessInjectionPoint InjectionPoint => CustomPostProcessInjectionPoint.BeforePostProcess; - public override int OrderInInjectionPoint => 5; // 放在 Vignette ä¹‹å‰ + public override int OrderInInjectionPoint => 5; [Header("Glow Settings")] - [Tooltip("泛光强度。值越大越亮。")] - public ClampedFloatParameter intensity = new(0f, 0f, 10f); + public ClampedFloatParameter intensity = new(1f, 0f, 10f); - [Tooltip("阈值。亮度超过此值的åƒç´ æ‰ä¼šå‘光。\n关键：设为 1.1 å¯ä»¥è¿‡æ»¤æŽ‰ç™½å¢™(1.0)，åªè®©ç¯å…‰å‘光。")] - public MinFloatParameter threshold = new(1.1f, 0f); // 默认设为 1.1 + // 注æ„：threshold 在 Gamma 空间中设置，C# 侧会转为 Linear。 + // 0.9 在 gamma 空间 ≈ 0.79 在 linear 空间，这与 Unity 原生默认行为完全一致。 + public MinFloatParameter threshold = new(0.9f, 0f); - [Tooltip("æŸ”è† (Soft Knee)。让阈值过渡更平滑，é¿å…高光边缘有硬切痕迹。")] - public ClampedFloatParameter softKnee = new(0.5f, 0f, 1f); + [Header("Scatter")] + // scatter 在 [0,1] 范围内由用户设置。 + // C# 侧映射：Mathf.Lerp(0.05f, 0.95f, scatter.value)，与 Unity 原生完全一致。 + // 低值 = 光晕èšæ‹¢ï¼Œé«˜å€¼ = 光晕å‘外大范围扩散。 + public ClampedFloatParameter scatter = new(0.7f, 0f, 1f); - [Tooltip("最大亮度钳制。防止æžäº®åƒç´ ï¼ˆå¦‚太阳）产生乱跳的噪点。")] - public MinFloatParameter clamp = new(65472f, 1f); // 默认很大，基本ä¸é™åˆ¶ + public MinFloatParameter clamp = new(65472f, 1f); - [Header("Anime Style")] - [Tooltip("扩散åŠå¾„。ç¨å¾®å¢žåŠ æ‰©å±•èŒƒå›´æ¥å¼¥è¡¥ä½Žè¿­ä»£å¸¦æ¥çš„å‘å…‰ä¸è¶³ã€‚")] - public ClampedFloatParameter scatter = new(0.85f, 0f, 5f); // 推è增é‡ä»¥é€‚应低迭代 + [Header("Iterations")] + // 迭代次数：Dual Kawase æ¯å±‚åªéœ€ 1 Pass，性能远低于原生åŒè¶Ÿé«˜æ–¯ã€‚ + // 4 次迭代 Dual Kawase ≈ 原生 6 次åŒè¶Ÿé«˜æ–¯çš„扩散范围，但 Pass æ•°åªæœ‰å…¶ 1/3。 + public ClampedIntParameter diffusion = new(4, 1, 8); - [Tooltip("迭代次数。针对移动端带宽优化，建议控制在 2~3 次。")] - public ClampedIntParameter diffusion = new(3, 1, 4); // 移动端性能优化，最高4次 + [Header("Optimization (Mobile)")] + [Tooltip("åˆå§‹é™é‡‡æ ·å€çŽ‡ï¼ˆé¦–趟大幅压缩分辨率）。\n1=原生åŠåˆ†è¾¨çŽ‡(1/2)ï¼›2=1/4分辨率；3=1/8分辨率。\n调大此值å¯ç”¨æžä½Žçš„è¿­ä»£æ¬¡æ•°è·‘å‡ºå·¨å¤§ä¸”æŸ”å’Œçš„å…‰æ™•ï¼Œå¤§å¹…èŠ‚çœ GPU 带宽。")] + public ClampedIntParameter initialDownscaleShift = new(1, 1, 3); + + [Tooltip("采样å移跨度放大（Kernel Scale）。\n1.0=原生标准跨度。适度放大(如1.2-1.5)å¯æ‹‰æ‰¯å…‰æ™•æ‰©æ•£èŒƒå›´ï¼Œä½†è¿‡å¤§ä¼šäº§ç”Ÿè½»å¾®å字星/方格马赛克。")] + public ClampedFloatParameter kernelScale = new(1.0f, 0.5f, 3.0f); - [Tooltip("泛光染色。å¯ä»¥åšç²‰è‰²éœ“虹ã€è“色科技光等效果。")] + [Header("Tint")] + // tint 染色：C# 侧会归一化亮度（åªä¿ç•™è‰²ç›¸/饱和度），与原生行为一致。 + // 这样调整 tint 颜色ä¸ä¼šæ„å¤–æ”¹å˜ bloom 总亮度。 public ColorParameter tint = new(Color.white, true, true, true); - // 内部使用的 RT 数组 - private RTHandle[] _bloomPyramidUp; - private RTHandle[] _bloomPyramidDown; - private const int k_MaxPyramidSize = 6; // å‡å°‘ä¸å¿…è¦çš„最大数组长度 + // RT 数组（仅 Down 金字塔 + Up 金字塔，数é‡ä¸Ž diffusion 对é½ï¼‰ + private RTHandle[] _bloomMipDown; + private RTHandle[] _bloomMipUp; + private const int k_MaxMips = 8; public override string GetShaderName() => "SLS/Postprocessing/AnimeBloom"; + public override bool IsActive() => intensity.value > 0f; public override void Render(CommandBuffer cmd, ref RenderingData renderingData, RTHandle source, RTHandle destination) { @@ -50,86 +61,123 @@ namespace SLSUtilities.Rendering.PostProcessing desc.msaaSamples = 1; desc.depthBufferBits = 0; - // 1. 设置å‚æ•° - Vector4 bloomParams = new Vector4(intensity.value, threshold.value, softKnee.value, clamp.value); - material.SetVector(InternalShaderHelpers.ID._BloomParams, bloomParams); - material.SetVector(InternalShaderHelpers.ID._BloomTint, tint.value); - material.SetFloat(InternalShaderHelpers.ID._BlurRadius, scatter.value); + // ───────────────────────────────────────────────────────────── + // 1. å‚æ•°æ‰“åŒ…ï¼ˆå®Œå…¨å¯¹é½ Unity SetupBloom 的计算逻辑） + // ───────────────────────────────────────────────────────────── - // 2. åˆå§‹åŒ–金字塔数组 - int iterations = Mathf.Clamp(diffusion.value, 1, k_MaxPyramidSize); - - // ç¡®ä¿ RT 数组大å°è¶³å¤Ÿ - if (_bloomPyramidUp == null || _bloomPyramidUp.Length != k_MaxPyramidSize) + // scatter: 用户 [0,1] → shader [0.05, 0.95]（与原生 Lerp 映射一致） + float scatterMapped = Mathf.Lerp(0.05f, 0.95f, scatter.value); + + // threshold: Gamma → Linear（原生使用 GammaToLinearSpace 转æ¢ï¼‰ + float thresholdLinear = Mathf.GammaToLinearSpace(threshold.value); + float thresholdKnee = thresholdLinear * 0.5f; // ç¡¬ç¼–ç  soft knee，与原生一致 + + material.SetVector(InternalShaderHelpers.ID._BloomScatterParams, + new Vector4(scatterMapped, clamp.value, thresholdLinear, thresholdKnee)); + + material.SetFloat(InternalShaderHelpers.ID._AnimeBloom_KernelScale, kernelScale.value); + + // ───────────────────────────────────────────────────────────── + // 2. Tint 归一化（原生åšæ³•ï¼šäº®åº¦å½’一为 1，åªæºå¸¦è‰²ç›¸/饱和度） + // 这样 tint 调整颜色时ä¸ä¼šæ”¹å˜ bloom 总亮度。 + // ───────────────────────────────────────────────────────────── + Color tintLinear = tint.value.linear; + float luma = 0.2126f * tintLinear.r + 0.7152f * tintLinear.g + 0.0722f * tintLinear.b; + Color tintNormalized = luma > 0f ? tintLinear * (1f / luma) : Color.white; + + // å°† intensity 和归一化 tint 一并打包进 _BloomParams（原生 uber æ–¹å¼ï¼‰ + material.SetVector(InternalShaderHelpers.ID._BloomParams, + new Vector4(intensity.value, tintNormalized.r, tintNormalized.g, tintNormalized.b)); + + // ───────────────────────────────────────────────────────────── + // 3. RT 数组åˆå§‹åŒ– + // ───────────────────────────────────────────────────────────── + int mipCount = Mathf.Clamp(diffusion.value, 1, k_MaxMips); + + if (_bloomMipDown == null || _bloomMipDown.Length != k_MaxMips) { - _bloomPyramidUp = new RTHandle[k_MaxPyramidSize]; - _bloomPyramidDown = new RTHandle[k_MaxPyramidSize]; + _bloomMipDown = new RTHandle[k_MaxMips]; + _bloomMipUp = new RTHandle[k_MaxMips]; } - // 3. Prefilter Pass (æå–高亮) - // å…ˆé™ä¸€åŠåˆ†è¾¨çŽ‡ï¼ŒèŠ‚çœæ€§èƒ½ä¸”增加模糊感 - desc.width = Mathf.Max(1, desc.width >> 1); - desc.height = Mathf.Max(1, desc.height >> 1); - - RenderingUtils.ReAllocateIfNeeded(ref _bloomPyramidDown[0], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomMipDown0"); - RenderingUtils.ReAllocateIfNeeded(ref _bloomPyramidUp[0], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomMipUp0"); + // ───────────────────────────────────────────────────────────── + // 4. Prefilter（æå–高亮åƒç´  + åˆå§‹æ¿€è¿›é™é‡‡æ ·ï¼‰ + // æ ¹æ®ç”¨æˆ·é€‰æ‹©ï¼Œèµ·å§‹åˆ†è¾¨çŽ‡å¯èƒ½æ˜¯ 1/2, 1/4 或 1/8。 + // ───────────────────────────────────────────────────────────── + int shift = initialDownscaleShift.value; + desc.width = Mathf.Max(1, desc.width >> shift); + desc.height = Mathf.Max(1, desc.height >> shift); - // Source -> Down[0] (Prefilter) - Blitter.BlitCameraTexture(cmd, source, _bloomPyramidDown[0], material, 0); + RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[0], desc, FilterMode.Bilinear, + TextureWrapMode.Clamp, name: "_BloomDown0"); - // 4. Downsample Loop (é™é‡‡æ ·é‡‘å­—å¡”) - int lastDown = 0; - for (int i = 1; i < iterations; i++) + // Source → Down[0] via Pass 0 (Prefilter) + Blitter.BlitCameraTexture(cmd, source, _bloomMipDown[0], material, 0); + + // ───────────────────────────────────────────────────────────── + // 5. Downsample Loop：Dual Kawase é™é‡‡æ ·é‡‘字塔（Pass 1） + // æ¯æ¬¡åˆ†è¾¨çŽ‡å‡åŠï¼Œäº§ç”Ÿå¤šå±‚ä¸åŒå°ºåº¦çš„æ¨¡ç³Šçº¹ç† + // ───────────────────────────────────────────────────────────── + for (int i = 1; i < mipCount; i++) { - // æ¯æ¬¡åˆ†è¾¨çŽ‡å‡åŠ - desc.width = Mathf.Max(1, desc.width >> 1); + desc.width = Mathf.Max(1, desc.width >> 1); desc.height = Mathf.Max(1, desc.height >> 1); - RenderingUtils.ReAllocateIfNeeded(ref _bloomPyramidDown[i], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomMipDown" + i); - RenderingUtils.ReAllocateIfNeeded(ref _bloomPyramidUp[i], desc, FilterMode.Bilinear, TextureWrapMode.Clamp, name: "_BloomMipUp" + i); + RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[i], desc, FilterMode.Bilinear, + TextureWrapMode.Clamp, name: "_BloomDown" + i); - // Down[i-1] -> Down[i] - Blitter.BlitCameraTexture(cmd, _bloomPyramidDown[i - 1], _bloomPyramidDown[i], material, 1); - lastDown = i; + // Down[i-1] → Down[i] via Pass 1 (Dual Kawase Downsample) + Blitter.BlitCameraTexture(cmd, _bloomMipDown[i - 1], _bloomMipDown[i], material, 1); } - // 5. Upsample Loop (å‡é‡‡æ ·å¹¶æ··åˆ) - // 从最å°çš„一张开始，往上å åŠ  - // 先把最å°çš„ Down 直接拷给 Up - Blitter.BlitCameraTexture(cmd, _bloomPyramidDown[lastDown], _bloomPyramidUp[lastDown]); + // ───────────────────────────────────────────────────────────── + // 6. Upsample Loop：Dual Kawase å‡é‡‡æ · + lerp(high, low, scatter) + // + // 与 Unity 原生完全一致的数æ®æµå‘： + // _BlitTexture = highMip = Down[i] （当å‰å±‚高分辨率细节） + // _SourceTexLowMip = lowMip = Up[i+1] 或 Down[last]（低分辨率扩散光晕） + // output = Up[i] + // + // 从最底层开始，é€å±‚往上åˆå¹¶ï¼Œæœ€ç»ˆ Up[0] 就是完整的 bloom çº¹ç† + // ───────────────────────────────────────────────────────────── - for (int i = lastDown - 1; i >= 0; i--) + // 分é…所有 Up RT（从最大 mip 往上，分辨率é€æ­¥ç¿»å€ï¼‰ + // 由于 desc å·²ç»åœ¨ downsample 中ä¸æ–­å‡åŠï¼Œæˆ‘们è¦é‡æ–°ä»Ž Down[i] 读尺寸 + for (int i = mipCount - 1; i >= 0; i--) { - // 设置上一级 Up 为输入 - // Upsample Pass 会混åˆï¼šUp[i+1] (Blur) + Down[i] (High Res Detail) - // 这里我们ç¨å¾®ç®€åŒ–逻辑：直接把 Up[i+1] å‡é‡‡æ ·å¹¶å åŠ åˆ° Up[i] 上 - // 第二步：把 Up[i+1] (LowRes) å’Œ Down[i] (HighRes) 一起传给 Shader - // 在 Shader 内部执行 Lerp 能é‡å®ˆæ’èžåˆï¼Œå½»åº•æ›¿ä»£ä¼šå¯¼è‡´æ­»ç™½çš„ Additive å åŠ æ¨¡å¼ - material.SetTexture("_BloomMipDown", _bloomPyramidDown[i]); - Blitter.BlitCameraTexture(cmd, _bloomPyramidUp[i + 1], _bloomPyramidUp[i], material, 2); + RenderingUtils.ReAllocateIfNeeded(ref _bloomMipUp[i], + _bloomMipDown[i].rt.descriptor, FilterMode.Bilinear, + TextureWrapMode.Clamp, name: "_BloomUp" + i); } - // 6. Composite (åˆæˆ) - // 此时 _bloomPyramidUp[0] 包å«äº†æœ€ç»ˆçš„æ³›å…‰çº¹ç† - material.SetTexture(InternalShaderHelpers.ID._BloomTex, _bloomPyramidUp[0]); - - // Source + BloomTex -> Destination + // 最底层：lowMip = Down[last]，highMip 也是 Down[last]（无 low å¯ç”¨ï¼Œç›´æŽ¥ lerp è‡ªèº«ï¼Œç»“æžœä» = Down[last]） + // 简化åšæ³•ï¼šç›´æŽ¥å°† Down[last] 拷到 Up[last] 作为起点 + Blitter.BlitCameraTexture(cmd, _bloomMipDown[mipCount - 1], _bloomMipUp[mipCount - 1]); + + // 从第二底层开始å‘上 upsample + for (int i = mipCount - 2; i >= 0; i--) + { + // highMip：当å‰å±‚é™é‡‡æ ·çº¹ç† Down[i]，作为 Blit çš„ source（_BlitTexture） + // lowMip： 上一级å‡é‡‡æ ·ç»“æžœ Up[i+1]，通过 SetTexture ä¼ å…¥ + cmd.SetGlobalTexture(InternalShaderHelpers.ID._SourceTexLowMip, _bloomMipUp[i + 1]); + Blitter.BlitCameraTexture(cmd, _bloomMipDown[i], _bloomMipUp[i], material, 2); + } + + // ───────────────────────────────────────────────────────────── + // 7. Composite：将 bloom å åŠ å›žåŽŸå§‹ç”»é¢ï¼ˆPass 3） + // ───────────────────────────────────────────────────────────── + material.SetTexture(InternalShaderHelpers.ID._BloomTex, _bloomMipUp[0]); Blitter.BlitCameraTexture(cmd, source, destination, material, 3); } - - // æ¸…ç† RT + public void Dispose() { - if (_bloomPyramidDown != null) + if (_bloomMipDown == null) return; + for (int i = 0; i < _bloomMipDown.Length; i++) { - for (int i = 0; i < _bloomPyramidDown.Length; i++) - { - if (_bloomPyramidDown[i] != null) _bloomPyramidDown[i].Release(); - if (_bloomPyramidUp[i] != null) _bloomPyramidUp[i].Release(); - } + _bloomMipDown[i]?.Release(); + _bloomMipUp[i]?.Release(); } } - - public override bool IsActive() => intensity.value > 0f; } } \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 06baed5e..655c0400 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35358b7205a355dd0d21f18122ec89ffa11ab2f18b24ea30c664f212805008ba +oid sha256:296b22a6c799033f87b30c1238780144180be02efcca61ef93d6e8a43d4a34de size 3683 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1bc571fe..174f3f0f 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -18,12 +18,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 36 - width: 2560 - height: 1293.3334 + width: 1706.6666 + height: 813.3333 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 176 + controlID: 342 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -34,23 +34,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: -2560 - y: 898.6667 - width: 1791.6666 - height: 360.6667 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -64,301 +64,73 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: [] - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts/SLSUtilities/Narrative/Editor - m_Globs: [] - m_ProductIds: - m_AnyWithAssetOrigin: 0 - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/Scripts/SLSUtilities/Narrative/Editor - m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official - m_LockTracker: - m_IsLocked: 0 - m_LastLocalAssetsSearchArea: 1 - m_FolderTreeState: - scrollPos: {x: 0, y: 1019.33325} - m_SelectedIDs: - - m_Data: 69686 - m_LastClickedID: - m_Data: 69686 - m_ExpandedIDs: - - m_Data: 0 - - m_Data: 67620 - - m_Data: 67622 - - m_Data: 67624 - - m_Data: 67626 - - m_Data: 67628 - - m_Data: 67630 - - m_Data: 67632 - - m_Data: 67634 - - m_Data: 67636 - - m_Data: 67638 - - m_Data: 67640 - - m_Data: 67642 - - m_Data: 67644 - - m_Data: 67646 - - m_Data: 67648 - - m_Data: 67650 - - m_Data: 67652 - - m_Data: 67654 - - m_Data: 67656 - - m_Data: 67658 - - m_Data: 67660 - - m_Data: 67662 - - m_Data: 67664 - - m_Data: 67666 - - m_Data: 67668 - - m_Data: 67670 - - m_Data: 67672 - - m_Data: 67674 - - m_Data: 67676 - - m_Data: 67678 - - m_Data: 67680 - - m_Data: 67682 - - m_Data: 67684 - - m_Data: 67686 - - m_Data: 67688 - - m_Data: 67690 - - m_Data: 67692 - - m_Data: 67694 - - m_Data: 67696 - - m_Data: 67700 - - m_Data: 67702 - - m_Data: 67704 - - m_Data: 67706 - - m_Data: 67708 - - m_Data: 67710 - - m_Data: 67712 - - m_Data: 67714 - - m_Data: 67716 - - m_Data: 67718 - - m_Data: 67720 - - m_Data: 67722 - - m_Data: 67724 - - m_Data: 67728 - - m_Data: 67732 - - m_Data: 67734 - - m_Data: 67736 - - m_Data: 67738 - - m_Data: 67740 - - m_Data: 67742 - - m_Data: 67744 - - m_Data: 67746 - - m_Data: 67748 - - m_Data: 67750 - - m_Data: 67752 - - m_Data: 67754 - - m_Data: 67756 - - m_Data: 67758 - - m_Data: 67760 - - m_Data: 67762 - - m_Data: 67764 - - m_Data: 67768 - - m_Data: 67770 - - m_Data: 67772 - - m_Data: 67774 - - m_Data: 67778 - - m_Data: 68186 - - m_Data: 68266 - - m_Data: 68290 - - m_Data: 68314 - - m_Data: 69484 - - m_Data: 69680 - - m_Data: 69774 - - m_Data: 69786 - - m_Data: 69816 - - m_Data: 1000000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: WwiseObjectsManagers - m_OriginalName: WwiseObjectsManagers - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 69990 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 0 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 13} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: [] - m_LastClickedID: - m_Data: 0 - m_ExpandedIDs: - - m_Data: 0 - - m_Data: 67620 - - m_Data: 67622 - - m_Data: 67624 - - m_Data: 67626 - - m_Data: 67628 - - m_Data: 67630 - - m_Data: 67632 - - m_Data: 67634 - - m_Data: 67636 - - m_Data: 67638 - - m_Data: 67640 - - m_Data: 67642 - - m_Data: 67644 - - m_Data: 67646 - - m_Data: 67648 - - m_Data: 67650 - - m_Data: 67652 - - m_Data: 67654 - - m_Data: 67656 - - m_Data: 67658 - - m_Data: 67660 - - m_Data: 67662 - - m_Data: 67664 - - m_Data: 67666 - - m_Data: 67668 - - m_Data: 67670 - - m_Data: 67672 - - m_Data: 67674 - - m_Data: 67676 - - m_Data: 67678 - - m_Data: 67680 - - m_Data: 67682 - - m_Data: 67684 - - m_Data: 67686 - - m_Data: 67688 - - m_Data: 67690 - - m_Data: 67692 - - m_Data: 67694 - - m_Data: 67696 - - m_Data: 67698 - - m_Data: 67700 - - m_Data: 67702 - - m_Data: 67704 - - m_Data: 67706 - - m_Data: 67708 - - m_Data: 67710 - - m_Data: 67712 - - m_Data: 67714 - - m_Data: 67716 - - m_Data: 67718 - - m_Data: 67720 - - m_Data: 67722 - - m_Data: 67724 - - m_Data: 67726 - - m_Data: 67728 - - m_Data: 67730 - - m_Data: 67732 - - m_Data: 67734 - - m_Data: 67736 - - m_Data: 67738 - - m_Data: 67740 - - m_Data: 67742 - - m_Data: 67744 - - m_Data: 67746 - - m_Data: 67748 - - m_Data: 67750 - - m_Data: 67752 - - m_Data: 67754 - - m_Data: 67756 - - m_Data: 67758 - - m_Data: 67760 - - m_Data: 67762 - - m_Data: 67764 - - m_Data: 67766 - - m_Data: 67768 - - m_Data: 67770 - - m_Data: 67772 - - m_Data: 67774 - - m_Data: 67776 - - m_Data: 67778 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: [] - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: - - m_Data: 0 - - m_Data: 80838 - - m_Data: 66042 - - m_Data: 68026 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: Singleton - m_OriginalName: Singleton - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 46902 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 0 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 13} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 209 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 2732, y: 2048} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000001200000015000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -910.6667 + m_HBaseRangeMax: 910.6667 + m_VBaseRangeMin: -682.6667 + m_VBaseRangeMax: 682.6667 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 894.66675 + height: 523.6667 + m_Scale: {x: 0.38354492, y: 0.38354492} + m_Translation: {x: 447.33337, y: 261.83334} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1166.3129 + y: -682.6667 + width: 2332.6257 + height: 1365.3334 + m_MinimalGUI: 1 + m_defaultScale: 0.38354492 + m_LastWindowPixelSize: {x: 1342.0001, y: 817} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} + m_showToolbar: 1 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -378,12 +150,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1293.3334 + width: 1706.6666 + height: 813.3333 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 177 + controlID: 343 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -399,17 +171,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 13} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1792.6666 - height: 1293.3334 + width: 1195.3334 + height: 813.3333 m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 178 + controlID: 344 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -430,12 +202,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1792.6666 - height: 906.6667 + width: 1195.3334 + height: 570.6667 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 57 + controlID: 345 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -454,10 +226,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 448 - height: 906.6667 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + width: 298.66666 + height: 570.6667 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -485,10 +257,10 @@ MonoBehaviour: m_TextWithWhitespace: "Hierarchy\u200B" m_Pos: serializedVersion: 2 - x: -2560 - y: -7.9999924 - width: 447 - height: 880.6667 + x: 0 + y: 78.66667 + width: 297.66666 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -509,11 +281,53 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -1330 + - m_Data: -366368 + - m_Data: -363360 + - m_Data: -362956 + - m_Data: -338844 + - m_Data: -283904 + - m_Data: -283892 + - m_Data: -281414 + - m_Data: -278436 + - m_Data: -278074 + - m_Data: -255902 + - m_Data: -236384 + - m_Data: -236380 + - m_Data: -236374 + - m_Data: -236048 + - m_Data: -236036 + - m_Data: -233542 + - m_Data: -212182 + - m_Data: -212178 + - m_Data: -212172 + - m_Data: -211846 + - m_Data: -211834 + - m_Data: -209340 + - m_Data: -187642 + - m_Data: -187638 + - m_Data: -187632 + - m_Data: -187306 + - m_Data: -187294 + - m_Data: -187220 + - m_Data: -121380 + - m_Data: -55898 + - m_Data: -55894 + - m_Data: -55888 + - m_Data: -55562 + - m_Data: -55550 + - m_Data: -55476 + - m_Data: -35098 + - m_Data: -35094 + - m_Data: -35088 + - m_Data: -34762 + - m_Data: -34750 + - m_Data: -34640 + - m_Data: -1332 + - m_Data: 113838 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: EmptyObject(Clone) + m_OriginalName: EmptyObject(Clone) m_EditFieldRect: serializedVersion: 2 x: 0 @@ -521,10 +335,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 0 + m_Data: -55916 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 6} @@ -550,18 +364,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 448 + x: 298.66666 y: 0 - width: 1344.6666 - height: 906.6667 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 10} + width: 896.66675 + height: 570.6667 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} m_Panes: - {fileID: 9} + - {fileID: 2} - {fileID: 10} - {fileID: 11} - - {fileID: 12} m_Selected: 1 m_LastSelected: 0 --- !u!114 &9 @@ -586,10 +400,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: -2112 - y: -7.9999924 - width: 1342.6666 - height: 880.6667 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1201,6 +1015,20 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 1 + id: ai-game-developer-toolbar + index: 0 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 m_ContainerData: - containerId: overlay-toolbar__top scrollOffset: 0 @@ -1244,9 +1072,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -156.28107, y: 6.874937, z: 70.92978} + m_Target: {x: 3.284062, y: -4.438463, z: 228.66423} speed: 2 - m_Value: {x: -156.28107, y: 6.874937, z: 70.92978} + m_Value: {x: 3.284062, y: -4.438463, z: 228.66423} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1292,13 +1120,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08164388, y: -0.90003437, z: 0.19183847, w: -0.38306567} + m_Target: {x: -0.2943263, y: 0.04165452, z: -0.0128243575, w: -0.9548516} speed: 2 - m_Value: {x: -0.081632905, y: -0.8999134, z: 0.19181268, w: -0.38301417} + m_Value: {x: -0.2942867, y: 0.041648913, z: -0.012822632, w: -0.9547231} m_Size: - m_Target: 28.164608 + m_Target: 10.775852 speed: 2 - m_Value: 28.164608 + m_Value: 10.775852 m_Ortho: m_Target: 0 speed: 2 @@ -1333,112 +1161,6 @@ MonoBehaviour: section: Baked Global Illumination m_ViewIsLockedToObject: 0 --- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_TextWithWhitespace: "Game\u200B" - m_Pos: - serializedVersion: 2 - x: -2112 - y: -7.9999924 - width: 1342.6666 - height: 880.6667 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_DynamicPanelContainerData: [] - m_OverlaysVisible: 1 - m_DynamicPanelBehavior: 0 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000001200000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1342.6666 - height: 859.6667 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 671.3333, y: 429.83334} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -671.3333 - y: -429.83334 - width: 1342.6666 - height: 859.6667 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 2014, y: 1321} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 ---- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1482,7 +1204,6 @@ MonoBehaviour: - {fileID: 1107513844591874750, guid: 6bb62cb4c18d9d64db0b1e04206d84de, type: 2} - {fileID: 1107513844591874750, guid: c20c187d4b7282b4a976d0c296710fb8, type: 2} - {fileID: -9213322630146201385, guid: 258a1e0e215e6ee47ba26fc1c3662225, type: 2} - - {fileID: 8721197533186585465, guid: 22270cc48767ea74fa029bdf46ae745b, type: 2} m_ValueSerializationHelper: - e00: 0.5192983 e01: 0 @@ -1532,29 +1253,9 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 22270cc48767ea74fa029bdf46ae745b, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 8721197533186585465, guid: 22270cc48767ea74fa029bdf46ae745b, - type: 2} - m_ScrollPosition: {x: 0, y: 0} + m_AnimatorController: {fileID: 0} + m_BreadCrumbs: [] stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} blendTreeGraph: {fileID: 0} @@ -1566,7 +1267,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} @@ -1590,7 +1291,7 @@ MonoBehaviour: x: 298.6667 y: 78.66667 width: 894.66675 - height: 544 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1605,10 +1306,40 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_WidgetStates: - m_Keys: [] - m_Values: [] + m_Keys: + - Display Stats -> Frame Stats + - Display Stats -> Bottlenecks + - Display Stats -> Detailed Stats + - Frequently Used -> Rendering Debug + - Frequently Used -> Material Filters + - Frequently Used -> Lighting Debug Modes + - Rendering -> Pixel Validation + - Rendering -> HDR Output + - Rendering -> GPU Resident Drawer Settings + - Rendering -> Occlusion Context Stats + - Rendering -> Instance Culler Stats + - Rendering -> Render Graph + - Material -> Material Validation + - Volume -> Camera + - Volume -> Component + m_Values: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Settings: {fileID: 0} ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1624,19 +1355,358 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 906.6667 - width: 1792.6666 - height: 386.6667 + y: 570.6667 + width: 1195.3334 + height: 242.66663 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 2} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 2} + - {fileID: 13} - {fileID: 14} - {fileID: 15} - {fileID: 16} m_Selected: 0 m_LastSelected: 1 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "Project\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 649.3334 + width: 1194.3334 + height: 216.66663 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: [] + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Prefabs/GameElements/Track + m_Globs: [] + m_ProductIds: + m_AnyWithAssetOrigin: 0 + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Prefabs/GameElements/Track + m_LastFoldersGridSize: 16 + m_LastProjectPath: D:\Projects\ichni Official + m_LockTracker: + m_IsLocked: 0 + m_LastLocalAssetsSearchArea: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 335.33337} + m_SelectedIDs: + - m_Data: 209432 + m_LastClickedID: + m_Data: 209432 + m_ExpandedIDs: + - m_Data: 0 + - m_Data: 77244 + - m_Data: 77246 + - m_Data: 77248 + - m_Data: 77250 + - m_Data: 77252 + - m_Data: 77254 + - m_Data: 77256 + - m_Data: 77258 + - m_Data: 77260 + - m_Data: 77262 + - m_Data: 77264 + - m_Data: 77266 + - m_Data: 77268 + - m_Data: 77270 + - m_Data: 77272 + - m_Data: 77274 + - m_Data: 77276 + - m_Data: 77278 + - m_Data: 77280 + - m_Data: 77282 + - m_Data: 77284 + - m_Data: 77286 + - m_Data: 77288 + - m_Data: 77290 + - m_Data: 77292 + - m_Data: 77294 + - m_Data: 77296 + - m_Data: 77298 + - m_Data: 77300 + - m_Data: 77302 + - m_Data: 77304 + - m_Data: 77306 + - m_Data: 77308 + - m_Data: 77310 + - m_Data: 77312 + - m_Data: 77314 + - m_Data: 77316 + - m_Data: 77318 + - m_Data: 77322 + - m_Data: 77324 + - m_Data: 77326 + - m_Data: 77328 + - m_Data: 77330 + - m_Data: 77332 + - m_Data: 77334 + - m_Data: 77336 + - m_Data: 77340 + - m_Data: 77342 + - m_Data: 77344 + - m_Data: 77346 + - m_Data: 77348 + - m_Data: 77350 + - m_Data: 77352 + - m_Data: 77354 + - m_Data: 77356 + - m_Data: 77358 + - m_Data: 77360 + - m_Data: 77362 + - m_Data: 77364 + - m_Data: 77366 + - m_Data: 77368 + - m_Data: 77370 + - m_Data: 77372 + - m_Data: 77374 + - m_Data: 77376 + - m_Data: 77378 + - m_Data: 77380 + - m_Data: 77382 + - m_Data: 77384 + - m_Data: 77386 + - m_Data: 77388 + - m_Data: 77390 + - m_Data: 77392 + - m_Data: 77394 + - m_Data: 77396 + - m_Data: 77398 + - m_Data: 77400 + - m_Data: 77402 + - m_Data: 77816 + - m_Data: 77818 + - m_Data: 77822 + - m_Data: 153162 + - m_Data: 153164 + - m_Data: 153166 + - m_Data: 153168 + - m_Data: 197202 + - m_Data: 204772 + - m_Data: 204774 + - m_Data: 1000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 12} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: [] + m_LastClickedID: + m_Data: 0 + m_ExpandedIDs: + - m_Data: 0 + - m_Data: 77244 + - m_Data: 77246 + - m_Data: 77248 + - m_Data: 77250 + - m_Data: 77252 + - m_Data: 77254 + - m_Data: 77256 + - m_Data: 77258 + - m_Data: 77260 + - m_Data: 77262 + - m_Data: 77264 + - m_Data: 77266 + - m_Data: 77268 + - m_Data: 77270 + - m_Data: 77272 + - m_Data: 77274 + - m_Data: 77276 + - m_Data: 77278 + - m_Data: 77280 + - m_Data: 77282 + - m_Data: 77284 + - m_Data: 77286 + - m_Data: 77288 + - m_Data: 77290 + - m_Data: 77292 + - m_Data: 77294 + - m_Data: 77296 + - m_Data: 77298 + - m_Data: 77300 + - m_Data: 77302 + - m_Data: 77304 + - m_Data: 77306 + - m_Data: 77308 + - m_Data: 77310 + - m_Data: 77312 + - m_Data: 77314 + - m_Data: 77316 + - m_Data: 77318 + - m_Data: 77320 + - m_Data: 77322 + - m_Data: 77324 + - m_Data: 77326 + - m_Data: 77328 + - m_Data: 77330 + - m_Data: 77332 + - m_Data: 77334 + - m_Data: 77336 + - m_Data: 77338 + - m_Data: 77340 + - m_Data: 77342 + - m_Data: 77344 + - m_Data: 77346 + - m_Data: 77348 + - m_Data: 77350 + - m_Data: 77352 + - m_Data: 77354 + - m_Data: 77356 + - m_Data: 77358 + - m_Data: 77360 + - m_Data: 77362 + - m_Data: 77364 + - m_Data: 77366 + - m_Data: 77368 + - m_Data: 77370 + - m_Data: 77372 + - m_Data: 77374 + - m_Data: 77376 + - m_Data: 77378 + - m_Data: 77380 + - m_Data: 77382 + - m_Data: 77384 + - m_Data: 77386 + - m_Data: 77388 + - m_Data: 77390 + - m_Data: 77392 + - m_Data: 77394 + - m_Data: 77396 + - m_Data: 77398 + - m_Data: 77400 + - m_Data: 77402 + - m_Data: 1000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: [] + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: + - m_Data: 0 + - m_Data: 80838 + - m_Data: 66042 + - m_Data: 68026 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: ObjectTracker + m_OriginalName: ObjectTracker + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 209452 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 12} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 209 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1659,10 +1729,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: -2560 - y: 898.6667 - width: 1791.6666 - height: 360.6667 + x: 0 + y: 649.3334 + width: 1194.3334 + height: 216.66663 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1771,12 +1841,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1792.6666 + x: 1195.3334 y: 0 - width: 767.3334 - height: 1293.3334 - m_MinSize: {x: 276, y: 76} - m_MaxSize: {x: 4001, y: 4026} + width: 511.33325 + height: 813.3333 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -1807,10 +1877,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: -767.33325 - y: -7.9999924 - width: 766.3334 - height: 1267.3334 + x: 1195.3334 + y: 78.66667 + width: 510.33325 + height: 787.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index bf43f3c3..788f1841 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 2347 + controlID: 11030 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 2348 + controlID: 11031 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 2349 + controlID: 11005 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -196,7 +196,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2350 + controlID: 11006 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -234,7 +234,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: DebugWindow + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -243,16 +243,16 @@ MonoBehaviour: y: 0 width: 896.66675 height: 570.6667 - m_MinSize: {x: 802, y: 326} + m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 16} + - {fileID: 14} - {fileID: 17} - {fileID: 18} - - {fileID: 19} - m_Selected: 3 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -263,7 +263,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -272,16 +272,16 @@ MonoBehaviour: y: 570.6667 width: 1195.3334 height: 242.66663 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 20} + m_MinSize: {x: 231, y: 276} + m_MaxSize: {x: 10001, y: 10026} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 14} + - {fileID: 19} - {fileID: 20} - {fileID: 21} - {fileID: 22} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -333,7 +333,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 0 + y: 42.666668 width: 1706.6666 height: 36 m_SerializedDataModeController: @@ -628,23 +628,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 649.3334 - width: 1194.3334 - height: 216.66663 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -658,297 +658,73 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: [] - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Resources - m_Globs: [] - m_ProductIds: - m_AnyWithAssetOrigin: 0 - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/Resources - m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official - m_LockTracker: - m_IsLocked: 0 - m_LastLocalAssetsSearchArea: 1 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - - m_Data: 79718 - m_LastClickedID: - m_Data: 79718 - m_ExpandedIDs: - - m_Data: 0 - - m_Data: 101560 - - m_Data: 101562 - - m_Data: 101564 - - m_Data: 101566 - - m_Data: 101568 - - m_Data: 101570 - - m_Data: 101572 - - m_Data: 101574 - - m_Data: 101576 - - m_Data: 101578 - - m_Data: 101580 - - m_Data: 101582 - - m_Data: 101584 - - m_Data: 101586 - - m_Data: 101588 - - m_Data: 101590 - - m_Data: 101592 - - m_Data: 101594 - - m_Data: 101596 - - m_Data: 101598 - - m_Data: 101600 - - m_Data: 101602 - - m_Data: 101604 - - m_Data: 101606 - - m_Data: 101608 - - m_Data: 101610 - - m_Data: 101612 - - m_Data: 101614 - - m_Data: 101616 - - m_Data: 101618 - - m_Data: 101620 - - m_Data: 101622 - - m_Data: 101624 - - m_Data: 101626 - - m_Data: 101628 - - m_Data: 101630 - - m_Data: 101632 - - m_Data: 101634 - - m_Data: 101636 - - m_Data: 101638 - - m_Data: 101640 - - m_Data: 101642 - - m_Data: 101644 - - m_Data: 101646 - - m_Data: 101648 - - m_Data: 101650 - - m_Data: 101652 - - m_Data: 101654 - - m_Data: 101656 - - m_Data: 101658 - - m_Data: 101660 - - m_Data: 101662 - - m_Data: 101664 - - m_Data: 101666 - - m_Data: 101668 - - m_Data: 101670 - - m_Data: 101672 - - m_Data: 101674 - - m_Data: 101676 - - m_Data: 101678 - - m_Data: 101680 - - m_Data: 101682 - - m_Data: 101684 - - m_Data: 101686 - - m_Data: 101688 - - m_Data: 101690 - - m_Data: 101692 - - m_Data: 101694 - - m_Data: 101696 - - m_Data: 101698 - - m_Data: 101700 - - m_Data: 101702 - - m_Data: 101704 - - m_Data: 101706 - - m_Data: 101708 - - m_Data: 101710 - - m_Data: 101712 - - m_Data: 101714 - - m_Data: 101716 - - m_Data: 101718 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: [] - m_LastClickedID: - m_Data: 0 - m_ExpandedIDs: - - m_Data: 0 - - m_Data: 101560 - - m_Data: 101562 - - m_Data: 101564 - - m_Data: 101566 - - m_Data: 101568 - - m_Data: 101570 - - m_Data: 101572 - - m_Data: 101574 - - m_Data: 101576 - - m_Data: 101578 - - m_Data: 101580 - - m_Data: 101582 - - m_Data: 101584 - - m_Data: 101586 - - m_Data: 101588 - - m_Data: 101590 - - m_Data: 101592 - - m_Data: 101594 - - m_Data: 101596 - - m_Data: 101598 - - m_Data: 101600 - - m_Data: 101602 - - m_Data: 101604 - - m_Data: 101606 - - m_Data: 101608 - - m_Data: 101610 - - m_Data: 101612 - - m_Data: 101614 - - m_Data: 101616 - - m_Data: 101618 - - m_Data: 101620 - - m_Data: 101622 - - m_Data: 101624 - - m_Data: 101626 - - m_Data: 101628 - - m_Data: 101630 - - m_Data: 101632 - - m_Data: 101634 - - m_Data: 101636 - - m_Data: 101638 - - m_Data: 101640 - - m_Data: 101642 - - m_Data: 101644 - - m_Data: 101646 - - m_Data: 101648 - - m_Data: 101650 - - m_Data: 101652 - - m_Data: 101654 - - m_Data: 101656 - - m_Data: 101658 - - m_Data: 101660 - - m_Data: 101662 - - m_Data: 101664 - - m_Data: 101666 - - m_Data: 101668 - - m_Data: 101670 - - m_Data: 101672 - - m_Data: 101674 - - m_Data: 101676 - - m_Data: 101678 - - m_Data: 101680 - - m_Data: 101682 - - m_Data: 101684 - - m_Data: 101686 - - m_Data: 101688 - - m_Data: 101690 - - m_Data: 101692 - - m_Data: 101694 - - m_Data: 101696 - - m_Data: 101698 - - m_Data: 101700 - - m_Data: 101702 - - m_Data: 101704 - - m_Data: 101706 - - m_Data: 101708 - - m_Data: 101710 - - m_Data: 101712 - - m_Data: 101714 - - m_Data: 101716 - - m_Data: 101718 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - - m_Data: 48546 - m_LastClickedInstanceID: 48546 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: - - m_Data: 0 - - m_Data: 80838 - - m_Data: 66042 - - m_Data: 68026 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: - m_Data: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 209 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 2732, y: 2048} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000001200000015000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -910.6667 + m_HBaseRangeMax: 910.6667 + m_VBaseRangeMin: -682.6667 + m_VBaseRangeMax: 682.6667 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 894.66675 + height: 523.6667 + m_Scale: {x: 0.38354492, y: 0.38354492} + m_Translation: {x: 447.33337, y: 261.83334} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1166.3129 + y: -682.6667 + width: 2332.6257 + height: 1365.3334 + m_MinimalGUI: 1 + m_defaultScale: 0.38354492 + m_LastWindowPixelSize: {x: 1342.0001, y: 817} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} + m_showToolbar: 1 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -972,7 +748,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 78.66667 width: 297.66666 height: 544.6667 m_SerializedDataModeController: @@ -995,7 +771,58 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -1334 + - m_Data: -566736 + - m_Data: -566422 + - m_Data: -564196 + - m_Data: -561618 + - m_Data: -558188 + - m_Data: -557860 + - m_Data: -513432 + - m_Data: -498682 + - m_Data: -366368 + - m_Data: -363360 + - m_Data: -362956 + - m_Data: -338844 + - m_Data: -283904 + - m_Data: -283892 + - m_Data: -281414 + - m_Data: -278436 + - m_Data: -278074 + - m_Data: -255902 + - m_Data: -236384 + - m_Data: -236380 + - m_Data: -236374 + - m_Data: -236048 + - m_Data: -236036 + - m_Data: -233542 + - m_Data: -212182 + - m_Data: -212178 + - m_Data: -212172 + - m_Data: -211846 + - m_Data: -211834 + - m_Data: -209340 + - m_Data: -187642 + - m_Data: -187638 + - m_Data: -187632 + - m_Data: -187306 + - m_Data: -187294 + - m_Data: -187220 + - m_Data: -121380 + - m_Data: -55898 + - m_Data: -55894 + - m_Data: -55888 + - m_Data: -55562 + - m_Data: -55550 + - m_Data: -55476 + - m_Data: -35098 + - m_Data: -35094 + - m_Data: -35088 + - m_Data: -34762 + - m_Data: -34750 + - m_Data: -34640 + - m_Data: -1332 + - m_Data: 113838 + - m_Data: 222398 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1043,10 +870,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: -2112 - y: -7.9999924 - width: 1342.6666 - height: 880.6667 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544.6667 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1715,9 +1542,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 7.116543, y: -2.2052267, z: 434.71506} + m_Target: {x: 3.284062, y: -4.438463, z: 228.66423} speed: 2 - m_Value: {x: 7.116543, y: -2.2052267, z: 434.71506} + m_Value: {x: 3.284062, y: -4.438463, z: 228.66423} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1763,13 +1590,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.21873464, y: -0.4334882, z: 0.10931682, w: -0.8675031} + m_Target: {x: -0.2943263, y: 0.04165452, z: -0.0128243575, w: -0.9548516} speed: 2 - m_Value: {x: 0.21873465, y: 0.43348822, z: -0.109316826, w: 0.86750317} + m_Value: {x: -0.2943263, y: 0.04165452, z: -0.0128243575, w: -0.95485157} m_Size: - m_Target: 12.075301 + m_Target: 10.775852 speed: 2 - m_Value: 12.075301 + m_Value: 10.775852 m_Ortho: m_Target: 0 speed: 2 @@ -1804,112 +1631,6 @@ MonoBehaviour: section: Baked Global Illumination m_ViewIsLockedToObject: 0 --- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_TextWithWhitespace: "Game\u200B" - m_Pos: - serializedVersion: 2 - x: 298.6667 - y: 78.66667 - width: 894.66675 - height: 544.6667 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_DynamicPanelContainerData: [] - m_OverlaysVisible: 1 - m_DynamicPanelBehavior: 0 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000001200000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 894.66675 - height: 523.6667 - m_Scale: {x: 0.6989584, y: 0.6989584} - m_Translation: {x: 447.33337, y: 261.83334} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -640 - y: -374.60504 - width: 1280 - height: 749.2101 - m_MinimalGUI: 1 - m_defaultScale: 0.6989584 - m_LastWindowPixelSize: {x: 894.66675, y: 544.6667} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 ---- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2016,7 +1737,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} @@ -2037,8 +1758,8 @@ MonoBehaviour: m_TextWithWhitespace: "Rendering Debugger\u200B" m_Pos: serializedVersion: 2 - x: 299.66666 - y: 24 + x: 298.6667 + y: 78.66667 width: 894.66675 height: 544.6667 m_SerializedDataModeController: @@ -2055,9 +1776,382 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_WidgetStates: - m_Keys: [] - m_Values: [] + m_Keys: + - Display Stats -> Frame Stats + - Display Stats -> Bottlenecks + - Display Stats -> Detailed Stats + - Frequently Used -> Rendering Debug + - Frequently Used -> Material Filters + - Frequently Used -> Lighting Debug Modes + - Rendering -> Pixel Validation + - Rendering -> HDR Output + - Rendering -> GPU Resident Drawer Settings + - Rendering -> Occlusion Context Stats + - Rendering -> Instance Culler Stats + - Rendering -> Render Graph + - Material -> Material Validation + - Volume -> Camera + - Volume -> Component + m_Values: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Settings: {fileID: 0} +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "Project\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 649.3334 + width: 1194.3334 + height: 216.66663 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: [] + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scenes + m_Globs: [] + m_ProductIds: + m_AnyWithAssetOrigin: 0 + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Scenes + m_LastFoldersGridSize: 16 + m_LastProjectPath: D:\Projects\ichni Official + m_LockTracker: + m_IsLocked: 0 + m_LastLocalAssetsSearchArea: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 335.33337} + m_SelectedIDs: + - m_Data: 77820 + m_LastClickedID: + m_Data: 77820 + m_ExpandedIDs: + - m_Data: 0 + - m_Data: 77244 + - m_Data: 77246 + - m_Data: 77248 + - m_Data: 77250 + - m_Data: 77252 + - m_Data: 77254 + - m_Data: 77256 + - m_Data: 77258 + - m_Data: 77260 + - m_Data: 77262 + - m_Data: 77264 + - m_Data: 77266 + - m_Data: 77268 + - m_Data: 77270 + - m_Data: 77272 + - m_Data: 77274 + - m_Data: 77276 + - m_Data: 77278 + - m_Data: 77280 + - m_Data: 77282 + - m_Data: 77284 + - m_Data: 77286 + - m_Data: 77288 + - m_Data: 77290 + - m_Data: 77292 + - m_Data: 77294 + - m_Data: 77296 + - m_Data: 77298 + - m_Data: 77300 + - m_Data: 77302 + - m_Data: 77304 + - m_Data: 77306 + - m_Data: 77308 + - m_Data: 77310 + - m_Data: 77312 + - m_Data: 77314 + - m_Data: 77316 + - m_Data: 77318 + - m_Data: 77322 + - m_Data: 77324 + - m_Data: 77326 + - m_Data: 77328 + - m_Data: 77330 + - m_Data: 77332 + - m_Data: 77334 + - m_Data: 77336 + - m_Data: 77340 + - m_Data: 77342 + - m_Data: 77344 + - m_Data: 77346 + - m_Data: 77348 + - m_Data: 77350 + - m_Data: 77352 + - m_Data: 77354 + - m_Data: 77356 + - m_Data: 77358 + - m_Data: 77360 + - m_Data: 77362 + - m_Data: 77364 + - m_Data: 77366 + - m_Data: 77368 + - m_Data: 77370 + - m_Data: 77372 + - m_Data: 77374 + - m_Data: 77376 + - m_Data: 77378 + - m_Data: 77380 + - m_Data: 77382 + - m_Data: 77384 + - m_Data: 77386 + - m_Data: 77388 + - m_Data: 77390 + - m_Data: 77392 + - m_Data: 77394 + - m_Data: 77396 + - m_Data: 77398 + - m_Data: 77400 + - m_Data: 77402 + - m_Data: 153162 + - m_Data: 153164 + - m_Data: 153166 + - m_Data: 153168 + - m_Data: 197202 + - m_Data: 204772 + - m_Data: 204774 + - m_Data: 1000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 11} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: [] + m_LastClickedID: + m_Data: 0 + m_ExpandedIDs: + - m_Data: 0 + - m_Data: 77244 + - m_Data: 77246 + - m_Data: 77248 + - m_Data: 77250 + - m_Data: 77252 + - m_Data: 77254 + - m_Data: 77256 + - m_Data: 77258 + - m_Data: 77260 + - m_Data: 77262 + - m_Data: 77264 + - m_Data: 77266 + - m_Data: 77268 + - m_Data: 77270 + - m_Data: 77272 + - m_Data: 77274 + - m_Data: 77276 + - m_Data: 77278 + - m_Data: 77280 + - m_Data: 77282 + - m_Data: 77284 + - m_Data: 77286 + - m_Data: 77288 + - m_Data: 77290 + - m_Data: 77292 + - m_Data: 77294 + - m_Data: 77296 + - m_Data: 77298 + - m_Data: 77300 + - m_Data: 77302 + - m_Data: 77304 + - m_Data: 77306 + - m_Data: 77308 + - m_Data: 77310 + - m_Data: 77312 + - m_Data: 77314 + - m_Data: 77316 + - m_Data: 77318 + - m_Data: 77322 + - m_Data: 77324 + - m_Data: 77326 + - m_Data: 77328 + - m_Data: 77330 + - m_Data: 77332 + - m_Data: 77334 + - m_Data: 77336 + - m_Data: 77340 + - m_Data: 77342 + - m_Data: 77344 + - m_Data: 77346 + - m_Data: 77348 + - m_Data: 77350 + - m_Data: 77352 + - m_Data: 77354 + - m_Data: 77356 + - m_Data: 77358 + - m_Data: 77360 + - m_Data: 77362 + - m_Data: 77364 + - m_Data: 77366 + - m_Data: 77368 + - m_Data: 77370 + - m_Data: 77372 + - m_Data: 77374 + - m_Data: 77376 + - m_Data: 77378 + - m_Data: 77380 + - m_Data: 77382 + - m_Data: 77384 + - m_Data: 77386 + - m_Data: 77388 + - m_Data: 77390 + - m_Data: 77392 + - m_Data: 77394 + - m_Data: 77396 + - m_Data: 77398 + - m_Data: 77400 + - m_Data: 77402 + - m_Data: 77818 + - m_Data: 77822 + - m_Data: 153162 + - m_Data: 153164 + - m_Data: 153166 + - m_Data: 153168 + - m_Data: 197202 + - m_Data: 204772 + - m_Data: 204774 + - m_Data: 1000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: [] + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: + - m_Data: 0 + - m_Data: 80838 + - m_Data: 66042 + - m_Data: 68026 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: + m_Data: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 11} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 209 --- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 @@ -2081,7 +2175,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 594.6667 + y: 649.3334 width: 1194.3334 height: 216.66663 m_SerializedDataModeController: @@ -2199,8 +2293,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1196.3334 - y: 24 + x: 1195.3334 + y: 78.66667 width: 510.33325 height: 787.3333 m_SerializedDataModeController: