diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab index 76904481ec..7a9862d53f 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 521751511619950448} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.467, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4643159729352802538 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab index 2f9cff02fd..a2978c0cf0 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7283797167087943104} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.55, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6689449885943493666 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab index 1c239ef00c..ec10607b72 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9037966901010172822} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.52, y: 0.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6431048551573909870 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab index b58d9a0561..ac7eed401a 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4146391136452590312} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.608, y: 0.03, z: 0.031} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &8380308436026247008 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab index 91463b3dfe..eb6dcb3886 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6005744050955720459} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.439, y: -0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2976794322645826365 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab index 3ef0d67c7f..7ef984274b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3657562976579592623} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.47, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6576187325239959967 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab index 628bfa3627..deef2ec11d 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6287696647157729657} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.58, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2542169234980971614 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab index 27090810dd..3cda5e97df 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3072237174258024572} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.42, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1487446899476086846 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab index 7975cdc3a5..276b2f4502 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7691330745472418625} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.58, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &3901653839846202411 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab index 40ee246420..182e3740bf 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4687492501342321793} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.46, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2934905636045033890 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab index accf4dc9d0..7293309c38 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4523807140502598285} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.57, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7671732475859138332 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab index 0664737e3b..c2746586cd 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1673886386918577840} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.51, y: -0.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &49109103213565591 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab index f85d34a65d..38c813bb1a 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4960158712494693704} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.59, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &103797880579185270 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab index c92193aee9..829250f451 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4514596060253920102} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.44, y: -0.04, z: 0.032} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5836441970844709889 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab index ec21af8bd9..b2f895204c 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2804193919963264657} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.5, y: 0.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1936149815519356261 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab index 94e0e030a0..d5403f2c48 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6024913029217443269} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0, w: 0} + m_LocalPosition: {x: 0.45, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 90} --- !u!33 &5390486599911108339 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab index c7c76a5d2d..5f66c27691 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8954426676829949006} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.46, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &3386378493831336341 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab index 4626944e82..2eb35eff94 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8544343499760376834} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.423, y: 0.008, z: 0.009} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &8732503029651716070 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab index cdfc21612e..7165fab479 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9089679423287464323} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.439, y: 0.007, z: -0.014} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &8817967967612133426 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab index 7f6e53437c..6649be793e 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750589402820721523} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.44, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1726312771557601477 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab index 66cc26e3c4..dba528020a 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7898490744125074255} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.442, y: -0.04, z: 0.027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7727499927744400604 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab index 54d036050c..f0494a8457 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 431507536254419338} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.47, y: 0, z: 0.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2070642545782787102 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab index 449c4a512d..59b32adc4d 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113794091115841783} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.45, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7932516146755324214 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab index 6749f2cb42..3a60d6aed8 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6611500696103112802} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.359, y: 0.006, z: 0.006} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5567964522934692172 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab index 75e47e2dc3..9f6211e0e2 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8934191901732488851} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.347, y: -0.012, z: 0.012} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1458943245607846802 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab index 0f6a36965f..f188778349 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3843642197624191562} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.27, y: -0.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2942293025938461444 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab index b44e9993f4..ca0b917f3b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5369271364955280410} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.25, y: -0.09, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &3165116075288726831 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab index 3f0675a619..eed6123bbb 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627728301949147503} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.25, y: 0, z: 0.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7621110774882610367 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/石斧/石斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/石斧/石斧.prefab index 7b7867f8d6..3975bc0505 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/石斧/石斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/石斧/石斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3218176555537563708} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.235, y: 0.001, z: 0.015} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4570469791566163120 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab index 0a463f323d..20006a26a3 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4001841694840385047} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.33, y: -0.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &805389305525483483 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab index 16982f4b01..4f5ec621bb 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 4649913178893672652} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.14, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab index d1115511c4..535dcf844d 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4296978685365805745} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.09, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &3010680041828916761 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab index 96ad6c115c..150f0b4d70 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114588174620003303} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.24, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5738622860265099348 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab index 1a75c83259..ca1e1f7562 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871826936208277503} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.13, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5622821162627514245 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab index 1ab70b0a20..902a921ac9 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6657025351343012753} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.19, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4710983591303832989 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab index 0a4bb0d2b0..814b0ac7a0 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 582524068872390062} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.34, y: 0, z: 0.11} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &551222743829696411 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab index 8e689b1856..f2dca68029 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612928185602746483} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.76, y: -0.14, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &877854830967665102 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/宣花斧/宣花斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/宣花斧/宣花斧.prefab index 9096283180..0ef0ba83c2 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/宣花斧/宣花斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/宣花斧/宣花斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4720678646282004868} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.061, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2558500868448674905 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/巨灵斧/巨灵斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/巨灵斧/巨灵斧.prefab index aca39e2eef..2081ee511b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/巨灵斧/巨灵斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/巨灵斧/巨灵斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2916308637203925776} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.061, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2359515785900208490 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab index f3ac1a1fb3..b3bfe0bec8 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 252742027917821622} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.66, y: -0.14, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2067319665948465769 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab index edac5aaff0..11dbfb62a6 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5251377079602931302} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.98, y: -0.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &8337534583944483472 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/铜钺/铜钺.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/铜钺/铜钺.prefab index e9aee96fcc..bfe19b4e6f 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/铜钺/铜钺.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/铜钺/铜钺.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4858308094309864508} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.84, y: -0.064, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5945091725935784906 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/八角铜锤/八角铜锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/八角铜锤/八角铜锤.prefab index b2bb6634a8..a725f069ba 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/八角铜锤/八角铜锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/八角铜锤/八角铜锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7515438785474843149} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.013, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4684279536110930119 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab index ad95e60289..cc50fe14b0 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3632554605594395393} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.015733898, y: 0.7069317, z: -0.015733898, w: 0.7069317} + m_LocalPosition: {x: 0.7, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 2.55, y: 90, z: 0} --- !u!33 &5757475931190928569 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/工锤/工锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/工锤/工锤.prefab index 0fcebfa340..4c0357f1c4 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/工锤/工锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/工锤/工锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6015463627169791726} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.013, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5659237752439739352 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab index 685afe45a7..9b7038463b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1004382166946238604} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.78, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7739687131419528944 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/战锤/战锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/战锤/战锤.prefab index 62726f9721..27273dffe3 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/战锤/战锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/战锤/战锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197563511380039097} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.013, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &133678441249318870 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/瓦棱锤/瓦棱锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/瓦棱锤/瓦棱锤.prefab index 79cd2107d5..96d6e89f70 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/瓦棱锤/瓦棱锤.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/瓦棱锤/瓦棱锤.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6982793425996143688} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.564, y: -0.013, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1783189990820706467 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab index d848c44a41..57c033bb8b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8118372724377232535} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.40557975, y: 0.579228, z: 0.40557975, w: 0.579228} + m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -70, y: 90, z: 0} --- !u!33 &7702346965493637044 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab index 265ed5bf63..1bfbba570a 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3708902834663212576} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.45451945, y: 0.54167527, z: 0.45451945, w: 0.54167527} + m_LocalPosition: {x: 0.91, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -80, y: 90, z: 0} --- !u!33 &215318870199670359 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab index 4d46b31e94..9801ebe72c 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3386362935637178495} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.37680045, y: 0.5983489, z: 0.37680045, w: 0.5983489} + m_LocalPosition: {x: 1.82, y: 0.049, z: 0.012} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -64.4, y: 90, z: 0} --- !u!33 &2249869016674504523 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab index e9c5cb216d..69c12317c6 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5744228263443585635} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.4181191, y: 0.57024246, z: 0.4181191, w: 0.57024246} + m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -72.5, y: 90, z: 0} --- !u!33 &767111472807305304 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab index 80db0b9fab..eb28bb6bc0 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2426238636354042165} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.4131269, y: 0.5738695, z: 0.4131269, w: 0.5738695} + m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -71.5, y: 90, z: 0} --- !u!33 &1817264271704911385 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab index 2155f2b4b3..265e5e3cd4 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8478865665253152939} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.42307937, y: 0.566572, z: 0.42307937, w: 0.566572} + m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -73.5, y: 90, z: 0} --- !u!33 &1875442124140011855 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab index 68289a410e..3139307d9f 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8787341145026669753} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.652, y: -0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6886144341852739131 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab index 0a0faa5edf..da6b1fb372 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6078192489162540850} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.64, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5938416084853196401 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab index fa13412ac2..f361098fc6 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7583996414051340456} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.87, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5068162253037144888 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab index 21a9cfc69b..50e462650d 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 514324012645713218} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.57, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6641818280837675681 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab index e8655406ab..ad97ae65e3 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7423421571527749171} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.73, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &7563941420482788221 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab index 4ef73d5476..5d84e1263b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1125368435937452624} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.008453601, y: 0.7070563, z: -0.008453601, w: 0.7070563} + m_LocalPosition: {x: 0.66, y: -0.14, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 1.37, y: 90, z: 0} --- !u!33 &1430035286846886459 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab index 2e8cda4d50..eabb960cbf 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5812609165759687500} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &872845287390182096 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab index 5942a4da03..2c7359a2ed 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4202528123455853326} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.95, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4574804706647375284 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab index b5bda1519f..a983d0b66e 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 120385328447347559} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &6881055716062663917 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab index 2264b0303b..26f4766a56 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5641955314571368359} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 1.06, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &5990592806001361267 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Prefab/UIManager.prefab b/Assets/PerfectWorld/Prefab/UIManager.prefab index e9cf3ea870..0f5bff384f 100644 --- a/Assets/PerfectWorld/Prefab/UIManager.prefab +++ b/Assets/PerfectWorld/Prefab/UIManager.prefab @@ -780,6 +780,96 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &393194488981333838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5436358905371864388} + - component: {fileID: 3471177786394651986} + - component: {fileID: 8930475533815954586} + - component: {fileID: 8995978399276477764} + m_Layer: 5 + m_Name: IconHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5436358905371864388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393194488981333838} + 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: 4323229428314121332} + m_Father: {fileID: 6550142832931870620} + 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 &3471177786394651986 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393194488981333838} + m_CullTransparentMesh: 1 +--- !u!114 &8930475533815954586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393194488981333838} + 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: 697e2452f28b3244bbd4aedb324f0506, 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 &8995978399276477764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393194488981333838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &427315709131599085 GameObject: m_ObjectHideFlags: 0 @@ -1474,6 +1564,134 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &838519598652901071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9190831209898129191} + - component: {fileID: 7382895648940793749} + - component: {fileID: 6643291068587620150} + - component: {fileID: 4529057318008104088} + - component: {fileID: 7933533225200336064} + m_Layer: 5 + m_Name: ButtonHPItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9190831209898129191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838519598652901071} + 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: 5285195702581382648} + m_Father: {fileID: 9056141770234008732} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -656.2, y: 681.9} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7382895648940793749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838519598652901071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b2df34c4410f46b5865b5178bfe3058, type: 3} + m_Name: + m_EditorClassIdentifier: + slotIndex: -1 + disPlayImage: {fileID: 4966657577187018761} + skillbutton: {fileID: 7933533225200336064} + borderImage: {fileID: 5261573525275649535} + cooldownTime: 9 + m_ClockCounter: {fileID: 6643291068587620150} + isNotCastSkill: 0 + m_TextAmount: {fileID: 5046908614215045601} +--- !u!114 &6643291068587620150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838519598652901071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70ec0de7d6bb5134fbdf6bf9b1cfbff4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ClockIcon: {fileID: 842444451410779243} + m_iMin: 0 + m_iMax: 0 + m_iPos: 0 +--- !u!222 &4529057318008104088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838519598652901071} + m_CullTransparentMesh: 1 +--- !u!114 &7933533225200336064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838519598652901071} + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &921810299079476810 GameObject: m_ObjectHideFlags: 0 @@ -2106,6 +2324,81 @@ MonoBehaviour: m_PointerBehavior: 0 m_CursorLockBehavior: 0 m_ScrollDeltaPerTick: 6 +--- !u!1 &1287587630908865938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8992300870168916263} + - component: {fileID: 1553206163926497400} + - component: {fileID: 842444451410779243} + m_Layer: 5 + m_Name: ImageLock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8992300870168916263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287587630908865938} + 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: 6539541629831069250} + 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: -16, y: -16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1553206163926497400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287587630908865938} + m_CullTransparentMesh: 1 +--- !u!114 &842444451410779243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287587630908865938} + 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: 0.2924528, g: 0.22485758, b: 0.22485758, 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1320901936805636085 GameObject: m_ObjectHideFlags: 0 @@ -4025,6 +4318,81 @@ MonoBehaviour: isAlert: 0 m_InputValidator: {fileID: 0} m_ShouldActivateOnSelect: 1 +--- !u!1 &2407043684087297221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5753210460596773607} + - component: {fileID: 62984944633540731} + - component: {fileID: 4657637382436301804} + m_Layer: 5 + m_Name: ImageLock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5753210460596773607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407043684087297221} + 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: 4323229428314121332} + 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: -16, y: -16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &62984944633540731 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407043684087297221} + m_CullTransparentMesh: 1 +--- !u!114 &4657637382436301804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407043684087297221} + 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: 0.2924528, g: 0.22485758, b: 0.22485758, a: 0.6117647} + 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2419254825889015091 GameObject: m_ObjectHideFlags: 0 @@ -5197,6 +5565,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3180315909736247254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5584100995578949242} + - component: {fileID: 4627031174241817993} + - component: {fileID: 4966657577187018761} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5584100995578949242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3180315909736247254} + 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: 6539541629831069250} + 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: 6, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4627031174241817993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3180315909736247254} + m_CullTransparentMesh: 1 +--- !u!114 &4966657577187018761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3180315909736247254} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7910159920041122899, guid: a141ce1b94af3cf46aa0695ab5ed6cdd, 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 &3187516571348395154 GameObject: m_ObjectHideFlags: 0 @@ -6688,6 +7131,96 @@ MonoBehaviour: m_EditorClassIdentifier: _label: {fileID: 2783766523292921853} _btnCancel: {fileID: 6372996403105058889} +--- !u!1 &3822147508416785663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5285195702581382648} + - component: {fileID: 8335946309742761274} + - component: {fileID: 623714079993167012} + - component: {fileID: 6243320184674300750} + m_Layer: 5 + m_Name: IconHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5285195702581382648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3822147508416785663} + 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: 6539541629831069250} + m_Father: {fileID: 9190831209898129191} + 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 &8335946309742761274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3822147508416785663} + m_CullTransparentMesh: 1 +--- !u!114 &623714079993167012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3822147508416785663} + 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: 697e2452f28b3244bbd4aedb324f0506, 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 &6243320184674300750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3822147508416785663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &3988455266904546379 GameObject: m_ObjectHideFlags: 0 @@ -7610,6 +8143,173 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ReviveOptionPopup: {fileID: 8167981555289453890} +--- !u!1 &5177492476293168811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1201998992865507875} + - component: {fileID: 4054128017641116982} + - component: {fileID: 3415026819600636449} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1201998992865507875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177492476293168811} + 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: 4323229428314121332} + 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: 6, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4054128017641116982 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177492476293168811} + m_CullTransparentMesh: 1 +--- !u!114 &3415026819600636449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5177492476293168811} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7910159920041122899, guid: a141ce1b94af3cf46aa0695ab5ed6cdd, 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 &5261573525275649535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6539541629831069250} + - component: {fileID: 5600699028310642834} + - component: {fileID: 250673776198584683} + - component: {fileID: 6185000055952551984} + m_Layer: 5 + m_Name: ImageBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6539541629831069250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261573525275649535} + 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: 5584100995578949242} + - {fileID: 8992300870168916263} + - {fileID: 7669270873690823761} + m_Father: {fileID: 5285195702581382648} + 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: 5.999999, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5600699028310642834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261573525275649535} + m_CullTransparentMesh: 1 +--- !u!114 &250673776198584683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261573525275649535} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 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!114 &6185000055952551984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261573525275649535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &5490291313877083687 GameObject: m_ObjectHideFlags: 0 @@ -7828,6 +8528,8 @@ RectTransform: - {fileID: 4139081827044063170} - {fileID: 7693611257239889377} - {fileID: 5764038139312484550} + - {fileID: 9190831209898129191} + - {fileID: 6550142832931870620} - {fileID: 7592287337898200118} m_Father: {fileID: 3233441867675090637} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7859,6 +8561,8 @@ MonoBehaviour: - {fileID: 2971821658315981769} - {fileID: 452969679978752531} - {fileID: 3647934876571221831} + HpItemButton: {fileID: 7382895648940793749} + MpItemButton: {fileID: 7614763976671640739} m_nCurPanel1: 1 m_nCurPanel2: 1 m_bShowAll1: 0 @@ -9013,6 +9717,142 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6210691000897629082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2074519717701126543} + - component: {fileID: 8433692982734496021} + - component: {fileID: 4718149062455034050} + m_Layer: 5 + m_Name: AmountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2074519717701126543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210691000897629082} + 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: 4323229428314121332} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 3, y: 3} + m_SizeDelta: {x: -6, y: 20.4472} + m_Pivot: {x: 0, y: 0} +--- !u!222 &8433692982734496021 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210691000897629082} + m_CullTransparentMesh: 1 +--- !u!114 &4718149062455034050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6210691000897629082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: x999 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6353807544545313732 GameObject: m_ObjectHideFlags: 0 @@ -9492,6 +10332,134 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6717017273578620445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6550142832931870620} + - component: {fileID: 7614763976671640739} + - component: {fileID: 5948058426259706520} + - component: {fileID: 7047362733096336047} + - component: {fileID: 4210950067272214338} + m_Layer: 5 + m_Name: ButtonMPItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6550142832931870620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717017273578620445} + 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: 5436358905371864388} + m_Father: {fileID: 9056141770234008732} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -558.6, y: 680.9} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7614763976671640739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717017273578620445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b2df34c4410f46b5865b5178bfe3058, type: 3} + m_Name: + m_EditorClassIdentifier: + slotIndex: -1 + disPlayImage: {fileID: 3415026819600636449} + skillbutton: {fileID: 4210950067272214338} + borderImage: {fileID: 9185267946099793297} + cooldownTime: 9 + m_ClockCounter: {fileID: 5948058426259706520} + isNotCastSkill: 0 + m_TextAmount: {fileID: 4718149062455034050} +--- !u!114 &5948058426259706520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717017273578620445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70ec0de7d6bb5134fbdf6bf9b1cfbff4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ClockIcon: {fileID: 4657637382436301804} + m_iMin: 0 + m_iMax: 0 + m_iPos: 0 +--- !u!222 &7047362733096336047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717017273578620445} + m_CullTransparentMesh: 1 +--- !u!114 &4210950067272214338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717017273578620445} + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6749548056585646144 GameObject: m_ObjectHideFlags: 0 @@ -12260,6 +13228,8 @@ MonoBehaviour: - {fileID: 445184971459596056} - {fileID: 3804662600613272361} - {fileID: 1774515210692260948} + HpItemButton: {fileID: 0} + MpItemButton: {fileID: 0} m_nCurPanel1: 1 m_nCurPanel2: 1 m_bShowAll1: 0 @@ -13106,6 +14076,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9176642970006855569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7669270873690823761} + - component: {fileID: 5809446564341675467} + - component: {fileID: 5046908614215045601} + m_Layer: 5 + m_Name: AmountText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7669270873690823761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9176642970006855569} + 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: 6539541629831069250} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 3, y: 3} + m_SizeDelta: {x: -6, y: 20.4472} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5809446564341675467 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9176642970006855569} + m_CullTransparentMesh: 1 +--- !u!114 &5046908614215045601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9176642970006855569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: x999 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &9180479633438435476 GameObject: m_ObjectHideFlags: 0 @@ -13242,6 +14348,98 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9185267946099793297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4323229428314121332} + - component: {fileID: 5722727920572827920} + - component: {fileID: 8168192781954405461} + - component: {fileID: 9188866318666449746} + m_Layer: 5 + m_Name: ImageBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4323229428314121332 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9185267946099793297} + 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: 1201998992865507875} + - {fileID: 5753210460596773607} + - {fileID: 2074519717701126543} + m_Father: {fileID: 5436358905371864388} + 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: 5.999999, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5722727920572827920 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9185267946099793297} + m_CullTransparentMesh: 1 +--- !u!114 &8168192781954405461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9185267946099793297} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 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!114 &9188866318666449746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9185267946099793297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1001 &47186325689700198 PrefabInstance: m_ObjectHideFlags: 0 @@ -13742,7 +14940,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 776624419558043962, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} propertyPath: m_text - value: 74850388 + value: 39 objectReference: {fileID: 0} - target: {fileID: 848034462487949471, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3} propertyPath: m_AnchorMax.y @@ -19363,6 +20561,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 612290564657202925, guid: f2e88ae97c9b2624dbbad1d5fc0c14b8, type: 3} + propertyPath: m_text + value: 0 + objectReference: {fileID: 0} - target: {fileID: 720995613977598853, guid: f2e88ae97c9b2624dbbad1d5fc0c14b8, type: 3} propertyPath: m_SizeDelta.y value: 0 diff --git a/Assets/PerfectWorld/Scene/Bootstrap.unity b/Assets/PerfectWorld/Scene/Bootstrap.unity index 05360e0fde..141d371899 100644 --- a/Assets/PerfectWorld/Scene/Bootstrap.unity +++ b/Assets/PerfectWorld/Scene/Bootstrap.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:543e09f5571b2d48dd57646eee06f8efbc71e6aaa62d6e8a98a529dec44b7364 -size 322591 +oid sha256:f85e6e6bc4d5b6af2e103cf46a846213439f86c209bed0512839f28b8c23a7c6 +size 326984 diff --git a/Assets/PerfectWorld/Scripts/Camera/CameraController.cs b/Assets/PerfectWorld/Scripts/Camera/CameraController.cs index 07a774047a..ed5a8a6973 100644 --- a/Assets/PerfectWorld/Scripts/Camera/CameraController.cs +++ b/Assets/PerfectWorld/Scripts/Camera/CameraController.cs @@ -26,6 +26,7 @@ namespace BrewMonster private float _lastPinchDistance; private bool _pinchZoomActive; + private int _touchCount = 0; public CinemachineOrbitalFollow Orbital { get => orbital;} @@ -63,11 +64,19 @@ namespace BrewMonster public void OnPointerDown(PointerEventData eventData) { fingerDown = true; + if(_touchCount < 2) + { + _touchCount++; + } } public void OnPointerUp(PointerEventData eventData) { fingerDown = false; + if(_touchCount > 0) + { + _touchCount--; + } } private void OnValidate() @@ -133,7 +142,7 @@ namespace BrewMonster return; } - if (Input.touchCount == 2) + if (_touchCount == 2) { Touch t0 = Input.GetTouch(0); Touch t1 = Input.GetTouch(1); diff --git a/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs index 0a5ce5450e..85b15e413c 100644 --- a/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs +++ b/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs @@ -151,6 +151,8 @@ namespace BrewMonster pEvent.SetIsCluster(bCluster); pEvent.SetFadeOut(bFadeOut); pEvent.SetGoblinSkill(bIsGoblinSkill); + pEvent.SetShowFlyGfx(!string.IsNullOrEmpty(szFlyGfx)); + pEvent.SetShowHitGfx(!string.IsNullOrEmpty(szHitGfx)); ECMODEL_GFX_PROPERTY Prop = new ECMODEL_GFX_PROPERTY(); if (GetPropertyById(nHostID, ref Prop)) @@ -192,7 +194,9 @@ namespace BrewMonster protected long m_nHostID; protected long m_nTargetID; protected uint m_dwModifier; - protected bool m_bIsGoblinSkill; + protected bool m_bIsGoblinSkill; + protected bool m_bShowFlyGfx; + protected bool m_bShowHitGfx; protected Vector3 m_vHostPos; protected Vector3 m_vTargetPos; @@ -222,6 +226,8 @@ namespace BrewMonster m_enumState = GfxSkillEventState.enumWait; m_bHitGfxInfinite = false; m_bIsGoblinSkill = false; + m_bShowFlyGfx = true; + m_bShowHitGfx = true; m_bTargetDirAndUpExist = false; m_bGfxUseLod = true; m_bGfxDisableCamShake = false; @@ -336,12 +342,16 @@ namespace BrewMonster public void SetModifier(uint dwModifier) { m_dwModifier = dwModifier; } public void SetGoblinSkill(bool bGoblinSkill) { m_bIsGoblinSkill = bGoblinSkill; } public bool GetGoblinSkill() { return m_bIsGoblinSkill; } + public void SetShowFlyGfx(bool b) { m_bShowFlyGfx = b; } + public void SetShowHitGfx(bool b) { m_bShowHitGfx = b; } public void Resume() { //ReleaseGfx(); m_enumState = GfxSkillEventState.enumWait; m_dwCurSpan = 0; + m_bShowFlyGfx = true; + m_bShowHitGfx = true; } // Virtual functions diff --git a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs index ac8cc94512..fcfc388899 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs @@ -329,6 +329,7 @@ namespace BrewMonster /// private void SpawnFlyGfx() { + if (!m_bShowFlyGfx) return; if (m_pComposer == null) { @@ -411,6 +412,7 @@ namespace BrewMonster /// private void SpawnHitGfx(Vector3 vTarget) { + if (!m_bShowHitGfx) return; if (m_pComposer == null) { diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs index 658a7992c9..edfce9b093 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs @@ -3,6 +3,7 @@ using BrewMonster.Network; using BrewMonster.Scripts; using CSNetwork.GPDataType; using PerfectWorld.Scripts; +using PerfectWorld.Scripts.Managers; using CSNetwork; using UnityEngine; using static BrewMonster.Scripts.CECHPWork; @@ -610,6 +611,36 @@ namespace BrewMonster return bOK; } + /// + /// HUD / shortcut: walk to and pick up the nearest ground item or money (not mines) within range. + /// + /// Max horizontal distance to search (meters). + /// True if a matter was found and started. + public bool TryPickupNearestGroundMatter(float maxSearchRadiusH = 80f) + { + if (IsDead() || m_pWorkMan == null) + return false; + + if (m_pWorkMan.IsSitting()) + { + UnityGameSession.c2s_CmdStandUp(); + return false; + } + + if (!CanDo(ActionCanDo.CANDO_MOVETO)) + return false; + + EC_ManMatter matterMan = EC_ManMessageMono.Instance?.EC_ManMatter; + if (matterMan == null) + return false; + + CECMatter nearest = matterMan.GetNearestPickupableMatter(GetPos(), maxSearchRadiusH); + if (nearest == null) + return false; + + return PickupObject(nearest.GetMatterID(), false); + } + // Check whether host can gather specified matter / Check whether host can gather specified matter public bool CanGatherMatter(CECMatter pMatter) { diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs index e16ff0228f..04fa47906f 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs @@ -81,6 +81,7 @@ namespace BrewMonster.Scripts var old = m_aItems[iSlot]; m_aItems[iSlot] = pItem; + EventBus.Publish(new InventoryChangedEvent()); return old; } @@ -92,6 +93,7 @@ namespace BrewMonster.Scripts } m_aItems[iSlot] = pItem; + EventBus.Publish(new InventoryChangedEvent()); } public EC_IvtrItem GetItem(int iSlot, bool bRemove = false) @@ -144,6 +146,7 @@ namespace BrewMonster.Scripts m_aItems[iSlot] = newItem; piLastSlot = iSlot; piLastAmount = iAmount; + EventBus.Publish(new InventoryChangedEvent()); return true; } if (slotItem.GetTemplateID() != tid) @@ -156,6 +159,7 @@ namespace BrewMonster.Scripts slotItem.AddAmount(add); piLastSlot = iSlot; piLastAmount = slotItem.GetCount(); + EventBus.Publish(new InventoryChangedEvent()); return true; } @@ -179,6 +183,7 @@ namespace BrewMonster.Scripts { piLastSlot = i; piLastAmount = slotItem.GetCount(); + EventBus.Publish(new InventoryChangedEvent()); return true; } } @@ -201,6 +206,7 @@ namespace BrewMonster.Scripts m_aItems[firstEmpty] = newItem; piLastSlot = firstEmpty; piLastAmount = iAmount; + EventBus.Publish(new InventoryChangedEvent()); return true; } @@ -240,6 +246,7 @@ namespace BrewMonster.Scripts } RemoveItem(iSrc, iAmount); + EventBus.Publish(new InventoryChangedEvent()); return true; } @@ -258,6 +265,7 @@ namespace BrewMonster.Scripts if (newCount <= 0) m_aItems[iSlot] = null; + EventBus.Publish(new InventoryChangedEvent()); return true; } @@ -341,5 +349,21 @@ namespace BrewMonster.Scripts m_aItems[i].Freeze(false); } } + public void GetAllItemsOfType(out List items) where T : EC_IvtrItem + { + items = new List(); + for (int i = 0; i < m_aItems.Length; i++) + { + if (m_aItems[i] != null) + if (m_aItems[i] is T item) + items.Add(item); + } + } } + + /// + /// Fired when any client-side inventory pack mutates (add/remove/move/merge). + /// Used by UI (quickbar HP/MP auto-pick) to re-evaluate best potions. + /// + public struct InventoryChangedEvent { } } diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs index 6f18117f1f..7435db4835 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs @@ -1133,7 +1133,6 @@ namespace BrewMonster.Scripts.Managers { if (button == null || itemData == null) { - Debug.LogWarning("[UpdateCooldownOverlay] Button or itemData is null"); return; } @@ -1146,7 +1145,6 @@ namespace BrewMonster.Scripts.Managers { // Cached but destroyed, remove and search again // 已缓存但被销毁，移除并重新查找 - Debug.LogWarning($"[UpdateCooldownOverlay] Cached overlay was destroyed for button {button.name}"); _overlayImages.Remove(button); } } @@ -1165,12 +1163,12 @@ namespace BrewMonster.Scripts.Managers } else { - Debug.LogWarning($"[UpdateCooldownOverlay] Found transform but no Image component on image_overlay for button {button.name}"); + } } else { - Debug.LogWarning($"[UpdateCooldownOverlay] Cannot find image_overlay child in button {button.name}"); + } } @@ -1435,6 +1433,7 @@ namespace BrewMonster.Scripts.Managers string fullDesc = null; if (showEquipmentDetails && currentSelectedEquipment != null) { + currentSelectedEquipment.SetPriceScale((int)EC_IvtrItem.ScaleType.SCALE_SELL, 1f); fullDesc = currentSelectedEquipment.GetDesc(EC_IvtrItem.DescType.DESC_NORMAL, EC_Game.GetGameRun().GetHostPlayer().GetEquipment()); } else diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrEquip.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrEquip.cs index a7650f3420..f65c3c43d5 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrEquip.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrEquip.cs @@ -171,10 +171,8 @@ namespace BrewMonster.Scripts /// class id /// public int CID { get; set; } - public int Price { get; set; } public int Count { get; set; } - public float PriceScale { get; set; } - public int ScaleType { get; set; } + //public int ScaleType { get; set; } // Equipment Requirements public int LevelReq { get; set; } @@ -569,10 +567,10 @@ namespace BrewMonster.Scripts TemplateId = tid; ExpireDate = expireDate; CID = (int)InventoryClassId.ICID_EQUIP; - Price = 0; + m_iPrice = 0; Count = 1; - PriceScale = 1.0f; - ScaleType = 0; + m_fPriceScale = 1.0f; + //ScaleType = 0; LevelReq = 0; StrengthReq = 0; @@ -600,10 +598,10 @@ namespace BrewMonster.Scripts TemplateId = other.TemplateId; ExpireDate = other.ExpireDate; CID = other.CID; - Price = other.Price; + m_iPrice = other.m_iPrice; Count = other.Count; - PriceScale = other.PriceScale; - ScaleType = other.ScaleType; + m_fPriceScale = other.m_fPriceScale; + //ScaleType = other.ScaleType; // Copy equipment properties LevelReq = other.LevelReq; @@ -751,10 +749,10 @@ namespace BrewMonster.Scripts if (len < 16 + 6 * 2 + 8 + 2) return false; // A legacy format we used earlier that prefixed price/scale before requirements - Price = BitConverter.ToInt32(data, offset); offset += 4; + m_iPrice = BitConverter.ToInt32(data, offset); offset += 4; Count = BitConverter.ToInt32(data, offset); offset += 4; - PriceScale = BitConverter.ToSingle(data, offset); offset += 4; - ScaleType = BitConverter.ToInt32(data, offset); offset += 4; + m_fPriceScale = BitConverter.ToSingle(data, offset); offset += 4; + //ScaleType = BitConverter.ToInt32(data, offset); offset += 4; LevelReq = BitConverter.ToInt16(data, offset); offset += 2; ProfReq = BitConverter.ToInt16(data, offset); offset += 2; @@ -980,17 +978,25 @@ namespace BrewMonster.Scripts /// /// Get scaled item price /// - public int GetScaledPrice() + public override int GetScaledPrice() { - if (ScaleType != SCALE_SELL) - return (int)(Price * Count * PriceScale + 0.5f); - - int price = Price * Count; + Debug.Log($"GetScaledPrice: m_iScaleType: {m_iScaleType}"); + if (m_iScaleType != (int)EC_IvtrItem.ScaleType.SCALE_SELL) + return base.GetScaledPrice(); + + int price = m_iPrice * Count; if (MaxEndurance == CurEndurance || MaxEndurance == 0) - return (int)(price * PriceScale + 0.5f); + { + Debug.Log($"GetScaledPrice: price: {price}, MaxEndurance: {m_fPriceScale}"); + return (int)(price * m_fPriceScale + 0.5f); + } + else - return (int)(price * PriceScale * CurEndurance / (float)MaxEndurance + 0.5f); + { + Debug.Log($"GetScaledPrice: price: {price}, PriceScale: {m_fPriceScale}, CurEndurance: {CurEndurance}, MaxEndurance: {MaxEndurance}, factor: {CurEndurance / (float)MaxEndurance}"); + return (int)(price * m_fPriceScale * CurEndurance / (float)MaxEndurance + 0.5f); + } } /// @@ -1876,7 +1882,7 @@ namespace BrewMonster.Scripts /// /// Add price description /// - public void AddPriceDesc(int col, bool repair) + protected override void AddPriceDesc(int col, bool repair) { if (repair) AddDescText(col, false, GetItemDescString(DescriptipionMsg.ITEMDESC_REPAIRCOST), GetRepairCost()); diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrGoblin.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrGoblin.cs index b4c5beb0df..d75f44eee8 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrGoblin.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrGoblin.cs @@ -165,7 +165,7 @@ namespace BrewMonster.Scripts DATA_TYPE DataType = DATA_TYPE.DT_INVALID; m_pDBEssence = (GOBLIN_ESSENCE)pDB.get_data_ptr((uint)tid, ID_SPACE.ID_SPACE_ESSENCE, ref DataType); m_iPileLimit = m_pDBEssence.pile_num_max; - Price = m_pDBEssence.price; + m_iPrice = m_pDBEssence.price; m_iShopPrice = m_pDBEssence.shop_price; m_iProcType = (int)m_pDBEssence.proc_type; m_bNeedUpdate = false; diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs index 183694dda1..408d3ac2e9 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs @@ -1141,6 +1141,8 @@ namespace BrewMonster.Scripts public virtual int GetScaledPrice() { int iPrice = m_iScaleType == (int)ScaleType.SCALE_BUY ? m_iShopPrice : m_iPrice; + string str = m_iScaleType == (int)ScaleType.SCALE_BUY ? "ShopPrice" : "Price"; + Debug.Log($"GetScaledPrice: iPrice: {iPrice} is {str}, m_iScaleType: {m_iScaleType}, m_fPriceScale: {m_fPriceScale}"); return GetScaledPrice(iPrice, m_iCount, m_iScaleType, m_fPriceScale); } diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs index 7ae2af6e3c..52a948990a 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs @@ -18,6 +18,13 @@ namespace BrewMonster.Scripts protected MEDICINE_ESSENCE m_pDBEssence; protected int m_iLevelReq; + + // Expose data needed by UI/shortcut logic. + // 暴露给UI/快捷栏需要的数据 (Expose data needed by UI/quickbar). + public int GetMajorTypeId() => (int)m_pDBMajorType.id; + public int GetLevelReq() => m_iLevelReq; + public int GetHpAddTotal() => m_pDBEssence.hp_add_total; + public int GetMpAddTotal() => m_pDBEssence.mp_add_total; /// /// Create medicine item (cac loai thuoc) /// @@ -171,14 +178,16 @@ namespace BrewMonster.Scripts } // Check item use condition - protected bool CheckUseCondition() + public override bool CheckUseCondition() { CECHostPlayer pHost = CECGameRun.Instance.GetHostPlayer(); + if (pHost == null) + return false; if (pHost.GetMaxLevelSofar() < m_iLevelReq) return false; - return true; + return IsUseable() && GetCount() > 0; } // Get drop model for shown diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs index 1275ab4198..6860f41640 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs @@ -314,6 +314,31 @@ namespace PerfectWorld.Scripts.Managers } return null; } + + /// + /// Nearest ground item or money matter within horizontal of . + /// Mines (gather nodes) are excluded — use direct click / gather flow for those. + /// + public CECMatter GetNearestPickupableMatter(A3DVECTOR3 hostPos, float maxRadiusH) + { + CECMatter best = null; + float bestDist = float.MaxValue; + foreach (var kv in m_MatterTab) + { + CECMatter m = kv.Value; + if (m == null || !m) + continue; + if (m.IsMine()) + continue; + + float d = m.CalcDist(hostPos, false); + if (d > maxRadiusH || d >= bestDist) + continue; + bestDist = d; + best = m; + } + return best; + } public CECMatter CreateMatter(info_matter info) { diff --git a/Assets/PerfectWorld/Scripts/Task/ATaskTemplMan.cs b/Assets/PerfectWorld/Scripts/Task/ATaskTemplMan.cs index 0aa18c8d5e..f9977e61f4 100644 --- a/Assets/PerfectWorld/Scripts/Task/ATaskTemplMan.cs +++ b/Assets/PerfectWorld/Scripts/Task/ATaskTemplMan.cs @@ -707,43 +707,40 @@ namespace BrewMonster.Scripts.Task return false; } - // 可接任务列表 // Available tasks list + // 可接任务列表（全量一次扫完；分帧接口见 ProcessAvailableTasksChunk） + // Available tasks list (full scan in one call; time-sliced API: ProcessAvailableTasksChunk) public void GetAvailableTasks(TaskInterface pPlayer, List lst) { if (lst == null) return; if (lst.Capacity < 256) lst.Capacity = 256; // 预留容量 // reserve capacity - - string log = ""; - - int count = m_TasksCanSeekOut.Count; - for (int i = 0; i < count; i++) + lst.Clear(); + int cursor = 0; + bool completed; + do { - ATaskTempl pTempl = m_TasksCanSeekOut[i]; + ProcessAvailableTasksChunk(pPlayer, lst, ref cursor, int.MaxValue, out completed); + } while (!completed); + } + + /// + /// Process up to maxSteps templates from m_TasksCanSeekOut; cursor is next index (0 = start of list). + /// 每次最多处理 maxSteps 个 m_TasksCanSeekOut 项；cursor 为下一待处理下标。 + /// + public void ProcessAvailableTasksChunk(TaskInterface pPlayer, List lst, ref int cursor, int maxSteps, out bool completed) + { + int count = m_TasksCanSeekOut.Count; + int processed = 0; + while (cursor < count && processed < maxSteps) + { + ATaskTempl pTempl = m_TasksCanSeekOut[cursor]; + cursor++; + processed++; if (pTempl == null) continue; - - // 如果等级条件不满足则跳过 // Skip if level requirements are not met if (!pTempl.CheckReachLevel(pPlayer)) continue; - - // 玩家可接此任务则加入列表 // If player can accept this task, add to list - - var failCode = pPlayer.CanDeliverTask(pTempl.m_FixedData.m_ID); - if (failCode == 0) - { + if (pPlayer.CanDeliverTask(pTempl.m_FixedData.m_ID) == 0) lst.Add(pTempl); - } - else - { - log += $"Task ID {pTempl.m_FixedData.m_ID} Fail : {failCode} \n"; - } - - // if (i % 1000 == 0) - // { - // Debug.Log($"--- {i % 1000} Find Available Task --- \n {log}"); - // log = ""; - // } } - - + completed = cursor >= count; } public uint GetTaskStorageId(uint id) diff --git a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs index 67909fd581..73eca8f317 100644 --- a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs +++ b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs @@ -384,6 +384,8 @@ namespace BrewMonster.Scripts.Task.UI public void OnCommand_showtrace(string szCommand,bool state) { m_bShowTrace = state; Debug.Log($"[DlgTask] OnCommand_showtrace: state={m_bShowTrace}"); + if (state) + RebuildAcceptableQuestCache(); ShowTraceDialog(); } public void TraceTask(uint idTask) @@ -607,8 +609,6 @@ namespace BrewMonster.Scripts.Task.UI public void OnEventLButtonDown_Tv_Quest(uint itemData) { - // UpdateTask((int)itemData); - // POINT ptPos = pObj->GetPos(); // A3DVIEWPORTPARAM *p = m_pA3DEngine->GetActiveViewport()->GetParam(); // int x = GET_X_LPARAM(lParam) - ptPos.x - p->X; @@ -635,7 +635,7 @@ namespace BrewMonster.Scripts.Task.UI // if(pTree->GetHitArea(x,y) == AUITREEVIEW_RECT_FRAME) // CDlgWikiShortcut::PopQuestWiki(GetGameUIMan(),idTask); // } - + m_idSelTask = idTask; } // void OnEventMouseMove_Txt_QuestItem(WPARAM wParam, LPARAM lParam, AUIObject *pObj); @@ -917,9 +917,8 @@ namespace BrewMonster.Scripts.Task.UI } else if(showType2 == ShowType2.ST_NOT_RECIEVED) { - // Re-run GetAvailableTasks every trace refresh; m_vecTasksCanGet was only filled on quest UI events and stayed stale. - // 每次追踪刷新重新计算可接任务；原先仅在任务界面事件里更新列表，游戏中会一直停留在开局数据。 - RefreshVecTasksCanGet(pTask); + // Can-get list is refreshed only on level-up, quest state change (UpdateQuestView), trace toggle on, or minimion "可接" tab — not every tick. + // 可接列表仅在升级、任务变更、打开追踪、小窗切到可接时刷新，避免每帧扫全表拖垮 FPS。 tasks.Capacity = m_vecTasksCanGet.Count; tasks.AddRange(m_vecTasksCanGet); } @@ -1298,8 +1297,8 @@ namespace BrewMonster.Scripts.Task.UI } } - // Search view already rebuilt m_vecTasksCanGet inside SearchForTask(-1). - // 搜索页在 SearchForTask 内已更新 m_vecTasksCanGet。 + // Have-quest tab: rebuild can-get cache for trace minimion. Search tab: SearchForTask(-1) already filled m_vecTasksCanGet. + // 已接任务页：重建可接缓存。搜索页：SearchForTask 已写 m_vecTasksCanGet，勿二次全表扫描。 if (m_iType == 0) RefreshVecTasksCanGet(); @@ -1413,9 +1412,24 @@ namespace BrewMonster.Scripts.Task.UI /// 用 GetAvailableTasks 重建可接任务 ID 列表，与可接任务搜索树数据源一致。 /// private void RefreshVecTasksCanGet(CECTaskInterface pTaskIfKnown = null) + { + RebuildAcceptableQuestCache(pTaskIfKnown); + } + + /// + /// Rebuilds the cached list of quests the host may accept (trace minimion "可接", etc.). + /// Safe without a DlgTask instance — call from UI manager on level-up and similar. + /// 重建玩家当前可接任务 ID 缓存；可无对话框实例，由 UI 管理器在升级等时机调用。 + /// + public static void RebuildAcceptableQuestCache(CECTaskInterface pTaskIfKnown = null) { m_vecTasksCanGet.Clear(); - CECTaskInterface pTask = pTaskIfKnown ?? GetHostPlayer()?.GetTaskInterface(); + CECTaskInterface pTask = pTaskIfKnown; + if (pTask == null) + { + var run = EC_Game.GetGameRun(); + pTask = run?.GetHostPlayer()?.GetTaskInterface(); + } if (pTask == null) return; ATaskTemplMan pMan = EC_Game.GetTaskTemplateMan(); if (pMan == null) return; diff --git a/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs b/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs index 02be1aa6f4..0bb4ae9e0f 100644 --- a/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs +++ b/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs @@ -134,6 +134,7 @@ namespace BrewMonster.Scripts.Task.UI if(value) { m_nLastShowType2 = ShowType2.ST_NOT_RECIEVED; + DlgTask.RebuildAcceptableQuestCache(); } } public void OnShowDialog() diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs new file mode 100644 index 0000000000..4befe3fcc4 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs @@ -0,0 +1,52 @@ + +using UnityEngine; +using TMPro; + +namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay +{ + public class AUIImageHPMPItem : AUIImagePicture + { + [SerializeField] TMP_Text m_TextAmount; + private int _lastTemplateId = int.MinValue; + private int _lastCount = int.MinValue; + + public bool TrySetTemplateId(int templateId) + { + if (_lastTemplateId == templateId) + return false; + _lastTemplateId = templateId; + return true; + } + + public bool TrySetCount(int count) + { + if (_lastCount == count) + return false; + _lastCount = count; + return true; + } + + public void ResetRenderCache() + { + _lastTemplateId = int.MinValue; + _lastCount = int.MinValue; + } + public void SetText(string text) + { + if(m_TextAmount != null) + m_TextAmount.text = text; + } + + /// + /// HP/MP item button should only execute its assigned shortcut. + /// It must NOT open the assign-skill UI when empty. + /// + public override void Execute() + { + if (pSC != null) + { + pSC.Execute(); + } + } + } +} diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta new file mode 100644 index 0000000000..2788694e09 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9b2df34c4410f46b5865b5178bfe3058 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs index 54e191f526..9665c6a4d6 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs @@ -52,7 +52,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay } } - public void Execute() + public virtual void Execute() { if (pSC != null ) { diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs index 0e76887c8c..484641b086 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs @@ -20,18 +20,44 @@ namespace BrewMonster //[SerializeField] List m_aSkillImage = new List(); //[SerializeField] List