diff --git a/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab b/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab index 46038ffa2b..a9607f562d 100644 --- a/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab +++ b/Assets/ManagedResources/Prefabs/Effect/Buff/TongYong_Effect_buff_wudi.prefab @@ -316,16 +316,16 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2692898917959277323} + - component: {fileID: 7023519117441382734} m_Layer: 0 - m_Name: buff_WDXXD 1 + m_Name: TongYong_Effect_buff_wudi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2692898917959277323 -Transform: +--- !u!224 &7023519117441382734 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -339,6 +339,11 @@ Transform: m_Father: {fileID: 0} 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5028713974176146044 GameObject: m_ObjectHideFlags: 0 @@ -5553,6 +5558,6 @@ Transform: - {fileID: 2709948177419360945} - {fileID: 2512203624190304090} - {fileID: 8584142683560691132} - m_Father: {fileID: 2692898917959277323} + m_Father: {fileID: 7023519117441382734} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index e3fcfe67b8..db5e817504 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -9799,12 +9799,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 7144930083889366428} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 7 + m_Father: {fileID: -7803108222865121850} + 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: -73, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &1572569323773417563 @@ -9854,9 +9854,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: -3258366035422410537} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 3 + 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} @@ -25577,15 +25578,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 99.9786} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: -3258366035422410537} - - {fileID: 2464737965211906784} - - {fileID: -7417218276520852801} - {fileID: -8859645987379613814} - {fileID: -100897375014412121} - {fileID: 7840477457502880242} - - {fileID: -7288508588859361142} - - {fileID: 3795882027273366937} - - {fileID: -3619418234783803351} - {fileID: -3928636227828066691} - {fileID: -7803108222865121850} - {fileID: -8474452437207042981} @@ -25623,9 +25618,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: -3619418234783803351} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 11 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -25845,12 +25841,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 6960185033272747284} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 2 + m_Father: {fileID: 7840477457502880242} + 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: 377, y: 143.99995} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &268233009513622496 @@ -33298,9 +33294,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: -7288508588859361142} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 9 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -44398,9 +44395,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 2464737965211906784} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -44708,16 +44706,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1004967687612880886} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalPosition: {x: 0, y: 0, z: 98.9786} m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 4060928337411048415} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 5 + m_Father: {fileID: 8011628067624866770} + 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: 77, y: 142.99997} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4823737723693298344 @@ -44833,7 +44831,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3360585188075601704 RectTransform: m_ObjectHideFlags: 0 @@ -44847,7 +44845,7 @@ RectTransform: m_Children: - {fileID: 4449728987535257064} m_Father: {fileID: 4330148323958158182} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -44908,7 +44906,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4127916411277389435 RectTransform: m_ObjectHideFlags: 0 @@ -44922,7 +44920,7 @@ RectTransform: m_Children: - {fileID: 3813825261449738182} m_Father: {fileID: 8011628067624866770} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -60059,12 +60057,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 2578355701318810613} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 1 + m_Father: {fileID: -100897375014412121} + 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: 77, y: 143.99995} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-4340789554266929400 @@ -79729,7 +79727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &890082298661879197 RectTransform: m_ObjectHideFlags: 0 @@ -79743,7 +79741,7 @@ RectTransform: m_Children: - {fileID: 5542171691843067784} m_Father: {fileID: 4053770132861701690} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -80376,9 +80374,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: -7417218276520852801} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -87875,7 +87874,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &666760566860824669 RectTransform: m_ObjectHideFlags: 0 @@ -87889,7 +87888,7 @@ RectTransform: m_Children: - {fileID: -3222148989548170810} m_Father: {fileID: 3198430005102515251} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -88185,12 +88184,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 3217903925305295122} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 6 + m_Father: {fileID: -3928636227828066691} + 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: -373, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-2841052192673379441 @@ -103930,9 +103929,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7786658268145073970} - {fileID: 3360585188075601704} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 12 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -128131,9 +128131,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6585631384616885062} - {fileID: 7502186766485076338} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 8 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -157548,12 +157549,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 834692241} - - {fileID: 7485940279673153507} - - {fileID: 6585631384616885062} - - {fileID: 4417892464660579975} - - {fileID: 2593633115569930101} - - {fileID: 5541316517095428245} - - {fileID: 7786658268145073970} - {fileID: 3198430005102515251} - {fileID: 4733835317090964167} - {fileID: 4053770132861701690} @@ -157735,12 +157730,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 3173719562454643619} - m_Father: {fileID: 4104790940082786943} - m_RootOrder: 8 + m_Father: {fileID: -8474452437207042981} + 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: 227, y: -86.000046} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-3362569938017948774 @@ -157793,12 +157788,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 8339478454819500014} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 3 + m_Father: {fileID: 3198430005102515251} + 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: 227, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3681946865722538890 @@ -178755,7 +178750,7 @@ RectTransform: - {fileID: 3691979404969139093} - {fileID: 631228591500787782} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 14 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -179935,9 +179930,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 3795882027273366937} m_Father: {fileID: 4104790940082786943} - m_RootOrder: 10 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -179973,12 +179969,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 1691281247155542861} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 1 + m_Father: {fileID: 4053770132861701690} + 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: -373, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &8683155064434081473 @@ -180216,9 +180212,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7485940279673153507} - {fileID: 890082298661879197} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 9 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -180383,12 +180380,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: -8409425785127076249} - m_Father: {fileID: 4104790940082786943} + m_Father: {fileID: -8859645987379613814} 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: -223, y: 144} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &-35742711196225680 @@ -180663,7 +180660,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7502186766485076338 RectTransform: m_ObjectHideFlags: 0 @@ -180677,7 +180674,7 @@ RectTransform: m_Children: - {fileID: 5441369409000555912} m_Father: {fileID: 4733835317090964167} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -185831,7 +185828,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8032969764776295951} - m_RootOrder: 13 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -215628,12 +215625,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 5298674135033318747} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 6 + m_Father: {fileID: 4330148323958158182} + 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: 377, y: 142.99997} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3196897155070244967 @@ -220453,7 +220450,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2069895754318839184 RectTransform: m_ObjectHideFlags: 0 @@ -220467,7 +220464,7 @@ RectTransform: m_Children: - {fileID: 6751140669436849440} m_Father: {fileID: 8665821495714301826} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -220540,12 +220537,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 9139396969791315054} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 4 + m_Father: {fileID: 8665821495714301826} + 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: -223, y: 143} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3329905336858514894 @@ -220596,9 +220593,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5541316517095428245} - {fileID: 4127916411277389435} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 11 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -220917,9 +220915,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4417892464660579975} - {fileID: 666760566860824669} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 7 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -231754,12 +231753,12 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 176820800635632652} - m_Father: {fileID: 8032969764776295951} - m_RootOrder: 2 + m_Father: {fileID: 4733835317090964167} + 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: -73, y: 448.99994} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6752199970212708454 @@ -236588,9 +236587,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2593633115569930101} - {fileID: 2069895754318839184} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 10 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 5e9a44afba..475030d8c1 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -10888,6 +10888,118 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1881889030635060039} m_CullTransparentMesh: 0 +--- !u!1 &1885110215741331779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8288204256815441005} + - component: {fileID: 696397435626171248} + - component: {fileID: 8343200273258605673} + - component: {fileID: 9147036965973640332} + - component: {fileID: 2445538820196278634} + m_Layer: 5 + m_Name: scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8288204256815441005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885110215741331779} + 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_Children: + - {fileID: 2593571354443773693} + m_Father: {fileID: 3849663331886650410} + m_RootOrder: 2 + 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: -455.65002, y: 15.8} + m_SizeDelta: {x: 907.9, y: 1080.8} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &696397435626171248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885110215741331779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 2593571354443773693} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &8343200273258605673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885110215741331779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &9147036965973640332 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885110215741331779} + m_CullTransparentMesh: 0 +--- !u!114 &2445538820196278634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885110215741331779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1908377789116595806 GameObject: m_ObjectHideFlags: 0 @@ -21707,7 +21819,7 @@ RectTransform: m_Children: - {fileID: 3975564085507874554} - {fileID: 3121446583950298478} - - {fileID: 2593571354443773693} + - {fileID: 8288204256815441005} - {fileID: 6149049650877901028} - {fileID: 2561636573811736028} m_Father: {fileID: 2423465471356683207} @@ -22437,6 +22549,7 @@ GameObject: m_Component: - component: {fileID: 2593571354443773693} - component: {fileID: 4260212251028292622} + - component: {fileID: 8856333325285458253} m_Layer: 5 m_Name: grid m_TagString: Untagged @@ -22451,18 +22564,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5457833914455155806} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3849663331886650410} - m_RootOrder: 2 + m_Father: {fileID: 8288204256815441005} + 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: -455.65002, y: 15.8} - m_SizeDelta: {x: 907.9, y: 1080.8} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -453.95, y: 0.00000030921947} + m_SizeDelta: {x: 907.9, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!114 &4260212251028292622 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22486,6 +22599,20 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!114 &8856333325285458253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457833914455155806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &5486504090114868561 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab index 14f8c90728..4c89078526 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab @@ -4858,7 +4858,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5566,7 +5566,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3, y: 18} + m_AnchoredPosition: {x: -3, y: -7.76} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1678615009062229048 @@ -20410,7 +20410,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3, y: 18} + m_AnchoredPosition: {x: -3, y: -7.76} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2760722859159995628 @@ -45881,7 +45881,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3, y: 18} + m_AnchoredPosition: {x: -3, y: -7.76} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6135583457126003566 @@ -45920,7 +45920,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3, y: 18} + m_AnchoredPosition: {x: -3, y: -7.76} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6215982957646203541 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index c50f2300b1..a710eda647 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -80,7 +80,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.90999985, y: 114.19994} + m_AnchoredPosition: {x: 5.21, y: 114.19994} m_SizeDelta: {x: 43.07, y: 59.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1925641199812895373 @@ -306,7 +306,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.90999985, y: 114.19994} + m_AnchoredPosition: {x: 5.21, y: 114.19994} m_SizeDelta: {x: 43.07, y: 59.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3167309878778146257 @@ -5994,7 +5994,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000038214017} + m_AnchoredPosition: {x: 0, y: -0.000016443777} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 @@ -6068,7 +6068,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.90999985, y: 114.19994} + m_AnchoredPosition: {x: 5.21, y: 114.19994} m_SizeDelta: {x: 43.07, y: 59.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7957820441571695271 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8c6b2c7010..d03fcdc28c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -601,6 +601,7 @@ SHOP_TYPE = { SHIBUKEDANG_SHOP = 75,--势不可挡商店 XUANJIMIAOSUAN_SHOP = 76,--旋即妙算商店 QIJIE_SHOP = 81,--七界商店 + honglushangdian = 87, } PropertyTypeIconDef = { @@ -1167,6 +1168,7 @@ JumpType = { linglongBaojing = 10067, JiTianHaoLi = 20014, --积天豪礼 + honglushop = 20274 } NPCPosType={ @@ -2368,6 +2370,8 @@ RecruitType = { PrayerSingle = 50, --限时召唤单抽 PrayerTen = 51, --限时召唤十连 + + tiandihonglu = 52, --天地洪炉 } ItemBaseType = { Special = 1, --特殊 @@ -2513,6 +2517,8 @@ PRE_REWARD_POOL_TYPE = { TIME_LIMITED_NEW=15,--限时招募 TIME_LIMITED_NEW_UP=16,--限时招募UP LINGLONG = 17, --玲珑宝镜 + TIANDIHONGLU = 18,--天地洪炉 + TIANDIHONGLU_UP = 19,--天地洪炉 } DirectBuyType = { XSHL = 11,--限时豪礼 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index c546dbbd10..7c73758825 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -537,6 +537,17 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot ForceRebuildLayout(starGrid.transform) end +--设置英雄立绘朝向 +function SetHEeroLiveToward(go,toward) + if go and toward==1 then + go.transform.rotation=Vector3.New(0,180,0) + else + go.transform.rotation=Vector3.New(0,0,0) + end +end + + + function SetHeroBg(spLoader, bg,cardBg,star,quality) local hong = Util.GetGameObject(bg,"Effect_UI_yansekuang_HongSe") local bai = Util.GetGameObject(bg,"Effect_UI_yansekuang_BaiSe") diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua index f90ae46c24..9c45c3ca57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua @@ -36,6 +36,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2) func2 = _func2 -- 创建立绘 local heroTData = {} + local toward=0 if heroTId > 0 then --如果有皮肤读取皮肤表里面的数据,没有读取hero表 local data = nil @@ -43,6 +44,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2) data = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId) else data= ConfigManager.GetConfigData(ConfigName.HeroConfig,heroTId) + toward=data.Toward end heroTData.Live = GetResourcePath(data.Live) heroTData.Scale = data.Scale @@ -64,6 +66,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2) this.liveName = heroTData.Live this.liveNode = poolManager:LoadLive(this.liveName, this.firstRole.transform, Vector3.one * heroTData.Scale, Vector3.New(heroTData.Position[1], heroTData.Position[2])) this.liveNode.transform.sizeDelta = Vector2.New(10, 10) + SetHEeroLiveToward(this.liveNode,toward) local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index a922f8d739..0bf3d03cfb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -645,9 +645,9 @@ function this.BattleOrderChange(order) enemyPos.localScale = Vector3.zero enemyLivePos.localScale = Vector3.zero - local myPos = Util.GetTransform(this.PlayerPanel,i.."/root") - myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan") - myPos.localScale = Vector3.one + -- local myPos = Util.GetTransform(this.PlayerPanel,tostring(i))--.."/root") + -- myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan") + -- myPos.localScale = Vector3.one end end @@ -655,7 +655,7 @@ end function this.OnAddRole(data) local go if data.camp == 0 then - local parent = Util.GetTransform(this.PlayerPanel,data.position.."/root") + local parent = Util.GetTransform(this.PlayerPanel,tostring(data.position))--.."/root") go = BattlePool.GetItem(parent, BATTLE_POOL_TYPE.MY_ROLE) playerHP = playerHP + data:GetRoleData(RoleDataName.Hp) playerMaxHP = playerMaxHP + data:GetRoleData(RoleDataName.MaxHp) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index da79525e03..b25e49cf69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -125,7 +125,7 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset) -- node.transform.localScale = Vector3.one node.transform:SetParent(self.owner.GameObject.transform) node.transform.localScale = Vector3.one - node.transform.localPosition = offset and Vector3.New(offset[1], offset[2], 0) or Vector3.zero--self.GameObject.transform.localPosition + node.transform.localPosition = offset and Vector3.New(offset[1], offset[2] + 50, 0) or Vector3.New(0, 50, 0)--self.GameObject.transform.localPosition self.BuffEffectList[buffName].node = node end self.BuffEffectList[buffName].node:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index a3d8b90f70..e3740d151c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -69,6 +69,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.nameText.text = SubString2(self.readingName,9) self.level.text = role:GetRoleData(RoleDataName.Level) self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element)) + LogError("加战斗ID::::"..tostring(self.enemysId)) if self.enemysId and self.enemysId==1017 then Util.GetGameObject(go, "Name"):GetComponent("RectTransform").anchoredPosition=Vector3.New(20,-180,0) Util.GetGameObject(go, "Pro"):GetComponent("RectTransform").anchoredPosition=Vector3.New(-77,-180,0) @@ -313,7 +314,7 @@ function EnemyView:DoScale(scale, dur, func) end --local liveScale = self.role.position <= 3 and 0.6 or 0.5 local liveScale=0.6 - self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) + -- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index fa5d537975..bf169fa1f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -106,7 +106,6 @@ function PlayerView:onCreate(go, role, position, root) self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000) self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic") self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) - --self.RootPanel.PlayerPanel, "live_"..position self.RoleLiveGO:SetActive(true) -- 卡牌立绘显示 @@ -162,9 +161,9 @@ function PlayerView:onCreate(go, role, position, root) self.rageText.text = "" self.lvHpObj=Util.GetGameObject(go, "lvObj") if position<=3 then - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,385,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,469,0) else - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,-100,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0) end -- 伤害文字显示 self.LastBuffFloatingTime = Time.realtimeSinceStartup @@ -326,7 +325,7 @@ function PlayerView:DoScale(scale, dur, func) end --local liveScale = self.role.position <= 3 and 0.6 or 0.5 local liveScale = 0.6 - self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) + -- self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end --角色被放逐 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 29f042d006..32c7f6756b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -182,6 +182,7 @@ function TimeLimitUpHero:RefreshHeroData() end lastLiveName=GetResourcePath(curConfig.Live) heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar) + SetHEeroLiveToward(heroLiveObj,curConfig.Toward) local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId) local totalTimes = 0 for i = 1, #wishConfig.UpList do diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index b6e25a5c19..b20f861aa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -520,6 +520,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0) live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true) + SetHEeroLiveToward(live,heroData.heroConfig.Toward) live.transform.localScale = Vector3.one live.transform.localPosition = Vector3.zero diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index c000ff6b5c..c73b7611be 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -115,7 +115,19 @@ function this:OnShow(_parent,_Data) UpItemList = {[1] = {Reward = {showData.monsterId,1},WeightShow = itemList[i].WeightShow}} break end - end + end + elseif activityType == ActivityTypeDef.tiandihonglu then + UpItemList = {} + itemList = RecruitManager.GetRewardPreviewData(poolType) + local souls = RecruitManager.GetWishTailsManSoulChips() + for i = 1,#itemList do + for k,v in pairs(souls) do + if itemList[i].Reward[1] == v then + table.insert(UpItemList,itemList[i]) + break + end + end + end else UpItemList = RecruitManager.GetRewardPreviewData(poolUpType) itemList = RecruitManager.GetRewardPreviewData(poolType) @@ -188,6 +200,14 @@ function this:BuildRateData(actType,UpItem,upItemList) local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1]) table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "BDB69C" }) end + elseif actType == ActivityTypeDef.tiandihonglu then + LogGreen("#upItemList"..#upItemList) + for n,m in ipairs(upItemList) do + local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1]) + table.insert(_upRateList,{id = m.Reward[1],tag = "法宝碎片UP!", name=itemConfig.Name,value = m.Weight,color = "AD4152"}) + end + LogGreen("#_upRateList"..#_upRateList) + rateList = this:RefreshNewHeroRate(upItemList,_upRateList,"法宝碎片UP!",ConfigName.HeroConfig) end for k,v in ipairs(this.ratePreList) do diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua index daa819d62e..2f8f8d9905 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua @@ -39,7 +39,10 @@ function this:OnShow(_parent) sortingOrder = _parent.sortingOrder self.selectData = RecruitManager.GetWishTailsManSoulChips() self.curData = TailsManSoulManager.GetTailsmanSoulDatas(6) - + this:RefreshData() +end + +function this:RefreshData() for i = 1, math.max(#itemList,#self.curData) do if not self.curData[i] then itemList[i].go.gameObject:SetActive(false) @@ -52,15 +55,15 @@ function this:OnShow(_parent) itemList[i].selectBtn = Util.GetGameObject(itemList[i].go, "selectBtn") itemList[i].itemGrid = Util.GetGameObject(itemList[i].go, "itemGrid") itemList[i].items = {} - for i = 1,4 do - itemList[i].items[i] = {} - itemList[i].items[i].go = Util.GetGameObject(itemList[i].go, "ItemPos"..i):GetComponent("Text") - itemList[i].items[i].pos = Util.GetGameObject(itemList[i].items[i].go, "pos") - itemList[i].items[i].item = SubUIManager.Open(SubUIConfig.ItemView,itemList[i].items[i].pos.transform) - itemList[i].items[i].item.transform.localPosition = Vector3.zero - itemList[i].items[i].lv = Util.GetGameObject(itemList[i].items[i].go, "lvDi/Text"):GetComponent("Text") - itemList[i].items[i].select = Util.GetGameObject(itemList[i].items[i].go, "select") - itemList[i].items[i].go.gameObject:SetActive(false) + for j = 1,4 do + itemList[i].items[j] = {} + itemList[i].items[j].go = Util.GetGameObject(itemList[i].go, "ItemPos"..j) + itemList[i].items[j].pos = Util.GetGameObject(itemList[i].items[j].go.transform, "pos") + itemList[i].items[j].item = SubUIManager.Open(SubUIConfig.ItemView,itemList[i].items[j].pos.transform) + itemList[i].items[j].item.transform:GetComponent("RectTransform").anchoredPosition3D = Vector3.zero + itemList[i].items[j].lv = Util.GetGameObject(itemList[i].items[j].go, "lvDi/Text"):GetComponent("Text") + itemList[i].items[j].select = Util.GetGameObject(itemList[i].items[j].go, "select") + itemList[i].items[j].go.gameObject:SetActive(false) end end itemList[i].go.gameObject:SetActive(true) @@ -70,14 +73,16 @@ function this:OnShow(_parent) end) Util.AddOnceClick(itemList[i].selectBtn,function() MsgPanel.ShowTwo(string.format("确认选择%s作为心愿?",self.curData[i].name), function()end, function() - NetManager.SendRefreshTailsmanSoulData(self.curData.trumpChipList,function() - self:OnShow(_parent) - end) + self.selectData = {} + for j = 1,#self.curData[i].trumpChipList do + table.insert(self.selectData,self.curData[i].trumpChipList[j]) + end + this:RefreshData() end, "取消", "确认", "提示",false,"") end) - for j = 1,math.max(#itemList[i].items, #self.curData.trumpChipList) do - if not self.curData.trumpChipList[j] then + for j = 1,math.max(#itemList[i].items, #self.curData[i].trumpChipList) do + if not self.curData[i].trumpChipList[j] then itemList[i].items[j].go.gameObject:SetActive(false) else if not itemList[i].items[j] then @@ -90,15 +95,15 @@ function this:OnShow(_parent) itemList[i].items[j].select = Util.GetGameObject(itemList[i].items[j].go, "select") end itemList[i].items[j].go.gameObject:SetActive(true) - itemList[i].items[j].item:OnOpen(false,{self.curData.trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1) - itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData.trumpChipList[j]) - itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData.trumpChipList[j])) - Util.AddOnceClick(itemList[i].items[j].go,function() + itemList[i].items[j].item:OnOpen(false,{self.curData[i].trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1) + itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpChipList[j]) + itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j])) + Util.AddOnceClick(itemList[i].items[j].pos,function() if LengthOfTable(self.selectData >= 4) then PopupTipPanel.ShowTip("心愿碎片最多为4个!") else - this:SetIsSelect(self.curData.trumpChipList[j]) - itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData.trumpChipList[j])) + this:SetIsSelect(self.curData[i].trumpChipList[j]) + itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j])) end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 57f6aaca39..da6581d850 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -657,6 +657,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = GetLanguageStrById(heroData.ReadingName) Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Painting)) + SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"),heroData.Toward) Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false) local starGrid = Util.GetGameObject(_go.transform, "star") diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index aee63980da..5e71eba1ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -278,17 +278,7 @@ function IncarnationPanel:SetSingleData(go,data,index) end self.itemPreList[go].red.gameObject:SetActive(data.state == 0) self:RefreshSingleCardPre(self.itemPreList[go].cardPre,data,true,index) - self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject) - if data.state == -1 then - self.itemPreList[go].unGetBtn.gameObject:SetActive(true) - elseif data.state == 0 then - self.itemPreList[go].activableBtn.gameObject:SetActive(true) - elseif data.state == 1 then - self.itemPreList[go].incarnationBtn.gameObject:SetActive(true) - elseif data.state == 2 then - self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true) - end - + self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject) Util.AddOnceClick(self.itemPreList[go].unGetBtn,function() end) @@ -335,6 +325,16 @@ function IncarnationPanel:SetSingleData(go,data,index) PopupTipPanel.ShowTip("成功卸下身外化身!") end) end) + + if data.state == -1 then + self.itemPreList[go].unGetBtn.gameObject:SetActive(true) + elseif data.state == 0 then + self.itemPreList[go].activableBtn.gameObject:SetActive(true) + elseif data.state == 1 then + self.itemPreList[go].incarnationBtn.gameObject:SetActive(true) + elseif data.state == 2 then + self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true) + end end function IncarnationPanel:SetProList(data,preList,grid,pre) diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua index c894e50d82..5aa97fdc84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/HeroLikeAbilityPanel.lua @@ -402,6 +402,7 @@ function HeroLikeAbilityPanel:LoadHerolive1(_heroData, _objPoint) local icon = GetResourcePath(_heroData.Live) local testLive = poolManager:LoadLive(GetResourcePath(_heroData.Live), _objPoint.transform, Vector3.one * _heroData.Scale, Vector3.New(_heroData.Position[1], _heroData.Position[2], 0)) + SetHEeroLiveToward(testLive,_heroData.Toward) local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic") local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle @@ -443,7 +444,8 @@ function HeroLikeAbilityPanel:RightBtnOnClick() self.leftLiveObj = self.curLiveObj self.curLiveObj = self.rightLiveObj - self.rightLiveObj = HeroManager.LoadHerolive1(rightHeroData,self.rightObj) + self.rightLiveObj = HeroManager.LoadHerolive1(rightHeroData,self.rightObj) + SetHEeroLiveToward(self.rightLiveObj,rightHeroData.Toward) local SkeletonGraphic = self.curLiveObj:GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) if self.curLiveObj then @@ -492,7 +494,8 @@ function HeroLikeAbilityPanel:LeftBtnOnClick() self.rightLiveObj = self.curLiveObj self.curLiveObj = self.leftLiveObj - self.leftLiveObj = HeroManager.LoadHerolive1(leftHeroData,self.leftObj) + self.leftLiveObj = HeroManager.LoadHerolive1(leftHeroData,self.leftObj) + SetHEeroLiveToward(self.leftLiveObj,rightHeroData.Toward) local SkeletonGraphic = self.curLiveObj:GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) if self.curLiveObj then diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index 15ac5eaf0d..2a3c90b83b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -231,6 +231,7 @@ function LikeAbilityPanel:SingleHeroDataShow(_go,data) local bg = Util.GetGameObject(card, "bg") local icon = Util.GetGameObject(card, "icon"):GetComponent("Image") icon.sprite = self.spLoader:LoadSprite(GetResourcePath(data.Painting)) + SetHEeroLiveToward(icon.gameObject,data.Toward) SetHeroBg(self.spLoader,card ,bg ,data.Star,data.Quality) local pro = Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image") pro.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.PropertyName)) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2c11d2edae..6fdaf3191a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -240,6 +240,7 @@ function this.PlayerInfoRequest(func) -- 服务器开启时间 PlayerManager.SetServerOpenTime(msg.serverOpenTime) TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos) + if func then func(msg) end @@ -6186,11 +6187,13 @@ end function NetManager.SendRefreshTailsmanSoulData(idlist,fun) local data = ActivityProto_pb.TrumpGachaSelectItemRequest() data.activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu) + LogGreen("data.activityId:"..tostring(data.activityId)) for k,v in pairs(idlist) do + LogGreen("k:"..k.." v"..tostring(v)) data.selectIds:append(v) end local msg = data:SerializeToString() - Network:SendMessageWithCallBack(MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_REQUEST, MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_RESPONSE, nil, function(buffer) + Network:SendMessageWithCallBack(MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_REQUEST, MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_RESPONSE, msg, function(buffer) RecruitManager.SetWishTailsManSoulChips(idlist) Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TailsmanSoulChipChange) if fun then @@ -6205,8 +6208,12 @@ function NetManager.SendGetTailsmanSoulData(fun) Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_REQUEST, MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_RESPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = ActivityProto_pb.GetTrumpSelectItemResponse() - msg:ParseFromString(data) - RecruitManager.SetWishTailsManSoulChips(msg.selectIds) + msg:ParseFromString(data) + local data1 = {} + for k,v in ipairs(msg.selectIds) do + table.insert(data1,v) + end + RecruitManager.SetWishTailsManSoulChips(data1) if fun then fun() end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index d635fcec21..bb2e998870 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -123,6 +123,7 @@ function ExChangePage:ExChangeShow() self.liveName = GetResourcePath(self.heroConfig.Live) self.liveNode = poolManager:LoadLive(self.liveName, self.live2dRoot.transform, Vector3.one * exChangeConFig.HeroShowScale, Vector3.New(exChangeConFig.HeroShowLocation[1], exChangeConFig.HeroShowLocation[2],0)) + SetHEeroLiveToward(self.liveNode,self.heroConfig.Toward) self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(self.heroConfig.PropertyName)) self.heroName.text =GetLanguageStrById(self.heroConfig.ReadingName) SetTextVerTial(self.heroName,Vector3.New(129.9,3.7,0)) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index aa9315373c..87c00e16fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -843,6 +843,9 @@ local jumpDic = { end end) end, + [JumpType.honglushop] = function(data) + this.JumpActivity(JumpType.honglushop, data[1]) + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index c3a4fcef96..8c190c2a98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -41,7 +41,9 @@ end function this.SetWishTailsManSoulChips(_datas) this.wishTailsManSoulChips = {} + LogGreen("#_datas:"..tostring(LengthOfTable(_datas) )) for k,v in pairs(_datas) do + LogGreen("k:"..k.." v:"..tostring(v) ) table.insert(this.wishTailsManSoulChips,v) end end @@ -49,6 +51,7 @@ end function this.GetWishTailsManSoulChips() local datas = {} for k,v in pairs(this.wishTailsManSoulChips) do + LogGreen("k:"..k.." v:"..v) table.insert(datas,v) end return datas @@ -264,7 +267,8 @@ function this.GetRewardPreviewData(type) elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒 or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP - or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP + or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP + or type==PRE_REWARD_POOL_TYPE.TIANDIHONGLU then--降妖夺宝UP return this.GetActivityPreviewData(type)--非常驻抽卡需要检测时间 elseif type==PRE_REWARD_POOL_TYPE.LINGLONG then --限时招募--开启时间有限制的 return this.GetLINGLONGPreviewData() @@ -306,6 +310,8 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览 curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe) elseif type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) + elseif type==PRE_REWARD_POOL_TYPE.TIANDIHONGLU then + curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu) end local data = nil if curActivityId ~= nil then --活动招募 @@ -316,7 +322,7 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览 end local poolId = nil if data ~= nil then - if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒 + if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL or type == PRE_REWARD_POOL_TYPE.TIANDIHONGLU then--限时招募,乾坤宝盒 poolId = data.DiamondBoxContain[1][1] elseif type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP,乾坤宝盒UP data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 166a3d04de..7066b29327 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -150,6 +150,7 @@ function RecruitPanelNew:OnShow(sortingOrder) local name = GetResourcePath(heroConfig.Live) self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *heroConfig.Scale, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0)) self.liveNode.name = name + SetHEeroLiveToward(self.liveNode,heroConfig.Toward) local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic") local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index 1c77c502c1..917db0a564 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -413,6 +413,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) --TODO:动态加载立绘 testLiveGO = poolManager:LoadLive(GetResourcePath(heroStaticData.Live), self.live2dRoot.transform, Vector3.one * heroStaticData.Scale, Vector3.New(heroStaticData.Position[1],heroStaticData.Position[2],0)) + SetHEeroLiveToward(testLiveGO,heroStaticData.Toward) local SkeletonGraphic = testLiveGO:GetComponent("SkeletonGraphic") local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 267e98e540..4a903289cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -364,9 +364,11 @@ function this:RightBtnOnClick() this.curLiveObj = nil end Util.ClearChild(this.leftObj.transform) - this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj) + this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj) + SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward) this.curLiveObj = this.rightLiveObj - this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) + this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) + SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward) local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) this.rightBtn:GetComponent("Button").enabled = true @@ -408,9 +410,11 @@ function this:LeftBtnOnClick() this.curLiveObj = nil end Util.ClearChild(this.rightObj.transform) - this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) + this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) + SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward) this.curLiveObj = this.leftLiveObj - this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj) + this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj) + SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward) local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic") SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) this.leftBtn:GetComponent("Button").enabled = true @@ -712,6 +716,7 @@ function this:ChangeCurentHeroSkinLive(herodata) end if herodata then this.curLiveObj=HeroManager.LoadHerolive1(herodata,this.curObj) + SetHEeroLiveToward(this.curLiveObj,herodata.heroConfig.Toward) -- 临时保存皮肤位置 curHeroPosition = herodata.Position else @@ -727,9 +732,11 @@ function this:ChangeCurentHeroSkinLive(herodata) end this.force.text = WarPower this.curLiveObj=HeroManager.LoadHerolive(curHeroData,this.curObj) + SetHEeroLiveToward(this.curLiveObj,curHeroData.heroConfig.Toward) -- 清空临时保存的皮肤位置 curHeroPosition = nil end + this:SetDragView() end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index d9e6d64fd4..d4e6ac6fb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -241,6 +241,7 @@ function this.SingleHeroDataShow(_go,_heroData) Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = GetLanguageStrById(heroData.heroConfig.ReadingName) Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.painting) + SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image"),heroData.heroConfig.Toward) -- Util.GetGameObject(_go.transform, "card/pos/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(heroData.professionIcon) Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua index 05f3e215c5..6a65659c20 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua @@ -51,12 +51,10 @@ function TailsmanSoulChipLottery:InitComponent() self.icons[i].go = Util.GetGameObject(self.center,"icons/icon"..i) self.icons[i].icon = Util.GetGameObject(self.icons[i].go,"frame/icon"):GetComponent("Image") self.icons[i].kuang = Util.GetGameObject(self.icons[i].go,"kuang"):GetComponent("Image") - if i < 4 then - self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_effect_RecruitPanel_box_open") - end + self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_effect_RecruitPanel_box_open") end - self.updateTimes = Util.GetGameObject(self.btns[1].btn,"di1") + self.updateTimes = Util.GetGameObject(self.gameObject,"updateTimes") self.updateTimesTip = Util.GetGameObject(self.updateTimes,"Text"):GetComponent("Text") self.updateTimesTip1 = Util.GetGameObject(self.updateTimes,"Text1"):GetComponent("Text") end @@ -71,11 +69,11 @@ function TailsmanSoulChipLottery:BindEvent() end) Util.AddOnceClick(self.btnReward, function() - UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP,PRE_REWARD_POOL_TYPE.LOTTERY_SOUL) + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.TIANDIHONGLU_UP,PRE_REWARD_POOL_TYPE.TIANDIHONGLU) end) Util.AddOnceClick(self.btnStore, function() - --JumpManager.GoJump() + JumpManager.GoJump(40047) end) Util.AddOnceClick(self.btn_soul, function() @@ -220,17 +218,10 @@ function TailsmanSoulChipLottery:refreshBtnShow() return end end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen) local recrutId = n == 1 and self.singleRecruit.Id or self.tenRecruit.Id local recrutNum = n == 1 and 1 or 10 local uiName = n == 1 and UIName.QianKunBoxBuyOnePanel or UIName.QianKunBoxBuyTenPanel - if state==0 and itemId == 16 and not isFree then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,recrutId,function() - self:Recruit(recrutNum,recrutId,uiName) - end) - else - self:Recruit(recrutNum,recrutId,uiName) - end + self:Recruit(recrutNum,recrutId,uiName) end) end end @@ -250,6 +241,7 @@ end --五个魂印头像 function TailsmanSoulChipLottery:contentShow() wishSoulData = RecruitManager.GetWishTailsManSoulChips() + LogGreen("self.singleRecruit.DiamondBoxContain[1][1]:"..tostring(self.singleRecruit.DiamondBoxContain[1][1])) local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",self.singleRecruit.DiamondBoxContain[1][1]) if wishSoulData and #wishSoulData > 0 then else @@ -258,14 +250,18 @@ function TailsmanSoulChipLottery:contentShow() table.insert(li,iconsData[i].Reward[1]) end RecruitManager.SetWishTailsManSoulChips(li) + wishSoulData = RecruitManager.GetWishTailsManSoulChips() end + --如果没有默认数值,默认的就是表里面的请三个魂印 - if wishSoulData and #wishSoulData~=0 then + if wishSoulData and #wishSoulData > 0 then for i = 1, #self.icons do - if i<=#wishSoulData then + if i <= #wishSoulData then self.icons[i].icon.gameObject:SetActive(true) self.icons[i].kuang.gameObject:SetActive(true) - local id=wishSoulData[i] + LogGreen("wishSoulData[i]:"..tostring(wishSoulData[i])) + local id = wishSoulData[i] + LogGreen("id:"..tostring(id)) self.icons[i].icon.sprite = self.spLoader:LoadSprite(artConfig[itemConfig[id].ResourceID].Name) self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[id].Quantity].circle) --点击能查看魂印信息 diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 38d9a38d59..09f57383f3 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -162,7 +162,7 @@ function ShopViewNew:OnShow(_sortingOrder) end self.ShopType = self.actConfig.ShopData[1][1] LogYellow("self.ShopType:"..tostring(self.ShopType)) - if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then + if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP or self.ShopType == SHOP_TYPE.honglushangdian then self.parent.tabbox.gameObject:SetActive(false) else self.parent.tabbox.gameObject:SetActive(true)