From a1d5f7c6867ad74ca534ba19f874687b6fdeb888 Mon Sep 17 00:00:00 2001 From: Gongpai Date: Sun, 26 Feb 2023 21:33:57 +0700 Subject: [PATCH] Game Beta V0.5.1 (Touch controls system Update) --- .../MainCharacter/Character.prefab | 62 +++- .../Character&UI/UI/List_Item_Widget.prefab | 8 +- .../UI/Select_List_Element.prefab | 138 ++++++++- .../3DAsset/Ghost_AttackObject.prefab | 4 +- .../Scenes_Assets/3DAsset/Holy_Water.prefab | 4 +- .../Character_System/Add_item_to_character.cs | 2 +- .../Character_System/Inventory_System.cs | 33 ++- .../Character_System/Player_Movement.cs | 1 + .../C_Sharp/UI/Equip_Item_List_System.cs | 6 + ProjectSettings/ProjectSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 265 +++++++++++------- 11 files changed, 394 insertions(+), 133 deletions(-) diff --git a/Assets/Character&UI/MainCharacter/Character.prefab b/Assets/Character&UI/MainCharacter/Character.prefab index 6574059..0574754 100644 --- a/Assets/Character&UI/MainCharacter/Character.prefab +++ b/Assets/Character&UI/MainCharacter/Character.prefab @@ -760,7 +760,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_TargetDisplay: 0 --- !u!114 &4200517667925857246 MonoBehaviour: @@ -2571,11 +2571,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 723 + value: -600 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 318.31323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_LocalScale.x @@ -2619,11 +2619,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2641,6 +2641,10 @@ PrefabInstance: propertyPath: m_Name value: Movement_Joystick objectReference: {fileID: 0} + - target: {fileID: 8170153791668043270, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: m_CullTransparentMesh + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} --- !u!224 &4570208839654163961 stripped @@ -8893,6 +8897,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4259282210437424883, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} propertyPath: m_RootOrder value: 0 @@ -8937,6 +8965,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7087931352518617960, guid: afefacff96f16064ca0bca0a2b879d61, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Character&UI/UI/List_Item_Widget.prefab b/Assets/Character&UI/UI/List_Item_Widget.prefab index 2f17534..19727fd 100644 --- a/Assets/Character&UI/UI/List_Item_Widget.prefab +++ b/Assets/Character&UI/UI/List_Item_Widget.prefab @@ -152,7 +152,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 3 + m_SortingOrder: 5 m_TargetDisplay: 0 --- !u!114 &564613375114771634 MonoBehaviour: @@ -166,10 +166,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 72 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Character&UI/UI/Select_List_Element.prefab b/Assets/Character&UI/UI/Select_List_Element.prefab index b58035d..cb798a9 100644 --- a/Assets/Character&UI/UI/Select_List_Element.prefab +++ b/Assets/Character&UI/UI/Select_List_Element.prefab @@ -497,6 +497,7 @@ RectTransform: - {fileID: 5028168278870018830} - {fileID: 37215461069841189} - {fileID: 675273744905987167} + - {fileID: 8992938074224788875} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -518,12 +519,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemData: + Item_Index: 0 Name: Number: 0 itemSprite: {fileID: 0} IsEquip: 0 Index: 0 - Owner: {fileID: 0} + ItemPrefeb: {fileID: 0} + useItemMode: 0 IndexEquip: 0 --- !u!95 &2361794046123494800 Animator: @@ -545,6 +548,139 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!1 &4227458316470112265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8992938074224788875} + - component: {fileID: 4940817272944506658} + - component: {fileID: 4868348320038515111} + - component: {fileID: 3199036338371604880} + m_Layer: 5 + m_Name: Item_Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8992938074224788875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227458316470112265} + 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: 1954177926229671675} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 38.5} + m_SizeDelta: {x: 77, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4940817272944506658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227458316470112265} + m_CullTransparentMesh: 1 +--- !u!114 &4868348320038515111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227458316470112265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3199036338371604880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4227458316470112265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4868348320038515111} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2124475740685663846} + m_TargetAssemblyTypeName: Equip_Item_List_System, Assembly-CSharp + m_MethodName: Touch_Select_Item + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5666027221385338206 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab b/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab index 3f41c91..69bb635 100644 --- a/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab +++ b/Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab @@ -31,8 +31,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1793019610661123709} - m_LocalRotation: {x: 0, y: 0, z: -0.5191413, w: 0.8546884} - m_LocalPosition: {x: 37.282043, y: 1.2729656, z: -0.17694937} + m_LocalRotation: {x: 0, y: 0, z: -0.62942976, w: 0.7770574} + m_LocalPosition: {x: 35.96713, y: 0.9942825, z: -0.9978251} m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes_Assets/3DAsset/Holy_Water.prefab b/Assets/Scenes_Assets/3DAsset/Holy_Water.prefab index 7877931..d29f8cd 100644 --- a/Assets/Scenes_Assets/3DAsset/Holy_Water.prefab +++ b/Assets/Scenes_Assets/3DAsset/Holy_Water.prefab @@ -31,8 +31,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1793019610661123709} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 52.850956, y: 4.018526, z: -1.1577194} + m_LocalRotation: {x: -0, y: 0, z: -0.22578649, w: 0.9741768} + m_LocalPosition: {x: 45.0658, y: 1.8381754, z: -0.098816745} m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Script/C_Sharp/Character_System/Add_item_to_character.cs b/Assets/Script/C_Sharp/Character_System/Add_item_to_character.cs index aa1de46..ef40176 100644 --- a/Assets/Script/C_Sharp/Character_System/Add_item_to_character.cs +++ b/Assets/Script/C_Sharp/Character_System/Add_item_to_character.cs @@ -86,7 +86,7 @@ void OnTriggerEnter(Collider other) if (other.gameObject.tag == "Player" && !IsSpawn) { other.gameObject.GetComponent().Add_Item_Element(itemData); - Destroy(this.gameObject); + Destroy(gameObject); print("Adddddd-----------------------"); } diff --git a/Assets/Script/C_Sharp/Character_System/Inventory_System.cs b/Assets/Script/C_Sharp/Character_System/Inventory_System.cs index ee7475d..46b7797 100644 --- a/Assets/Script/C_Sharp/Character_System/Inventory_System.cs +++ b/Assets/Script/C_Sharp/Character_System/Inventory_System.cs @@ -300,21 +300,36 @@ public void Set_Inventory_Info(Structs_Libraly.Item_Data itemData) } //ระบบเลือกไอเทม - void Select_Number_List(int Number) + public void Select_Number_List(int Number, bool select_for_touch = false, int select_number = 0) { if (GameInstance.ShowItemElementData.Count > 0) { - SelectNum += Number; - if (SelectNum > maxSelect) + if (!select_for_touch) { - SelectNum = 0; + SelectNum += Number; + if (SelectNum > maxSelect) + { + SelectNum = 0; + } + else if (SelectNum < 0) + { + SelectNum = maxSelect; + } + IsAim = false; } - else if (SelectNum < 0) + else { - SelectNum = maxSelect; + if(SelectNum == select_number) + { + Aim(!IsAim); + print(SelectNum + " Num : Sel " + select_number + " ISaIM : " + IsAim); + } else + { + IsAim = false; + } + SelectNum = select_number; } - IsAim = false; //print("Select is : " + SelectNum); Equip_Element_list[SelectNum].GetComponent().SetBool("Is_Play?", true); @@ -379,14 +394,14 @@ public void Aim(bool is_Aim) } } - public void Use_Item_Equip() + public void Use_Item_Equip(bool is_remove = false) { if (GameInstance.ShowItemElementData.Count > 0) { Structs_Libraly.Item_Data itemData = Equip_Element_list[SelectNum].GetComponent().itemData; if (itemData.useItemMode != Use_Item_System.Shoot_Projectile) - gameObject.GetComponent().Use_Item(itemData.useItemMode, itemData.ItemPrefeb, IsAim); + GetComponent().Use_Item(itemData.useItemMode, itemData.ItemPrefeb, IsAim); } } diff --git a/Assets/Script/C_Sharp/Character_System/Player_Movement.cs b/Assets/Script/C_Sharp/Character_System/Player_Movement.cs index d6a950f..f6b0d06 100644 --- a/Assets/Script/C_Sharp/Character_System/Player_Movement.cs +++ b/Assets/Script/C_Sharp/Character_System/Player_Movement.cs @@ -399,6 +399,7 @@ public void Touch_Interact_Button() } } + //ปุ่มสัมผัส - กดเปิดช่องเก็บของ public void Touch_OpenInventoryUi() { gameObject.GetComponent().Set_Inventory_Element(); diff --git a/Assets/Script/C_Sharp/UI/Equip_Item_List_System.cs b/Assets/Script/C_Sharp/UI/Equip_Item_List_System.cs index f3dfa36..56ad111 100644 --- a/Assets/Script/C_Sharp/UI/Equip_Item_List_System.cs +++ b/Assets/Script/C_Sharp/UI/Equip_Item_List_System.cs @@ -23,4 +23,10 @@ void Update() { TextNumber.SetText(GameInstance.inventoryData[IndexEquip].Number.ToString()); } + + public void Touch_Select_Item() + { + if(Application.platform == RuntimePlatform.Android || Application.platform == RuntimePlatform.WindowsEditor) + GameInstance.Player.GetComponent().Select_Number_List(0, true, GameInstance.inventoryData[IndexEquip].Index); + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ddc57ad..dd51550 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.1.1 preloadedAssets: - {fileID: -309449746400023384, guid: c3b7a506aefe90044aeba347b1f63ce8, type: 2} metroInputSource: 0 @@ -709,7 +709,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 0 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6e172fa..ad7166d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Console + m_Title: Game m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -40,16 +40,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 208 - width: 502 - height: 731 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 25} + y: 619 + width: 340 + height: 320 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 26} m_Panes: - - {fileID: 25} - {fileID: 26} - - {fileID: 16} + - {fileID: 27} + - {fileID: 17} m_Selected: 0 m_LastSelected: 2 --- !u!114 &3 @@ -69,14 +69,14 @@ MonoBehaviour: - {fileID: 2} m_Position: serializedVersion: 2 - x: 1418 + x: 1580 y: 0 - width: 502 + width: 340 height: 939 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 300 + controlID: 105 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -101,7 +101,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 299 + controlID: 28 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -192,12 +192,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1418 + width: 1580 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 344 + controlID: 29 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -217,12 +217,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1418 - height: 569 + width: 1580 + height: 571 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 345 + controlID: 30 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,20 +233,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 345 - height: 569 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + width: 349 + height: 571 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &11 @@ -264,19 +264,20 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 345 + x: 349 y: 0 - width: 1073 - height: 569 + width: 1231 + height: 571 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 18} - {fileID: 19} + - {fileID: 20} + - {fileID: 15} - {fileID: 14} m_Selected: 2 - m_LastSelected: 0 + m_LastSelected: 3 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -293,16 +294,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 569 - width: 1418 - height: 370 + y: 571 + width: 1580 + height: 368 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 20} - {fileID: 21} - - {fileID: 15} + - {fileID: 22} + - {fileID: 16} m_Selected: 0 m_LastSelected: 2 --- !u!114 &13 @@ -322,18 +323,68 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 502 - height: 208 + width: 340 + height: 619 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 22} - {fileID: 23} - {fileID: 24} + - {fileID: 25} m_Selected: 0 m_LastSelected: 0 --- !u!114 &14 +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: 0 + m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Build Settings + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 349 + y: 73 + width: 1229 + height: 550 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -353,10 +404,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 345 + x: 349 y: 73 - width: 1071 - height: 548 + width: 1229 + height: 550 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -367,7 +418,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1071, y: 527} + m_TargetSize: {x: 1229, y: 529} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -382,10 +433,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -535.5 - m_HBaseRangeMax: 535.5 - m_VBaseRangeMin: -263.5 - m_VBaseRangeMax: 263.5 + m_HBaseRangeMin: -614.5 + m_HBaseRangeMax: 614.5 + m_VBaseRangeMin: -264.5 + m_VBaseRangeMax: 264.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -403,29 +454,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1071 - height: 527 + width: 1229 + height: 529 m_Scale: {x: 1, y: 1} - m_Translation: {x: 535.5, y: 263.5} + m_Translation: {x: 614.5, y: 264.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -535.5 - y: -263.5 - width: 1071 - height: 527 + x: -614.5 + y: -264.5 + width: 1229 + height: 529 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1071, y: 548} + m_LastWindowPixelSize: {x: 1229, y: 550} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -458,7 +509,7 @@ MonoBehaviour: has unsaved changes.","m_MinSize":{"x":100.0,"y":100.0},"m_MaxSize":{"x":4000.0,"y":4000.0},"m_TitleContent":{"m_Text":"Visual Scripting Graph","m_Image":null,"m_Tooltip":""},"m_Pos":{"xMin":0.0,"yMin":642.0,"xMax":1556.0,"yMax":991.0},"m_ViewDataDictionary":null,"m_OverlayCanvas":{"destinationMarker":null,"m_LastAppliedPresetName":"Default","m_SaveData":[]}}' _objectReferences: [] ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -493,7 +544,7 @@ MonoBehaviour: m_Palette: {fileID: 5309314382553727961, guid: 944c72571554e29449802f36b0b0ec1d, type: 3} m_DrawGridGizmo: 1 m_DrawGizmos: 0 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -515,8 +566,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 344 - height: 548 + width: 348 + height: 550 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -526,7 +577,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: a45cffffea5cffff2672ffffba72ffffe672ffff9a7dffffdc7dffff0091ffff9291ffffbc91ffff2a97ffff6e97ffff92aaffff24abffff4eabffffbcadffff00aeffff24c1ffffb6c1ffffe0c1ffff54cbffff98cbffff7ae1ffff0ee2ffff44e2ffffc4f9ffff + m_ExpandedIDs: f6d3fbff34d4fbff14eafbffa8eafbffd4eafbfff0eefbff32effbff1605fcffae05fcffde05fcff6c30fcffbc30fcff9c46fcff3047fcff5c47fcffce4cfcff344dfcff1463fcffa863fcffd463fcffc4f9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -550,7 +601,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -570,10 +621,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 523 + x: 349 y: 73 - width: 941 - height: 548 + width: 1229 + height: 550 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -858,14 +909,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 735.60156, y: 162.58994, z: -86.64784} + m_Target: {x: 658.93164, y: 281.64008, z: -69.70558} speed: 2 - m_Value: {x: 735.60156, y: 162.58994, z: -86.64784} + m_Value: {x: 658.93164, y: 281.64008, z: -69.70558} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -912,17 +963,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.13947164, y: 0.22427684, z: 0.03244981, w: -0.96394974} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.13947132, y: 0.22427633, z: 0.032449737, w: -0.96394753} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 164.59352 + m_Target: 378.322 speed: 2 - m_Value: 164.59352 + m_Value: 378.322 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.06660444 @@ -936,14 +987,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.0026894133, y: -0.026399441, z: -0.00007020201, w: -0.99965197} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1145,9 +1196,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 0aec253e2c2bcd247908e64a4150a99c, type: 2} + m_AnimatorController: {fileID: 9100000, guid: 5e89fb1a612500c469b012fbbdf1361e, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 4734627594401752596, guid: 0aec253e2c2bcd247908e64a4150a99c, type: 2} + - m_Target: {fileID: -2621594676299130963, guid: 5e89fb1a612500c469b012fbbdf1361e, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -1160,7 +1211,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1181,9 +1232,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 642 - width: 1417 - height: 349 + y: 644 + width: 1579 + height: 347 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1201,22 +1252,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Script/Input + - Assets/Script/C_Sharp/Character_System m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 81 m_LastFolders: - - Assets/Script/Input + - Assets/Script/C_Sharp/Character_System m_LastFoldersGridSize: 81 m_LastProjectPath: D:\Unity_Project\SAIYASASTRA 2 m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 663} - m_SelectedIDs: 4a7e0000 - m_LastClickedID: 32330 - m_ExpandedIDs: 00000000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d00000e7e000000ca9a3bffffff7f + scrollPos: {x: 0, y: 723} + m_SelectedIDs: 4e7e0000 + m_LastClickedID: 32334 + m_ExpandedIDs: 000000009e7d0000a07d0000a27d0000a47d0000a67d0000a87d0000aa7d0000ac7d0000ae7d00000a7e000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,7 +1295,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000 + m_ExpandedIDs: 000000009e7d0000a07d0000a27d0000a47d0000a67d0000a87d0000aa7d0000ac7d0000ae7d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1271,7 +1322,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000010750000b279000082780000027400007cb10000207f0000b47800007894fcffce7a000044a80000c4ee000058750000c08000009090000094900000fa750000b6a3010012770000f475000000e1000038750000ba250100728600008693000070860000f075000068770000047900000000000042bc00008a950000f07400005eae0100acb40000307500009a8d0000e07900007a070100cc830000c8830000ba830000fe8300003a7d0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1300,7 +1351,7 @@ MonoBehaviour: m_GridSize: 81 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 149 ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1330,8 +1381,8 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -676242 ---- !u!114 &22 + m_LastSelectedObjectID: 102898 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1351,10 +1402,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1418 + x: 1580 y: 73 - width: 501 - height: 187 + width: 339 + height: 598 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1372,7 +1423,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &23 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1400,7 +1451,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &24 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1429,8 +1480,8 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 0aec253e2c2bcd247908e64a4150a99c, type: 2} ---- !u!114 &25 + m_AnimatorController: {fileID: 9100000, guid: 5e89fb1a612500c469b012fbbdf1361e, type: 2} +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1450,15 +1501,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1418 - y: 281 - width: 501 - height: 710 + x: 1580 + y: 692 + width: 339 + height: 299 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &26 +--- !u!114 &27 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0}