From 3a3bdfa7b3a50ef8ecfbbaf7023939af1cfba564 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Wed, 18 Mar 2026 17:59:36 +0700 Subject: [PATCH] Cache skill change data and save skill change data to server --- Assets/PerfectWorld/Prefab/UIManager.prefab | 399 ++++- .../Scripts/Objet/Shortcut/CECShortcutSet.cs | 8 +- .../Scripts/UI/GamePlay/AUIImagePicture.cs | 13 +- .../Scripts/UI/GamePlay/AUIToggle.cs | 9 +- .../UI/GamePlay/AUIToggleAssignSlot.cs | 4 +- .../UI/GamePlay/AUIToggleSkillAssign.cs | 5 + .../Scripts/UI/GamePlay/CdlgQuickBar.cs | 56 - .../Scripts/UI/SkillUI/DlgAssignSlots.cs | 486 ++++++ .../Scripts/UI/SkillUI/DlgAssignSlots.cs.meta | 2 + Assets/Prefabs/UI/AssignSkill.prefab | 1466 ++++++++++++++++- Assets/Resources/PerformanceTestRunInfo.json | 1 + .../PerformanceTestRunInfo.json.meta | 7 + .../Resources/PerformanceTestRunSettings.json | 1 + .../PerformanceTestRunSettings.json.meta | 7 + Assets/Resources/SkillUI.meta | 8 + .../ky nang - phim tat-assets/bo 1.png | Bin 0 -> 2655 bytes .../ky nang - phim tat-assets/bo 1.png.meta | 130 ++ .../ky nang - phim tat-assets/bo 2.png | Bin 0 -> 2940 bytes .../ky nang - phim tat-assets/bo 2.png.meta | 130 ++ .../ky nang - phim tat-assets/bo 3.png | Bin 0 -> 3106 bytes .../ky nang - phim tat-assets/bo 3.png.meta | 130 ++ .../ky nang - phim tat-assets/bo 4.png | Bin 0 -> 2898 bytes .../ky nang - phim tat-assets/bo 4.png.meta | 130 ++ .../ky nang - phim tat-assets/boskill.png | Bin 0 -> 2698 bytes .../boskill.png.meta | 130 ++ Assets/Resources/SkillUI/phim tat/Í.psd | Bin 0 -> 22768385 bytes Assets/Resources/SkillUI/phim tat/Í.psd.meta | 130 ++ 27 files changed, 3156 insertions(+), 96 deletions(-) create mode 100644 Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs create mode 100644 Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs.meta create mode 100644 Assets/Resources/PerformanceTestRunInfo.json create mode 100644 Assets/Resources/PerformanceTestRunInfo.json.meta create mode 100644 Assets/Resources/PerformanceTestRunSettings.json create mode 100644 Assets/Resources/PerformanceTestRunSettings.json.meta create mode 100644 Assets/Resources/SkillUI.meta create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 1.png create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 1.png.meta create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 2.png create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 2.png.meta create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 3.png create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 3.png.meta create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 4.png create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/bo 4.png.meta create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/boskill.png create mode 100644 Assets/Resources/SkillUI/phim tat/ky nang - phim tat-assets/boskill.png.meta create mode 100644 Assets/Resources/SkillUI/phim tat/Í.psd create mode 100644 Assets/Resources/SkillUI/phim tat/Í.psd.meta diff --git a/Assets/PerfectWorld/Prefab/UIManager.prefab b/Assets/PerfectWorld/Prefab/UIManager.prefab index 236f94075b..1a08b9a60d 100644 --- a/Assets/PerfectWorld/Prefab/UIManager.prefab +++ b/Assets/PerfectWorld/Prefab/UIManager.prefab @@ -6677,7 +6677,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -319, y: 72.8999} + m_AnchoredPosition: {x: -366, y: 54} m_SizeDelta: {x: 84, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5968563249516142148 @@ -7313,7 +7313,9 @@ MonoBehaviour: skillNameText: {fileID: 0} imageProgress: {fileID: 0} uiSkillButton: {fileID: 1484158212461992110} + uiAssignSkillButton: {fileID: 3134606437297610210} skillUI: {fileID: 5226149676194325592} + assignSkill: {fileID: 7505870794604186929} --- !u!114 &7367406124028344242 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7378,6 +7380,126 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01a97b889c107814eb3c4957c683c0b4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7197017144444982395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7889600498641702394} + - component: {fileID: 2399190332287992699} + - component: {fileID: 6234942445979735913} + - component: {fileID: 3134606437297610210} + m_Layer: 5 + m_Name: ButtonAssignSkill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7889600498641702394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197017144444982395} + 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: 3483809415181351540} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -256, y: 55.100067} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2399190332287992699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197017144444982395} + m_CullTransparentMesh: 1 +--- !u!114 &6234942445979735913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197017144444982395} + 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: 1} + 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: 21300000, guid: 01bd381b48aad4adcb84acce69e7ad24, type: 3} + m_Type: 0 + 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 &3134606437297610210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197017144444982395} + 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: 6234942445979735913} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7222864739775630687 GameObject: m_ObjectHideFlags: 0 @@ -7549,6 +7671,7 @@ RectTransform: - {fileID: 6068541250920471714} - {fileID: 984617901920738932} - {fileID: 2783469216819378410} + - {fileID: 7889600498641702394} - {fileID: 8913509984865075419} - {fileID: 7306104429597638794} - {fileID: 5823843793071880086} @@ -7562,6 +7685,7 @@ RectTransform: - {fileID: 6484535971067043072} - {fileID: 4528532603973220147} - {fileID: 4742272256638967314} + - {fileID: 5087414730531131461} m_Father: {fileID: 3233441867675090637} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -14529,6 +14653,255 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &5633980288934333260 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3483809415181351540} + m_Modifications: + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.x + value: 2160 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.y + value: 1215 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000068665 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 1393150187127059081, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1617375721872166299, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1617375721872166299, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1617375721872166299, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 109.9562 + objectReference: {fileID: 0} + - target: {fileID: 1617375721872166299, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34.01085 + objectReference: {fileID: 0} + - target: {fileID: 2606804668300983452, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.y + value: -585.2 + objectReference: {fileID: 0} + - target: {fileID: 2767451028238277408, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2767451028238277408, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2767451028238277408, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.y + value: 144.8 + objectReference: {fileID: 0} + - target: {fileID: 2767451028238277408, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 382.81186 + objectReference: {fileID: 0} + - target: {fileID: 2767451028238277408, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -92.4 + objectReference: {fileID: 0} + - target: {fileID: 4854616395463442219, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4854616395463442219, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4854616395463442219, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 127 + objectReference: {fileID: 0} + - target: {fileID: 4854616395463442219, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.5 + objectReference: {fileID: 0} + - target: {fileID: 5209698742198332103, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5209698742198332103, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5209698742198332103, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5209698742198332103, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 341.445 + objectReference: {fileID: 0} + - target: {fileID: 5209698742198332103, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -104.8 + objectReference: {fileID: 0} + - target: {fileID: 5818092462432985527, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5818092462432985527, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5818092462432985527, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 289.8686 + objectReference: {fileID: 0} + - target: {fileID: 5818092462432985527, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34.01085 + objectReference: {fileID: 0} + - target: {fileID: 6238266639003596740, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_Name + value: AssignSkill + objectReference: {fileID: 0} + - target: {fileID: 6238266639003596740, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9184880796936692226, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9184880796936692226, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9184880796936692226, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 469.781 + objectReference: {fileID: 0} + - target: {fileID: 9184880796936692226, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34.01085 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} +--- !u!224 &5087414730531131461 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 627631504828013321, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + m_PrefabInstance: {fileID: 5633980288934333260} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7505870794604186929 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2739840595217827453, guid: c7269974711314d68bdb2103c9ecebbd, type: 3} + m_PrefabInstance: {fileID: 5633980288934333260} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58821e719357c4940be20d0af5869b88, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7509275976277896982 PrefabInstance: m_ObjectHideFlags: 0 @@ -15484,6 +15857,10 @@ PrefabInstance: propertyPath: m_btnOpenCharacter value: objectReference: {fileID: 3803409312124193147} + - target: {fileID: 3313561919066668394, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3414706020273276291, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} propertyPath: m_Type value: 3 @@ -15512,6 +15889,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4263483627851733539, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4263483627851733539, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4263483627851733539, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4263483627851733539, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4823752405346273106, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} propertyPath: m_Name value: HUDPlayer @@ -15624,6 +16017,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7708887638066944733, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7924665791547601326, guid: 76408ccdbeb4c654291462fcff24a8c5, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs b/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs index a15f35e448..cdddcd410b 100644 --- a/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs +++ b/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs @@ -65,7 +65,12 @@ namespace BrewMonster return true; } - + public CECShortcutSet Clone() + { + var temp = new CECShortcutSet(); + temp.m_aShortcuts = new List(m_aShortcuts); + return temp; + } /// /// Release all shortcuts and clear the set /// @@ -761,6 +766,7 @@ namespace BrewMonster } #endregion + } #region Placeholder Classes diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs index 76b998c774..c92b20a4d7 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs @@ -1,4 +1,4 @@ -using BrewMonster.UI; +using BrewMonster.UI; using System; using System.Collections; using System.Collections.Generic; @@ -15,7 +15,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay { [Header("AUIImagePicture(Need Refactor)")] [SerializeField] protected int slotIndex = -1; - [SerializeField] CECShortcut pSC; + [SerializeField] protected CECShortcut pSC; [SerializeField] Button skillbutton; [SerializeField] protected Image skillImage; [SerializeField] GameObject borderImage; @@ -74,11 +74,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay } else { - EventBus.Publish(new OpenSkillUIEvent()); - if(slotIndex != -1) - { - EventBus.Publish(new OpenAssignSlotEvent(slotIndex)); - } + EventBus.Publish(new OpenAssignSkillUIEvent()); } // Show tooltip if hint exists @@ -105,6 +101,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay return; } skillImage.sprite = sprite; + skillImage.gameObject.SetActive(true); if(borderImage != null) borderImage.SetActive(true); } @@ -152,7 +149,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay { return m_hintText; } - public void Clear() + public virtual void Clear() { // BMLogger.Log("Clear AUIImagePicture with name: " + name) ; pSC = null; diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggle.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggle.cs index 78f9fa7ce2..676ae894e8 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggle.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggle.cs @@ -20,8 +20,15 @@ namespace BrewMonster public override void SetImage(Sprite sprite) { skillImage.sprite = sprite; + skillImage.gameObject.SetActive(true); + } + public override void Clear() + { + pSC = null; + this.SetDataPtr(null); + skillImage.gameObject.SetActive(false); + return; } - } public struct OpenAssignSkillEvent diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleAssignSlot.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleAssignSlot.cs index 5d4acf92a5..b85c6f5b64 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleAssignSlot.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleAssignSlot.cs @@ -25,7 +25,7 @@ namespace BrewMonster } private void SubscribeEvents() { - + Debug.Log($"HoangDev: SubscribeEvents: AssignSlots"); uiToggle.onValueChanged.AddListener(OnToggleValueChanged); EventBus.Subscribe(OnAssignSlotEvent); } @@ -40,11 +40,11 @@ namespace BrewMonster } private void OnAssignSlotEvent(OnAssignSkillEvent @event) { - uiToggle.isOn = false; if(@event.slotIndex == slotIndex) { var processSkill = CECGameRun.Instance.GetHostPlayer().GetPositiveSkillByID(@event.skillID); EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().SetCover(this, processSkill.GetIconFile(), EC_GAMEUI_ICONS.ICONS_SKILL); + uiToggle.isOn = false; } } } diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleSkillAssign.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleSkillAssign.cs index 8228ba3881..598255858a 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleSkillAssign.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIToggleSkillAssign.cs @@ -23,6 +23,7 @@ namespace BrewMonster } private void SubscribeEvents() { + Debug.Log($"HoangDev: SubscribeEvents: Slot"); uiToggle.onValueChanged.AddListener(OnToggleValueChanged); EventBus.Subscribe(OnAssignSkillEvent); } @@ -37,6 +38,10 @@ namespace BrewMonster } private void OnAssignSkillEvent(OnAssignSkillEvent @event) { + if(@event.skillID != skillID) + { + return; + } uiToggle.isOn = false; } } diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs index 9145182a20..daeecb59dc 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs @@ -46,25 +46,7 @@ namespace BrewMonster currentListIndex += 1; UpdateShortcuts(); } - public void Awake() - { - UnSubscribeEvents(); - SubscribeEvents(); - } - public void OnDestroy() - { - UnSubscribeEvents(); - } - public void CreateSkillShortcut() - { - Debug.Log("HoangDev: CreateSkillShortcut: " + currentSelectedSlotIndex + " : " + assignedSkill.GetSkillID()); - CECShortcutSet pSCS = CECGameRun.Instance.GetHostPlayer().GetShortcutSet1(0); - pSCS.CreateSkillShortcut(currentSelectedSlotIndex, assignedSkill); - EventBus.Publish(new OnAssignSkillEvent(assignedSkill.GetSkillID(), currentSelectedSlotIndex)); - currentSelectedSlotIndex = -1; - assignedSkill = null; - } public bool UpdateShortcuts() { CECShortcut pSC; @@ -474,43 +456,5 @@ namespace BrewMonster { return m_nCurPanel2; } - public void OnOpenAssignSlotEvent(OpenAssignSlotEvent obj) - { - currentSelectedSlotIndex = obj.slotIndex; - if(assignedSkill != null) - { - CreateSkillShortcut(); - } - } - public void OnOpenAssignSkillEvent(OpenAssignSkillEvent obj) - { - assignedSkill = CECGameRun.Instance.GetHostPlayer().GetPositiveSkillByID(obj.skillID); - if(currentSelectedSlotIndex != -1) - { - CreateSkillShortcut(); - } - } - public void OnCloseAssignSlotEvent(CloseAssignSlotEvent obj) - { - currentSelectedSlotIndex = -1; - } - public void OnCloseAssignSkillEvent(CloseAssignSkillEvent obj) - { - assignedSkill = null; - } - private void UnSubscribeEvents() - { - EventBus.Unsubscribe(OnOpenAssignSlotEvent); - EventBus.Unsubscribe(OnOpenAssignSkillEvent); - EventBus.Unsubscribe(OnCloseAssignSlotEvent); - EventBus.Unsubscribe(OnCloseAssignSkillEvent); - } - private void SubscribeEvents() - { - EventBus.Subscribe(OnOpenAssignSlotEvent); - EventBus.Subscribe(OnOpenAssignSkillEvent); - EventBus.Subscribe(OnCloseAssignSlotEvent); - EventBus.Subscribe(OnCloseAssignSkillEvent); - } } } diff --git a/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs b/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs new file mode 100644 index 0000000000..3402022c53 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs @@ -0,0 +1,486 @@ +//#define Applyforalicense + +using BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay; +using BrewMonster.Network; +using BrewMonster.Scripts; +using BrewMonster.Scripts.Managers; +using BrewMonster.Scripts.Skills; +using BrewMonster.UI; +using CSNetwork.GPDataType; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; +using static BrewMonster.PET_EGG_ESSENCE; + +namespace BrewMonster +{ + public class DlgAssignSlots : AUIDialog + { + //[SerializeField] List m_aSkillImage = new List(); + //[SerializeField] List