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

Merge remote-tracking branch 'origin/develop' into feature/skill-data

Browse Source
This commit is contained in:
VDH
2025-11-24 14:23:25 +07:00
parent 887b7d755c 15f2224d64
commit 4c1a4bd3c4
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Joystick Pack/Prefabs/Fixed Joystick.prefab
+14 -9
View File
@@ -29,10 +29,10 @@ RectTransform:
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: 2929252285020697096}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -56,17 +56,17 @@ MonoBehaviour:
m_GameObject: {fileID: 2929252283123773939}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -76,6 +76,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2929252283123773951
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -89,7 +90,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
handleRange: 1
deadZone: 0
deadZone: 1
axisOptions: 0
snapX: 0
snapY: 0
background: {fileID: 2929252283123773938}
handle: {fileID: 2929252285020697096}
--- !u!1 &2929252285020697097
@@ -120,9 +124,9 @@ RectTransform:
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: 2929252283123773938}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -146,17 +150,17 @@ MonoBehaviour:
m_GameObject: {fileID: 2929252285020697097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 010a6e5305fa7004f89c5d317b7b47d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
@@ -166,3 +170,4 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
+1
View File
@@ -1322,6 +1322,7 @@ public class CECNPC : CECObject
return;
}
}
m_npcUI.gameObject.SetActive(false);
}
m_pNPCModelPolicy.PlayModelAction(iAction, bRestart, null);
}