diff --git a/Assets/arts/animations/ui/summon/open.anim b/Assets/arts/animations/ui/summon/open.anim old mode 100755 new mode 100644 index 66c1ff0dc..827fb923e --- a/Assets/arts/animations/ui/summon/open.anim +++ b/Assets/arts/animations/ui/summon/open.anim @@ -106,6 +106,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -228,6 +237,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes index 833bbc5f9..50fe62489 100644 Binary files a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes and b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes index f68a46647..3bdee1a06 100644 Binary files a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes index 5b8545ec2..4b470df12 100644 Binary files a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/talent/talent_info_ui.prefab b/Assets/prefabs/ui/talent/talent_info_ui.prefab index 988887820..4261a9591 100644 --- a/Assets/prefabs/ui/talent/talent_info_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_info_ui.prefab @@ -1,5 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1274827387045759549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2780316087535550777} + m_Layer: 5 + m_Name: node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2780316087535550777 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + 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: 7281719863256343853} + m_Father: {fileID: 8461932745927490369} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 98} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5312408455988329922 GameObject: m_ObjectHideFlags: 0 @@ -139,7 +176,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7281719863256343853} + - {fileID: 2780316087535550777} - {fileID: 542925406295979161} - {fileID: 6460606921308710656} - {fileID: 6280937848695627019} @@ -211,8 +248,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: talent_info_ui.talent_cell - hashName: 2637804633 + - name: talent_info_ui.node.talent_cell + hashName: 3215612389 objectType: 1 gameObject: {fileID: 1302123539969920910} - name: talent_info_ui.desc_tx @@ -310,7 +347,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 181} - m_SizeDelta: {x: 500, y: 120} + m_SizeDelta: {x: 600, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7036361341493855984 CanvasRenderer: @@ -639,7 +676,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8461932745927490369} + m_TransformParent: {fileID: 2780316087535550777} m_Modifications: - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_Pivot.x @@ -695,15 +732,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_AnchoredPosition.x @@ -711,7 +748,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_AnchoredPosition.y - value: 98 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -729,6 +766,10 @@ PrefabInstance: propertyPath: m_Name value: talent_cell objectReference: {fileID: 0} + - target: {fileID: 7620133610921244272, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} --- !u!1 &1302123539969920910 stripped diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab index 20baf401b..3fd22718e 100644 --- a/Assets/prefabs/ui/talent/talent_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -73,6 +73,43 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &911451111898882452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9064211362831087906} + m_Layer: 5 + m_Name: node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9064211362831087906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911451111898882452} + 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: 7281719863256343853} + m_Father: {fileID: 5045946273449496793} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 98} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1914987686953387228 GameObject: m_ObjectHideFlags: 0 @@ -573,7 +610,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7281719863256343853} + - {fileID: 9064211362831087906} - {fileID: 542925406295979161} m_Father: {fileID: 8461932745927490369} m_RootOrder: 10 @@ -1063,8 +1100,8 @@ MonoBehaviour: hashName: 1440195839 objectType: 0 gameObject: {fileID: 4605869274671160097} - - name: talent_ui.up_node.talent_cell - hashName: 1214519910 + - name: talent_ui.up_node.node.talent_cell + hashName: 2738795512 objectType: 1 gameObject: {fileID: 1302123539969920910} - name: talent_ui.desc_tx @@ -2096,7 +2133,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 5045946273449496793} + m_TransformParent: {fileID: 9064211362831087906} m_Modifications: - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_Pivot.x @@ -2152,15 +2189,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_AnchoredPosition.x @@ -2168,7 +2205,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_AnchoredPosition.y - value: 97 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} propertyPath: m_LocalEulerAnglesHint.x