From d013ee4cce9946a66735a5864273b007f5e9f357 Mon Sep 17 00:00:00 2001 From: Shnok Date: Mon, 10 Jun 2024 18:40:44 +0800 Subject: [PATCH] entity rot no longer shared, calc on movedirection --- l2-unity/Assets/Scripts/Game/Manager/World.cs | 2 + .../NetworkCharacterControllerReceive.cs | 30 ++-- .../Networking/NetworkTransformReceive.cs | 11 +- .../Networking/NetworkTransformShare.cs | 6 +- .../Terrain/Geodata/GeodataImporter.cs | 2 +- .../Tools/Terrain/Geodata/GeodataGenerator.cs | 6 +- .../Tools/Terrain/L2AmbientSoundImporter.cs | 2 +- .../Scripts/Tools/Terrain/L2BrushBuilder.cs | 10 +- l2-unity/Assets/Scripts/Utils/VectorUtils.cs | 27 +++- .../UserSettings/Layouts/default-2022.dwlt | 142 +++++++++--------- 10 files changed, 127 insertions(+), 111 deletions(-) diff --git a/l2-unity/Assets/Scripts/Game/Manager/World.cs b/l2-unity/Assets/Scripts/Game/Manager/World.cs index 3f863eed0..e51eeabea 100644 --- a/l2-unity/Assets/Scripts/Game/Manager/World.cs +++ b/l2-unity/Assets/Scripts/Game/Manager/World.cs @@ -99,6 +99,7 @@ public void SpawnPlayer(NetworkIdentity identity, PlayerStatus status, PlayerSta CharacterRaceAnimation raceId = CharacterRaceAnimationParser.ParseRace(race, appearance.Race, identity.IsMage); GameObject go = CharacterBuilder.Instance.BuildCharacterBase(raceId, appearance, true); + go.transform.eulerAngles = new Vector3(transform.eulerAngles.x, identity.Heading, transform.eulerAngles.z); go.transform.position = identity.Position; go.transform.name = "Player"; @@ -144,6 +145,7 @@ public void SpawnUser(NetworkIdentity identity, Status status, Stats stats, Play GameObject go = CharacterBuilder.Instance.BuildCharacterBase(raceId, appearance, false); go.transform.position = identity.Position; + go.transform.eulerAngles = new Vector3(transform.eulerAngles.x, identity.Heading, transform.eulerAngles.z); UserEntity user = go.GetComponent(); user.Status = status; diff --git a/l2-unity/Assets/Scripts/Networking/NetworkCharacterControllerReceive.cs b/l2-unity/Assets/Scripts/Networking/NetworkCharacterControllerReceive.cs index ed3362df8..bd4fff412 100644 --- a/l2-unity/Assets/Scripts/Networking/NetworkCharacterControllerReceive.cs +++ b/l2-unity/Assets/Scripts/Networking/NetworkCharacterControllerReceive.cs @@ -36,28 +36,19 @@ void Start() { if(_characterController == null || World.Instance.OfflineMode || _animationReceive == null) { this.enabled = false; } + _direction = Vector3.zero; _destination = Vector3.zero; } - public void UpdateMoveDirection(Vector3 direction) { - _speed = _entity.Stats.ScaledSpeed; - _direction = direction; - } - - public void SetDestination(Vector3 destination) { - _speed = _entity.Stats.ScaledSpeed; - _destination = destination; - } - private void FixedUpdate() { - if(!_networkTransformReceive.IsPositionSynced()) { + if (!_networkTransformReceive.IsPositionSynced()) { /* pause script during position sync */ return; } - if(_destination != null && _destination != Vector3.zero) { + if (_destination != null && _destination != Vector3.zero) { SetMoveDirectionToDestination(); } @@ -65,6 +56,21 @@ private void FixedUpdate() { _characterController.Move(ajustedDirection * Time.deltaTime); } + public void UpdateMoveDirection(Vector3 direction) { + _speed = _entity.Stats.ScaledSpeed; + _direction = direction; + + Debug.Log("call: " + direction); + if (direction.x != 0 || direction.z != 0) { + _networkTransformReceive.SetFinalRotation(VectorUtils.CalculateMoveDirectionAngle(direction.x, direction.z)); + } + } + + public void SetDestination(Vector3 destination) { + _speed = _entity.Stats.ScaledSpeed; + _destination = destination; + } + public void SetMoveDirectionToDestination() { Vector3 transformFlat = VectorUtils.To2D(transform.position); Vector3 destinationFlat = VectorUtils.To2D(_destination); diff --git a/l2-unity/Assets/Scripts/Networking/NetworkTransformReceive.cs b/l2-unity/Assets/Scripts/Networking/NetworkTransformReceive.cs index 4bec502c0..fb4449cda 100644 --- a/l2-unity/Assets/Scripts/Networking/NetworkTransformReceive.cs +++ b/l2-unity/Assets/Scripts/Networking/NetworkTransformReceive.cs @@ -87,19 +87,12 @@ public void SetFinalRotation(float finalRotation) { public void LookAt(Transform target) { if (target != null) { - _newRotation = CalculateAngleToLookAt(target.position); + _newRotation = VectorUtils.CalculateMoveDirectionAngle(transform.position, target.position); } } public void LookAt(Vector3 position) { - _newRotation = CalculateAngleToLookAt(position); - } - - private float CalculateAngleToLookAt(Vector3 position) { - float angle = Mathf.Atan2(position.x - transform.position.x, position.z - transform.position.z) * Mathf.Rad2Deg; - angle = Mathf.Round(angle / 45f); - angle *= 45f; - return angle; + _newRotation = VectorUtils.CalculateMoveDirectionAngle(transform.position, position); } public bool IsPositionSynced() { diff --git a/l2-unity/Assets/Scripts/Networking/NetworkTransformShare.cs b/l2-unity/Assets/Scripts/Networking/NetworkTransformShare.cs index fdee16e41..efea4905d 100644 --- a/l2-unity/Assets/Scripts/Networking/NetworkTransformShare.cs +++ b/l2-unity/Assets/Scripts/Networking/NetworkTransformShare.cs @@ -8,6 +8,7 @@ public class NetworkTransformShare : MonoBehaviour { [SerializeField] public Vector3 _serverPosition; [SerializeField] public bool _shouldShareRotation; + public bool _rotationShareEnabled; public bool ShouldShareRotation { get { return _shouldShareRotation; } set { _shouldShareRotation = value; } } @@ -21,6 +22,7 @@ void Start() { _lastPos = transform.position; _lastRot = transform.forward; _lastSharedPosTime = Time.time; + _rotationShareEnabled = false; //rotation is now calculated based on movedirection } void Update() { @@ -28,7 +30,7 @@ void Update() { SharePosition(); } - if(ShouldShareRotation) { + if(ShouldShareRotation && _rotationShareEnabled) { ShareRotation(); } } @@ -47,7 +49,7 @@ public void SharePosition() { _lastSharedPosTime = Time.time; _lastPos = transform.position; - ClientPacketHandler.Instance.UpdateRotation(transform.eulerAngles.y); + //ClientPacketHandler.Instance.UpdateRotation(transform.eulerAngles.y); } public void ShareRotation() { diff --git a/l2-unity/Assets/Scripts/Terrain/Geodata/GeodataImporter.cs b/l2-unity/Assets/Scripts/Terrain/Geodata/GeodataImporter.cs index 14bad628b..8419da297 100644 --- a/l2-unity/Assets/Scripts/Terrain/Geodata/GeodataImporter.cs +++ b/l2-unity/Assets/Scripts/Terrain/Geodata/GeodataImporter.cs @@ -141,7 +141,7 @@ public static Vector3 LoadMapOrigin(string mapId, float nodeSize) { throw new Exception($"Map {mapId} prefab not found at {mapFolder}."); } - Vector3 origin = VectorUtils.floorToNearest(map.transform.position, nodeSize); + Vector3 origin = VectorUtils.FloorToNearest(map.transform.position, nodeSize); return origin; } } diff --git a/l2-unity/Assets/Scripts/Tools/Terrain/Geodata/GeodataGenerator.cs b/l2-unity/Assets/Scripts/Tools/Terrain/Geodata/GeodataGenerator.cs index 397c93696..2a5143ec9 100644 --- a/l2-unity/Assets/Scripts/Tools/Terrain/Geodata/GeodataGenerator.cs +++ b/l2-unity/Assets/Scripts/Tools/Terrain/Geodata/GeodataGenerator.cs @@ -56,9 +56,9 @@ void Start() { } void GenerateGeodata() { - Vector3 roundedTerrainPos = VectorUtils.floorToNearest(terrainTransform.position, nodeSize); + Vector3 roundedTerrainPos = VectorUtils.FloorToNearest(terrainTransform.position, nodeSize); if(enableCustomGeneratedTerrainOrigin) { - roundedTerrainPos = VectorUtils.floorToNearest(customGeneratedTerrainOrigin, nodeSize); + roundedTerrainPos = VectorUtils.FloorToNearest(customGeneratedTerrainOrigin, nodeSize); } Debug.Log(roundedTerrainPos); for (int x = 0; x < scaledTerrainWidth; x++) { @@ -79,7 +79,7 @@ void GenerateGeodata() { float y = hits[i].point.y - roundedTerrainPos.y; Vector3 nodePos = new Vector3 (x * nodeSize, y, z * nodeSize); - nodePos = VectorUtils.floorToNearest(nodePos, nodeSize); + nodePos = VectorUtils.FloorToNearest(nodePos, nodeSize); if((oldHeight - hits[i].point.y) > characterHeight || i == 0) { Vector3 scaledNodePos = new Vector3(x, nodePos.y / nodeSize, z); diff --git a/l2-unity/Assets/Scripts/Tools/Terrain/L2AmbientSoundImporter.cs b/l2-unity/Assets/Scripts/Tools/Terrain/L2AmbientSoundImporter.cs index c42b059bf..ba3691f41 100644 --- a/l2-unity/Assets/Scripts/Tools/Terrain/L2AmbientSoundImporter.cs +++ b/l2-unity/Assets/Scripts/Tools/Terrain/L2AmbientSoundImporter.cs @@ -72,7 +72,7 @@ private static GameObject BuildAmbientSoundGameObject(AmbientSound ambientSound) collider.radius = soundRadius; collider.isTrigger = true; - go.transform.position = VectorUtils.convertToUnity(ambientSound.position); + go.transform.position = VectorUtils.ConvertToUnity(ambientSound.position); go.layer = LayerMask.NameToLayer("AmbientSound"); // event diff --git a/l2-unity/Assets/Scripts/Tools/Terrain/L2BrushBuilder.cs b/l2-unity/Assets/Scripts/Tools/Terrain/L2BrushBuilder.cs index 5c8bef988..c35b4a85d 100644 --- a/l2-unity/Assets/Scripts/Tools/Terrain/L2BrushBuilder.cs +++ b/l2-unity/Assets/Scripts/Tools/Terrain/L2BrushBuilder.cs @@ -41,7 +41,7 @@ static void Build(string path) { GameObject brush = new GameObject(b.name); brush.transform.parent = brushContainer.transform; - brush.transform.position = VectorUtils.convertToUnity(b.position) - VectorUtils.convertToUnity(b.prePivot); + brush.transform.position = VectorUtils.ConvertToUnity(b.position) - VectorUtils.ConvertToUnity(b.prePivot); Debug.Log(b.name); Model model = b.model; @@ -52,7 +52,7 @@ static void Build(string path) { // Adjust verticles for(int p = 0; p < polyData.vertices.Length; p++) { - polyData.vertices[p] = VectorUtils.convertToUnity(polyData.vertices[p]); + polyData.vertices[p] = VectorUtils.ConvertToUnity(polyData.vertices[p]); } List pPolyFlags = new List(polyData.polyFlags); @@ -80,9 +80,9 @@ static GameObject createProbuilderMesh(string csgOper, PolyData polyData, int in Material material = GetMaterialForTexture(polyData.texture); - Vector3 adjustedNormal = VectorUtils.convertToUnityUnscaled(polyData.normal); - Vector3 adjustedU = VectorUtils.convertToUnityUnscaled(polyData.textureU); - Vector3 adjustedV = VectorUtils.convertToUnityUnscaled(polyData.textureV); + Vector3 adjustedNormal = VectorUtils.ConvertToUnityUnscaled(polyData.normal); + Vector3 adjustedU = VectorUtils.ConvertToUnityUnscaled(polyData.textureU); + Vector3 adjustedV = VectorUtils.ConvertToUnityUnscaled(polyData.textureV); Quaternion rt = Quaternion.FromToRotation(Vector3.forward, adjustedNormal); Vector3 rotatedU = rt * adjustedU; diff --git a/l2-unity/Assets/Scripts/Utils/VectorUtils.cs b/l2-unity/Assets/Scripts/Utils/VectorUtils.cs index 863fcac62..f4368b304 100644 --- a/l2-unity/Assets/Scripts/Utils/VectorUtils.cs +++ b/l2-unity/Assets/Scripts/Utils/VectorUtils.cs @@ -1,24 +1,24 @@ using UnityEngine; public class VectorUtils : MonoBehaviour { - public static Vector3 convertToUnity(Vector3 ueVector) { + public static Vector3 ConvertToUnity(Vector3 ueVector) { return new Vector3(ueVector.y, ueVector.z, ueVector.x) * (1f / 52.5f); } - public static Vector3 convertToUnityUnscaled(Vector3 ueVector) { + public static Vector3 ConvertToUnityUnscaled(Vector3 ueVector) { return new Vector3(ueVector.y, ueVector.z, ueVector.x); } - public static Vector3 scaleToUnity(Vector3 ueVector) { + public static Vector3 ScaleToUnity(Vector3 ueVector) { return ueVector * (1f / 52.5f); } - public static Vector2 rotateVector2(Vector2 vector, float angle) { + public static Vector2 RotateVector2(Vector2 vector, float angle) { float radians = angle * Mathf.Deg2Rad; - return rotateVector2Rad(vector, radians); + return RotateVector2Rad(vector, radians); } - public static Vector2 rotateVector2Rad(Vector2 vector, float radians) { + public static Vector2 RotateVector2Rad(Vector2 vector, float radians) { float sin = Mathf.Sin(radians); float cos = Mathf.Cos(radians); @@ -28,7 +28,7 @@ public static Vector2 rotateVector2Rad(Vector2 vector, float radians) { return new Vector2(newX, newY); } - public static Vector3 floorToNearest(Vector3 vector, float step) { + public static Vector3 FloorToNearest(Vector3 vector, float step) { return new Vector3(NumberUtils.FloorToNearest(vector.x, step), NumberUtils.FloorToNearest(vector.y, step), NumberUtils.FloorToNearest(vector.z, step)); @@ -45,4 +45,17 @@ public static float Distance2D(Vector3 from, Vector3 to) { public static bool IsVectorZero2D(Vector3 vector) { return vector.x == 0 && vector.z == 0; } + + public static float CalculateMoveDirectionAngle(Vector3 from, Vector3 to) { + // Calculate the direction vector (destination - current position) + float directionX = to.x - from.x; + float directionZ = to.z - from.z; + + return CalculateMoveDirectionAngle(directionX, directionZ); + } + + public static float CalculateMoveDirectionAngle(float directionX, float directionZ) { + float angle = Mathf.Atan2(directionX, directionZ) * Mathf.Rad2Deg; + return angle; + } } diff --git a/l2-unity/UserSettings/Layouts/default-2022.dwlt b/l2-unity/UserSettings/Layouts/default-2022.dwlt index 373c51728..7ebe1ed9f 100644 --- a/l2-unity/UserSettings/Layouts/default-2022.dwlt +++ b/l2-unity/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1007 m_ShowMode: 4 - m_Title: Game + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 138 + controlID: 41 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,7 +139,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1741 + width: 1297 height: 957 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} @@ -164,7 +164,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1741 + width: 1297 height: 629 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} @@ -187,7 +187,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 390 + width: 346 height: 629 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -211,9 +211,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 390 + x: 346 y: 0 - width: 1351 + width: 951 height: 629 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -224,8 +224,9 @@ MonoBehaviour: - {fileID: 13} - {fileID: 12} - {fileID: 20} + - {fileID: 22} m_Selected: 2 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -236,24 +237,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 629 - width: 1741 + width: 1297 height: 328 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 51, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,18 +270,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1741 + x: 1297 y: 0 - width: 179 + width: 623 height: 957 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} - - {fileID: 22} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -301,10 +301,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 299 + x: 308 y: 73 - width: 1001 - height: 600 + width: 1053 + height: 608 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -322,8 +322,8 @@ MonoBehaviour: m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 01f6b9f2 - m_LastClickedID: -222693887 + m_SelectedIDs: 5df3e763 + m_LastClickedID: 1676145501 m_ExpandedIDs: 53336be200000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -362,9 +362,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 390 + x: 346 y: 73 - width: 1349 + width: 949 height: 608 m_SerializedDataModeController: m_DataMode: 0 @@ -382,7 +382,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1349, y: 587} + m_TargetSize: {x: 949, y: 587} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -397,8 +397,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -674.5 - m_HBaseRangeMax: 674.5 + m_HBaseRangeMin: -474.5 + m_HBaseRangeMax: 474.5 m_VBaseRangeMin: -293.5 m_VBaseRangeMax: 293.5 m_HAllowExceedBaseRangeMin: 1 @@ -409,7 +409,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -418,23 +418,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1349 + width: 949 height: 587 m_Scale: {x: 1, y: 1} - m_Translation: {x: 674.5, y: 293.5} + m_Translation: {x: 474.5, y: 293.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -674.5 + x: -474.5 y: -293.5 - width: 1349 + width: 949 height: 587 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1349, y: 608} + m_LastWindowPixelSize: {x: 949, y: 608} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -462,7 +462,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 389 + width: 345 height: 608 m_SerializedDataModeController: m_DataMode: 0 @@ -477,9 +477,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: + m_SelectedIDs: e6a90900 + m_LastClickedID: 633318 + m_ExpandedIDs: 6cd2f5ffaad2f5ffb87cf8ff3a33faff823cfaff4e24fcffec19fdff2cfbffff70150900102a0900e4bf0900 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -523,10 +523,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 81 - width: 993 - height: 589 + x: 346 + y: 73 + width: 949 + height: 608 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -846,9 +846,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 4640.71, y: -83.84296, z: -1580.3898} + m_Target: {x: 4731.4355, y: -66.63975, z: -1720.6346} speed: 2 - m_Value: {x: 4640.71, y: -83.84296, z: -1580.3898} + m_Value: {x: 4731.4355, y: -66.63975, z: -1720.6346} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -894,17 +894,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.05194786, y: 0.8799633, z: -0.099895984, w: -0.46195412} + m_Target: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} speed: 2 - m_Value: {x: -0.051937092, y: 0.8797809, z: -0.09987528, w: -0.46185836} + m_Value: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_Size: - m_Target: 40.82712 + m_Target: 2.2735631 speed: 2 - m_Value: 40.82712 + m_Value: 2.2735631 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1.005 m_SpeedNormalized: 0.49999997 @@ -981,7 +981,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 702 - width: 1740 + width: 1362 height: 307 m_SerializedDataModeController: m_DataMode: 0 @@ -1004,7 +1004,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Data/UI/ShortCut/demo_skills + - Assets/Rendering/URP m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1012,16 +1012,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Resources/Data/UI/ShortCut/demo_skills + - Assets/Rendering/URP m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Stock\Projects\L2-Unity\l2-unity\l2-unity m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 345} - m_SelectedIDs: 9cae0300 - m_LastClickedID: 241308 - m_ExpandedIDs: 0000000070ae030072ae030074ae030076ae030090ae03009eae030000ca9a3b + scrollPos: {x: 0, y: 127} + m_SelectedIDs: d0ae0300 + m_LastClickedID: 241360 + m_ExpandedIDs: 0000000074ae030076ae030078ae03007aae030084ae030094ae0300a2ae030000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1049,7 +1049,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000070ae030072ae030074ae030076ae0300 + m_ExpandedIDs: 0000000074ae030076ae030078ae03007aae0300 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1076,22 +1076,22 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000066ab02007aa5020050a70200d8b600007cae020088ab02004e72d0009472d0003a72d0005872d0000472d000946c07001a6c0700da6c07006a6c0700526c070054670700ce0200008aa50000889b0000000000009af52000107107001c710700e8e9000040750200 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: URP + m_OriginalName: URP m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 704 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1127,7 +1127,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 702 - width: 1452 + width: 1296 height: 307 m_SerializedDataModeController: m_DataMode: 0 @@ -1175,7 +1175,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 44454 + m_LastSelectedObjectID: -3673750 --- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1300,9 +1300,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1741 + x: 1297 y: 73 - width: 178 + width: 622 height: 936 m_SerializedDataModeController: m_DataMode: 0 @@ -1347,10 +1347,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1313 + x: 390 y: 73 - width: 606 - height: 936 + width: 1349 + height: 608 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0