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

Merge pull request 'feature/UpdateAvatar' (#406) from feature/UpdateAvatar into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/406
This commit is contained in:
cuongnv
2026-05-06 09:52:39 +00:00
parent 0345077ef2 53c334edf8
commit 679f955654
6 changed files with 116 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Prefab/UI/HUD.prefab
+20 -6
View File
@@ -177,17 +177,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 955704001844978227}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 6806681442789174374}
m_Father: {fileID: 2197988886818318685}
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: -151.8, y: -19.49}
m_SizeDelta: {x: 128, y: 180}
m_AnchoredPosition: {x: -151.8, y: -25.389994}
m_SizeDelta: {x: 180, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2085804573552353186
CanvasRenderer:
@@ -641,6 +641,7 @@ GameObject:
- component: {fileID: 2197988886818318685}
- component: {fileID: 1084018795101285839}
- component: {fileID: 6006331445413644439}
- component: {fileID: 4723527030113453762}
m_Layer: 5
m_Name: AvatatarUI
m_TagString: Untagged
@@ -660,6 +661,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2127540135059465312}
- {fileID: 2891120192736919771}
m_Father: {fileID: 6806681442789174374}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -706,6 +708,19 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4723527030113453762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1327388134249139498}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &2461742091615804038
GameObject:
m_ObjectHideFlags: 0
@@ -1804,7 +1819,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2127540135059465312}
- {fileID: 2197988886818318685}
- {fileID: 534925566466250660}
- {fileID: 4368626321871940460}
@@ -1817,7 +1831,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: -143, y: -20}
m_AnchoredPosition: {x: -147, y: -20}
m_SizeDelta: {x: 128, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3549955056024652669
Assets/PerfectWorld/Prefab/UI/HUDNPC.prefab
+88 -74
View File
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 1981970930610958667}
- component: {fileID: 2949641406655472012}
- component: {fileID: 1500706965934165254}
- component: {fileID: 8868565517465969578}
m_Layer: 5
m_Name: AvatarNPCFrame
m_TagString: Untagged
@@ -31,7 +32,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1510810868840459915}
- {fileID: 7662868228090083206}
m_Father: {fileID: 7601428160728630082}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -121,6 +122,91 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8868565517465969578
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1273460584854605297}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &4888814010812316692
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7662868228090083206}
- component: {fileID: 4666584658878829845}
- component: {fileID: 2274486941820472865}
m_Layer: 5
m_Name: AvatarImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7662868228090083206
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4888814010812316692}
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: 8841982213385894347}
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: -1.8599851, y: -18.345009}
m_SizeDelta: {x: 180, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4666584658878829845
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4888814010812316692}
m_CullTransparentMesh: 1
--- !u!114 &2274486941820472865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4888814010812316692}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 8400000, guid: 86b263f7c57f2b2408a59d5c3bafcfe1, type: 2}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &5010991128992349155
GameObject:
m_ObjectHideFlags: 0
@@ -176,7 +262,7 @@ MonoBehaviour:
_nameText: {fileID: 8459104239633154731}
_statText: {fileID: 7225922753763360209}
healthImage: {fileID: 391766345810538963}
_avatarImage: {fileID: 5732841064457103199}
_avatarImage: {fileID: 2274486941820472865}
--- !u!1 &5230218528339883288
GameObject:
m_ObjectHideFlags: 0
@@ -603,78 +689,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8106823484631380573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1510810868840459915}
- component: {fileID: 8158437551720672858}
- component: {fileID: 5732841064457103199}
m_Layer: 5
m_Name: AvatarImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1510810868840459915
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8106823484631380573}
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: 8841982213385894347}
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, y: -19}
m_SizeDelta: {x: 128, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8158437551720672858
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8106823484631380573}
m_CullTransparentMesh: 1
--- !u!114 &5732841064457103199
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8106823484631380573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 8400000, guid: 86b263f7c57f2b2408a59d5c3bafcfe1, type: 2}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &8340737021475261245
GameObject:
m_ObjectHideFlags: 0
Assets/PerfectWorld/Resources/UI/Avatar/Avatar_EslePlayer.renderTexture
+2 -2
View File
@@ -12,8 +12,8 @@ RenderTexture:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 90
m_Height: 128
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 90
Assets/PerfectWorld/Resources/UI/Avatar/Avatar_HostPlayer.renderTexture
+2 -2
View File
@@ -12,8 +12,8 @@ RenderTexture:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 6
m_Width: 90
m_Height: 128
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 90
Assets/PerfectWorld/Resources/UI/Avatar/ElsePlayerPortraitCapture.prefab
+2 -2
View File
@@ -49,7 +49,7 @@ MonoBehaviour:
outputTexture: {fileID: 8400000, guid: 86b263f7c57f2b2408a59d5c3bafcfe1, type: 2}
portraitLayer: 9
stagePosition: {x: 9999, y: 0, z: 0}
cameraDistance: 2
cameraDistance: 0.7
faceUpLift: 0.04
lookSmoothSpeed: 20
headFaceAxis: 0
@@ -123,7 +123,7 @@ Camera:
near clip plane: 0.3
far clip plane: 10
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 0.2
m_Depth: 0
m_CullingMask:
Assets/PerfectWorld/Resources/UI/Avatar/HostPlayerPortraitCapture.prefab
+2 -2
View File
@@ -68,7 +68,7 @@ Camera:
near clip plane: 0.3
far clip plane: 10
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 0.2
m_Depth: 0
m_CullingMask:
@@ -187,7 +187,7 @@ MonoBehaviour:
portraitLayer: 9
headFaceAxis: 0
flipFaceAxis: 0
cameraDistance: 1.2
cameraDistance: 0.7
faceUpLift: 0.04
lookSmoothSpeed: 20
fieldOfView: 35