duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skill ui Process

Browse Source
This commit is contained in:
VDH
2026-01-16 18:01:33 +07:00
parent 1624864487
commit 5fc98befea
22 changed files with 6884 additions and 5392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Prefab/UI/ButtonSkill.prefab
+83 -6
View File
@@ -59,7 +59,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -150,6 +150,81 @@ MonoBehaviour:
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2858675262519194348
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8187629609230625609}
- component: {fileID: 3256854715902057219}
- component: {fileID: 4133101891108826372}
m_Layer: 5
m_Name: ImageAddSkill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8187629609230625609
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2858675262519194348}
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: 5717981154351234976}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3256854715902057219
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2858675262519194348}
m_CullTransparentMesh: 1
--- !u!114 &4133101891108826372
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2858675262519194348}
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: bc4f6bd82c82b8b4a81b4bb4e0d88d8a, 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!1 &4284393271722921544
GameObject:
m_ObjectHideFlags: 0
@@ -170,7 +245,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5717981154351234976
RectTransform:
m_ObjectHideFlags: 0
@@ -183,6 +258,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8187629609230625609}
- {fileID: 7644618114629580485}
- {fileID: 5484588459809847712}
m_Father: {fileID: 0}
@@ -206,7 +282,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
skillbutton: {fileID: 6831872353885336647}
skillImage: {fileID: 8375324328665448590}
cooldownTime: 4
borderImage: {fileID: 8778325894701854072}
cooldownTime: 9
m_ClockCounter: {fileID: 7847394660162355121}
--- !u!114 &7847394660162355121
MonoBehaviour:
@@ -324,7 +401,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7644618114629580485
RectTransform:
m_ObjectHideFlags: 0
@@ -342,7 +419,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.3055, y: 0}
m_AnchoredPosition: {x: 0, y: 1.8}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9038605487672809493
@@ -367,7 +444,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
Assets/PerfectWorld/Prefab/UI/iconPassive.prefab
+153
View File
@@ -0,0 +1,153 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5742955024492215839
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8674390294668887183}
- component: {fileID: 3282628128517699183}
- component: {fileID: 1815773137787350266}
m_Layer: 5
m_Name: iconPassive
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8674390294668887183
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5742955024492215839}
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:
- {fileID: 7771911810277427841}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3282628128517699183
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5742955024492215839}
m_CullTransparentMesh: 1
--- !u!114 &1815773137787350266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5742955024492215839}
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: 1356336560449e54a921e7243886103d, 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!1 &6638027642728938890
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7771911810277427841}
- component: {fileID: 8625946366910103990}
- component: {fileID: 7887565863755557202}
m_Layer: 5
m_Name: ImageSkill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7771911810277427841
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6638027642728938890}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8674390294668887183}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8625946366910103990
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6638027642728938890}
m_CullTransparentMesh: 1
--- !u!114 &7887565863755557202
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6638027642728938890}
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: 0}
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
Assets/PerfectWorld/Prefab/UI/iconPassive.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f3f79463e9f2f7949b552bdab8e68d33
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/PerfectWorld/Prefab/UI/iconPositive.prefab
+216
View File
@@ -0,0 +1,216 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &758545883388863872
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5894713033154134856}
- component: {fileID: 6609872407035441977}
- component: {fileID: 7823430582841952503}
m_Layer: 5
m_Name: ImageSkill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5894713033154134856
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758545883388863872}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 379109581026898739}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6609872407035441977
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758545883388863872}
m_CullTransparentMesh: 1
--- !u!114 &7823430582841952503
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758545883388863872}
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: 0}
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!1 &3546793611561224498
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 379109581026898739}
- component: {fileID: 8972064137738549491}
- component: {fileID: 9152513395777414751}
- component: {fileID: 5216217352793485275}
- component: {fileID: 4789154704751094606}
m_Layer: 5
m_Name: iconPositive
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &379109581026898739
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3546793611561224498}
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:
- {fileID: 5894713033154134856}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8972064137738549491
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3546793611561224498}
m_CullTransparentMesh: 1
--- !u!114 &9152513395777414751
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3546793611561224498}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3}
m_Name:
m_EditorClassIdentifier:
skillbutton: {fileID: 0}
skillImage: {fileID: 0}
borderImage: {fileID: 0}
cooldownTime: 0
m_ClockCounter: {fileID: 0}
--- !u!114 &5216217352793485275
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3546793611561224498}
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: 1356336560449e54a921e7243886103d, 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 &4789154704751094606
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3546793611561224498}
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: 5216217352793485275}
m_OnClick:
m_PersistentCalls:
m_Calls: []
Assets/PerfectWorld/Prefab/UI/iconPositive.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fd778133b31f30d41ba325de25c5f773
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/PerfectWorld/Prefab/UIManager.prefab
+1651 -484
View File
File diff suppressed because it is too large Load Diff
Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
+5 -2
View File
@@ -260,7 +260,11 @@ namespace BrewMonster
{
m_aShortcuts[iSlot] = null;
}
CECSCSkill skill;
if ((skill = pShortcut as CECSCSkill) != null)
{
BMLogger.LogError("SetShortcut: Setting shortcut at slot " + iSlot + $" skill = {skill.GetSkill().GetName()}");
}
m_aShortcuts[iSlot] = pShortcut;
}
@@ -562,7 +566,6 @@ namespace BrewMonster
/// </summary>
public bool LoadConfigData(byte[] pDataBuf, uint dwVer, ref int offset)
{
if (pDataBuf == null || pDataBuf.Length == 0)
{
return false;
Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillAction.cs
+13 -5
View File
@@ -1,3 +1,4 @@
using BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay;
using BrewMonster.Scripts.Skills;
using BrewMonster.UI;
using System;
@@ -9,7 +10,7 @@ namespace BrewMonster
public class CDlgSkillAction : AUIDialog
{
[SerializeField] private Button uiSkillButton;
[SerializeField] private GameObject skillUI;
[SerializeField] private SkillUI skillUI;
bool m_bOpenAction;
bool m_bReceivedNCPGreeting; // ÊÇ·ñÊÕµ½ÁËNPCµÄGreeting
@@ -19,6 +20,13 @@ namespace BrewMonster
base.Awake();
uiSkillButton.onClick.RemoveAllListeners();
uiSkillButton.onClick.AddListener(OnSkillButtonClicked);
EventBus.Unsubscribe<OpenSkillUIEvent>(OnOpenSkillUIEvent);
EventBus.Subscribe<OpenSkillUIEvent>(OnOpenSkillUIEvent);
}
private void OnOpenSkillUIEvent(OpenSkillUIEvent @event)
{
TryOpenDialog(false);
}
private void OnSkillButtonClicked()
@@ -27,15 +35,15 @@ namespace BrewMonster
}
public void TryOpenDialog(bool bAction)
{
var boolll = skillUI.activeInHierarchy;
var boolll = skillUI.gameObject.activeInHierarchy;
if (boolll)
{
skillUI.SetActive(!boolll);
skillUI.gameObject.SetActive(!boolll);
return;
}
skillUI.SetActive(!boolll);
skillUI.gameObject.SetActive(!boolll);
if (skillUI.activeInHierarchy)
if (skillUI.gameObject.activeInHierarchy)
if (!GetHostPlayer().IsTalkingWithNPC())
{
m_bOpenAction = bAction;
Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs
+3 -3
View File
@@ -163,7 +163,7 @@ namespace BrewMonster.UI
taoistRank != CECTaoistRank.GetBaseRankEnd();
taoistRank = taoistRank.GetNext())
{
BMLogger.LogError ("ResetDialog base rank " + taoistRank.GetName());
//BMLogger.LogError ("ResetDialog base rank " + taoistRank.GetName());
AddDlgsOfOneRank(taoistRank);
}
@@ -171,7 +171,7 @@ namespace BrewMonster.UI
taoistRank != CECTaoistRank.GetGodRankEnd();
taoistRank = taoistRank.GetNext())
{
BMLogger.LogError("ResetDialog base rank " + taoistRank.GetName());
//BMLogger.LogError("ResetDialog base rank " + taoistRank.GetName());
AddDlgsOfOneRank(taoistRank);
}
@@ -179,7 +179,7 @@ namespace BrewMonster.UI
taoistRank != CECTaoistRank.GetEvilRankEnd();
taoistRank = taoistRank.GetNext())
{
BMLogger.LogError("ResetDialog Evil rank " + taoistRank.GetName());
//BMLogger.LogError("ResetDialog Evil rank " + taoistRank.GetName());
AddDlgsOfOneRank(taoistRank);
}
Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
+24 -1
View File
@@ -14,14 +14,28 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
{
CECShortcut pSC;
[SerializeField] Button skillbutton;
[SerializeField] Button learnedSkillbutton;
[SerializeField] Image skillImage;
[SerializeField] GameObject borderImage;
[SerializeField] int cooldownTime;
[SerializeField] AUIClockIcon m_ClockCounter;
private void Awake()
{
skillbutton.onClick.AddListener(Execute);
learnedSkillbutton.onClick.AddListener(AddShortCutSkill);
}
private void AddShortCutSkill()
{
learnedSkillbutton.onClick.AddListener(OpenSetShortCutSkillUI);
}
private void OpenSetShortCutSkillUI()
{
}
public void SetDataPtr(CECShortcut pvData, string strName)
{
pSC = pvData;
@@ -34,10 +48,15 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
// TODO: FIXlater - get cooldown time from skill data
StartCoroutine(CooldownRoutine());
}
else
{
EventBus.Publish(new OpenSkillUIEvent());
}
}
public void SetSkillImage(Sprite sprite)
public void SetImage(Sprite sprite)
{
skillImage.sprite = sprite;
borderImage.SetActive(true);
}
private IEnumerator CooldownRoutine()
{
@@ -53,4 +72,8 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
}
public AUIClockIcon GetClockIcon() => m_ClockCounter;
}
public struct OpenSkillUIEvent
{
}
}
Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
+5 -5
View File
@@ -7,15 +7,15 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
using static BrewMonster.PET_EGG_ESSENCE;
namespace BrewMonster
{
public class CDlgQuickBar : MonoBehaviour
public class CDlgQuickBar : AUIDialog
{
//[SerializeField] List<Image> m_aSkillImage = new List<Image>();
//[SerializeField] List<Button> m_aSkillButton = new List<Button>();
[SerializeField] List<AUIImagePicture> AUIImagePictureList = new List<AUIImagePicture>();
int m_nCurPanel1 = 1;
int m_nCurPanel2 = 1;
@@ -101,7 +101,8 @@ namespace BrewMonster
pClock.SetProgressRange(0, pSkill.GetCoolingTime());
if (pHost.GetPrepSkill() == pSkill)
{
pClock.SetProgressPos(0); }
pClock.SetProgressPos(0);
}
else
{
pClock.SetProgressPos(pSkill.GetCoolingTime() - pSkill.GetCoolingCnt());
@@ -205,8 +206,7 @@ namespace BrewMonster
pCell.gameObject.SetActive(true);
//BMLogger.Log("HoangDev: QuickBar Set Skill Icon: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()));
var nameskill = ElementSkill.GetIcon((uint)pSkill.GetSkillID());
Sprite[] sprites = Resources.LoadAll<Sprite>("iconlist_skill_multisprite");
pCell.SetSkillImage(sprites.FirstOrDefault(s => s.name == nameskill));
GetGameUIMan().SetCover(pCell, nameskill, EC_GAMEUI_ICONS.ICONS_SKILL);
}
/*af_GetFileTitle(pSC->GetIconFile(), strFile);
strFile.MakeLower();
Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
+22 -11
View File
@@ -1,14 +1,15 @@
using BrewMonster.Common;
using BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay;
using BrewMonster.Common;
using BrewMonster.Managers;
using BrewMonster.Network;
using BrewMonster.Scripts.Task;
using BrewMonster.Scripts.Task.UI;
using BrewMonster.Scripts.UI;
using ModelRenderer.Scripts.Common;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using BrewMonster.Scripts.Task;
using BrewMonster.Scripts.Task.UI;
using BrewMonster.Scripts.UI;
using UnityEngine;
namespace BrewMonster.UI
@@ -19,7 +20,10 @@ namespace BrewMonster.UI
public NPC_ESSENCE? m_pCurNPCEssence;
public int m_idCurFinishTask = -1;
private DlgTask m_pDlgTask;
private Dictionary<byte, (string, Sprite[])> m_IconMap;
private const string SKILL_ICONLIST_NAME = "iconlist_skill_multisprite";
public static bool TALKPROC_IS_TERMINAL(uint id)
{
return ((id & 0x80000000u) != 0) && ((id & 0x40000000u) != 0);
@@ -37,7 +41,7 @@ namespace BrewMonster.UI
public void PopupNPCDialog(NPC_ESSENCE pEssence)
{
if(m_pDlgNPC == null)
if (m_pDlgNPC == null)
{
GameObject ob = m_dialogResouce.GetPrefabDialog("DialogNPC");
m_pDlgNPC = GameObject.Instantiate(ob, m_canvas.transform).GetComponent<DlgNPC>();
@@ -48,7 +52,7 @@ namespace BrewMonster.UI
public void PopupNPCDialog(talk_proc pTalk)
{
if(m_pDlgNPC == null)
if (m_pDlgNPC == null)
{
GameObject ob = m_dialogResouce.GetPrefabDialog("DialogNPC");
m_pDlgNPC = GameObject.Instantiate(ob, m_canvas.transform).GetComponent<DlgNPC>();
@@ -82,7 +86,7 @@ namespace BrewMonster.UI
//EC_Game.GetGameRun().GetHostPlayer().EndNPCService();
EC_ManMessageMono.Instance.EC_ManPlayer.GetHostPlayer().EndNPCService();
}
public bool UpdateTask(uint idTask, int reason)
{
// TODO:
@@ -105,7 +109,7 @@ namespace BrewMonster.UI
// m_pDlgQuestionTask.RemoveQuestionTask(idTask);
// }
if(reason == TaskTemplConstants.TASK_SVR_NOTIFY_STORAGE)
if (reason == TaskTemplConstants.TASK_SVR_NOTIFY_STORAGE)
{
// TODO
// CDlgTaskList* pDlg = (CDlgTaskList*)GetDialog("Win_QuestList");
@@ -139,12 +143,19 @@ namespace BrewMonster.UI
public override void Init()
{
base.Init();
m_IconMap = new Dictionary<byte, (string, Sprite[])>();
m_pDlgTask = GetDialog(CECUIHelper.DlgTaskName).GetComponent<DlgTask>();
m_pDlgTask.Show(false);
m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_SKILL] =("iconlist_skill_multisprite", Resources.LoadAll<Sprite>("iconlist_skill_multisprite"));
}
public void SetCover(AUIImagePicture pImgPic, string nameImage, EC_GAMEUI_ICONS iCONS_SKILL)
{
pImgPic.SetImage(m_IconMap[(byte)iCONS_SKILL].Item2.FirstOrDefault(s => s.name == nameImage));
}
}
public enum EC_GAMEUI_ICONS
public enum EC_GAMEUI_ICONS : byte
{
ICONS_ACTION = 0,
Assets/PerfectWorld/Scripts/UI/SkillUI.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 471646e92fa0d004f9b97d77b820db8e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs
+78
View File
@@ -0,0 +1,78 @@
using BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay;
using BrewMonster.UI;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace BrewMonster
{
public class CDlgSkillSubPool : AUIDialog
{
private readonly SortedSet<int> m_skills = new();
[SerializeField] private Transform ptSkillContainer;
[SerializeField] private Transform psSkillContainer;
[SerializeField] private List<AUIImagePicture> psSkillSlotList;
[SerializeField] private List<AUIImagePicture> ptSkillSlotList;
private void Awake()
{
SetUp();
}
private void SetUp()
{
LoadChildToList(ptSkillContainer, ptSkillSlotList);
LoadChildToList(psSkillContainer, psSkillSlotList);
}
private void LoadChildToList(Transform parentTF, List<AUIImagePicture> slotList)
{
foreach (Transform child in parentTF)
{
AUIImagePicture img = child.GetComponent<AUIImagePicture>();
if (img != null)
{
slotList.Add(img);
}
}
}
public override void OnEnable()
{
UpdateView();
}
private void UpdateView()
{
m_skills.Clear();
CECHostPlayer pHost = GetHostPlayer();
int i = 0;
int activeImgPicIndex = 1;
int passiveImgPicIndex = 1;
int positiveSkillNum = pHost.GetPositiveSkillNum();
//int equipSkillNum = pHost.GetEquipSkillNum();
//int passiveSkillNum = pHost.GetPassiveSkillNum();
for (i = 0; i < positiveSkillNum; i++)
{
if (ptSkillSlotList[i] == null)
{
BMLogger.LogError($"ptSkillSlotList[{i}]={ptSkillSlotList}");
break;
}
ptSkillSlotList[i].gameObject.SetActive(true);
SetImage(pHost.GetPositiveSkillByIndex(i), ptSkillSlotList[i]);
m_skills.Add(pHost.GetPositiveSkillByIndex(i).GetSkillID());
}
}
private void SetImage(CECSkill cECSkill, AUIImagePicture learnedSkillUI)
{
if(cECSkill == null)
{
BMLogger.LogError("CDlgSkillSubPool::SetImage cECSkill is null");
return;
}
GetGameUIMan().SetCover(learnedSkillUI, cECSkill.GetIconFile(), EC_GAMEUI_ICONS.ICONS_SKILL);
}
}
}
Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 4d2e79da3ae98154c98516f50b73a81b
Assets/PerfectWorld/Scripts/UI/SkillUI/SkillUI.cs
+47
View File
@@ -0,0 +1,47 @@
using System;
using UnityEngine;
using UnityEngine.UI;
namespace BrewMonster
{
public class SkillUI : MonoBehaviour
{
[SerializeField] private Button skillButton;
[SerializeField] private Button actionButton;
[SerializeField] private Button learnedSkillButton;
[SerializeField] private GameObject skillUIPanel;
[SerializeField] private GameObject actionUIPanel;
[SerializeField] private GameObject learnSkillUIPanel;
private void Awake()
{
skillButton.onClick.RemoveAllListeners();
actionButton.onClick.RemoveAllListeners();
learnedSkillButton.onClick.RemoveAllListeners();
skillButton.onClick.AddListener(OnSkillButtonClicked);
actionButton.onClick.AddListener(OnActionButtonClicked);
learnedSkillButton.onClick.AddListener(OnLearnedSkillButtonClicked);
}
private void OnLearnedSkillButtonClicked()
{
skillUIPanel.SetActive(false);
actionUIPanel.SetActive(false);
learnSkillUIPanel.SetActive(true);
}
private void OnActionButtonClicked()
{
skillUIPanel.SetActive(false);
actionUIPanel.SetActive(true);
learnSkillUIPanel.SetActive(false);
}
private void OnSkillButtonClicked()
{
skillUIPanel.SetActive(true);
actionUIPanel.SetActive(false);
learnSkillUIPanel.SetActive(false);
}
}
}
Assets/PerfectWorld/Scripts/UI/SkillUI/SkillUI.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: a9e669c5ab4137449aacd686ed4d5d9f
Assets/Prefabs/UI/SkillUI.prefab
+4548 -3936
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/a61.unity
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c76c39b1f6f2ca8de739551935e1461ca08857855d1319c19619dd05b7e35b3
size 200530484
oid sha256:b61e7e02caefb5572c869b3bfbf80dbd99911c2c19dfb61c192aebeea3ed15fd
size 200600491
Assets/Scripts/CECGameRun.cs
+3 -2
View File
@@ -258,6 +258,7 @@ public partial class CECGameRun
/// <returns>True if loaded successfully / 加载成功返回true</returns>
public bool LoadConfigsFromServer(byte[] pDataBuf, int iDataSize)
{
BMLogger.LogError("LoadConfigsFromServer ");
const uint USERCFG_VERSION = 3;
if (pDataBuf == null || iDataSize == 0)
@@ -361,11 +362,11 @@ public partial class CECGameRun
// TODO: Uncomment when game configs are available
int iSize = dr.ReadInt();
byte[] settingsData = dr.ReadData(iSize);
if (!EC_Game.GetConfigs().LoadUserConfigData(settingsData, iSize))
/* if (!EC_Game.GetConfigs().LoadUserConfigData(settingsData, iSize))
{
BMLogger.LogError("CECGameRun::LoadConfigsFromServer, Failed to load user config data");
return false;
}
}*/
}
}
catch (System.Exception e)
Assets/Scripts/CECHostPlayer.cs
-24
View File
@@ -6153,30 +6153,6 @@ namespace BrewMonster
}
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
public struct REINCARNATION_TOME
{
public int tome_exp;
public char tome_active; // 1已激活0未激活 / 1 activated 0 not activated
public int max_level; // 历史最高等级 / Historical highest level
public List<cmd_reincarnation_tome_info._entry> reincarnations;
public const int max_exp = 0; // TODO: Set actual value
public void Clear(){
tome_exp = 0;
tome_active = (char)0;
max_level = 0;
if (reincarnations != null)
{
reincarnations.Clear();
}
else
{
reincarnations = new List<cmd_reincarnation_tome_info._entry>();
}
}
};
REINCARNATION_TOME m_ReincarnationTome;
public int GetMaxLevelSofar() { return Math.Max(m_ReincarnationTome.max_level, m_BasicProps.iLevel);}
public CECCounter GetGatherCnt() { return m_GatherCnt; }
public void UpdateTimers(float dwDeltaTime)
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+5 -911
View File
File diff suppressed because one or more lines are too long