diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
index f353a6d5b7..51b47bfb05 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
@@ -1794,7 +1794,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: 178.4, y: -114}
+ m_AnchoredPosition: {x: 178.4, y: 36}
m_SizeDelta: {x: 334.3, y: 101.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &201037513926260737
@@ -1954,7 +1954,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: -173.79001, y: -118.10004}
+ m_AnchoredPosition: {x: 10, y: -43}
m_SizeDelta: {x: 434.48, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &200641947934821997
@@ -2371,8 +2371,8 @@ 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: -349.5, y: -53.599995}
- m_SizeDelta: {x: 140, y: 37.51}
+ m_AnchoredPosition: {x: -395, y: -48.7}
+ m_SizeDelta: {x: 47.04, y: 37.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2730524750923166806
CanvasRenderer:
@@ -2409,7 +2409,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@@ -2629,7 +2629,6 @@ RectTransform:
m_Children:
- {fileID: 2627433564156076625}
- {fileID: 3219164844669797275}
- - {fileID: 4496575954534276929}
m_Father: {fileID: 424563480758477616}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2675,83 +2674,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
---- !u!1 &572655920972494192
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4496575954534276929}
- - component: {fileID: 3435804506439856142}
- - component: {fileID: 3641623786534263437}
- m_Layer: 5
- m_Name: treeAttri
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4496575954534276929
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 572655920972494192}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 100}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 8881807992507666456}
- - {fileID: 9079105594296253720}
- - {fileID: 5867591983970240755}
- m_Father: {fileID: 3837682048257541280}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 400, y: -160.5}
- m_SizeDelta: {x: 700, y: 64.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3435804506439856142
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 572655920972494192}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 1
---- !u!114 &3641623786534263437
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 572655920972494192}
- 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 &924357236229822250
GameObject:
m_ObjectHideFlags: 0
@@ -4793,7 +4715,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -5065,77 +4987,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &3353231871695535265
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9079105594296253720}
- - component: {fileID: 3760998425828194615}
- - component: {fileID: 4792027777121514602}
- m_Layer: 5
- m_Name: name
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &9079105594296253720
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3353231871695535265}
- 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: 3450506195292297768}
- - {fileID: 8602959466842519716}
- - {fileID: 5629824695705016295}
- m_Father: {fileID: 4496575954534276929}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 350, y: -36.1}
- m_SizeDelta: {x: 700, y: 56.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3760998425828194615
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3353231871695535265}
- m_CullTransparentMesh: 0
---- !u!114 &4792027777121514602
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3353231871695535265}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 50
- m_Right: 0
- m_Top: 10
- m_Bottom: 0
- m_ChildAlignment: 3
- m_Spacing: 0
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
--- !u!1 &3745593490375345921
GameObject:
m_ObjectHideFlags: 0
@@ -5210,85 +5061,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &4163770655184474322
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8602959466842519716}
- - component: {fileID: 213272672355914513}
- - component: {fileID: 9027606381017115001}
- m_Layer: 5
- m_Name: space
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8602959466842519716
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4163770655184474322}
- 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: 9079105594296253720}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 216.5, y: -33.1}
- m_SizeDelta: {x: 13, y: 46.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &213272672355914513
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4163770655184474322}
- m_CullTransparentMesh: 0
---- !u!114 &9027606381017115001
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4163770655184474322}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, 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
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 40
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
- m_MaxSize: 40
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: ' '
--- !u!1 &4383397681474610825
GameObject:
m_ObjectHideFlags: 0
@@ -5323,8 +5095,8 @@ 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: 58.25001, y: -25.9}
- m_SizeDelta: {x: 574.6, y: 107.2}
+ m_AnchoredPosition: {x: -24.6, y: -118.43}
+ m_SizeDelta: {x: 825.4, y: 72.05}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3957510038944987859
CanvasRenderer:
@@ -5356,11 +5128,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 30
+ m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
- m_MinSize: 20
- m_MaxSize: 30
+ m_MinSize: 25
+ m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
@@ -5404,7 +5176,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: -403.9, y: -119.5}
+ m_AnchoredPosition: {x: -220.10999, y: -44.399902}
m_SizeDelta: {x: 70, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7424522467028013152
@@ -5622,7 +5394,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -5720,81 +5492,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
---- !u!1 &5291596746091229193
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5867591983970240755}
- - component: {fileID: 7357390368908338813}
- - component: {fileID: 830276917388559270}
- m_Layer: 5
- m_Name: grid
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5867591983970240755
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5291596746091229193}
- 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: 4496575954534276929}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 350, y: -64.2}
- m_SizeDelta: {x: 600, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7357390368908338813
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5291596746091229193}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 2
- m_VerticalFit: 2
---- !u!114 &830276917388559270
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5291596746091229193}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 0
- m_StartCorner: 0
- m_StartAxis: 0
- m_CellSize: {x: 300, y: 70}
- m_Spacing: {x: 0, y: 0}
- m_Constraint: 1
- m_ConstraintCount: 2
--- !u!1 &5398714293388228851
GameObject:
m_ObjectHideFlags: 0
@@ -5988,7 +5685,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 429.05005, y: 291.97998}
+ m_AnchoredPosition: {x: 150, y: -35}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4156476677842804340
@@ -6012,7 +5709,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9716981, g: 0.768542, b: 0.34376112, a: 1}
+ m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -7248,80 +6945,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u524D \u5F80"
LanguageIndex: 0
---- !u!1 &8494215305945994659
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8881807992507666456}
- - component: {fileID: 5594581615710045068}
- - component: {fileID: 6941040797406621206}
- m_Layer: 5
- m_Name: line
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8881807992507666456
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8494215305945994659}
- 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: 4496575954534276929}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 350, y: -4}
- m_SizeDelta: {x: 700, y: 8}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5594581615710045068
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8494215305945994659}
- m_CullTransparentMesh: 0
---- !u!114 &6941040797406621206
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8494215305945994659}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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
- m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, 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
--- !u!1 &8500532140274456002
GameObject:
m_ObjectHideFlags: 0
@@ -7535,85 +7158,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
---- !u!1 &8636531261131817117
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5629824695705016295}
- - component: {fileID: 2357450871766868208}
- - component: {fileID: 2036358034259321751}
- m_Layer: 5
- m_Name: attriNum
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &5629824695705016295
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8636531261131817117}
- 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: 9079105594296253720}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 303, y: -33.1}
- m_SizeDelta: {x: 160, y: 46.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2357450871766868208
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8636531261131817117}
- m_CullTransparentMesh: 0
---- !u!114 &2036358034259321751
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8636531261131817117}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, 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
- m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 35
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "[\u795E\u5E94\u7B49\u7EA7:10/100]"
--- !u!1 &8637102263766058369
GameObject:
m_ObjectHideFlags: 0
@@ -7673,7 +7217,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -7708,100 +7252,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
---- !u!1 &8911282852834570633
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3450506195292297768}
- - component: {fileID: 4882946514747634611}
- - component: {fileID: 5680022404285977184}
- - component: {fileID: 399651044478201256}
- m_Layer: 5
- m_Name: attriName
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3450506195292297768
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8911282852834570633}
- 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: 9079105594296253720}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 130, y: -33.1}
- m_SizeDelta: {x: 160, y: 46.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4882946514747634611
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8911282852834570633}
- m_CullTransparentMesh: 0
---- !u!114 &5680022404285977184
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8911282852834570633}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, 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
- m_FontData:
- m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
- m_FontSize: 40
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 4
- m_MaxSize: 40
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u795E\u5E94\u5C5E\u6027"
---- !u!114 &399651044478201256
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8911282852834570633}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 2
- m_VerticalFit: 0
--- !u!1 &8968074103277310296
GameObject:
m_ObjectHideFlags: 0
@@ -7973,7 +7423,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
index f9b87efcb9..defa1900c2 100644
--- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
@@ -1750,5 +1750,5 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5347\u7EA7\u540E\u6240\u6709\u795E\u5C06\u5B9D\u7269\u7684\u6240\u6709\u795E\u5E94\u7B49\u7EA7\u4F1A\u81EA\u52A8\u540C\u6B65"
+ m_Text: "\u5347\u7EA7\u540E\u6240\u6709\u795E\u5C06\u7684\u5B9D\u7269\u795E\u5E94\u7B49\u7EA7\u4F1A\u81EA\u52A8\u540C\u6B65"
LanguageIndex: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
index 708162d0d1..e006a12196 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
@@ -1,6 +1,7 @@
require("Base/BasePanel")
RewardTalismanSingleShowPopup = Inherit(BasePanel)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
+local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
local type
local dId
local sId
@@ -27,8 +28,6 @@ function RewardTalismanSingleShowPopup:InitComponent()
self.powerNum1=Util.GetGameObject(self.transform, "Content/bg/armorInfo/powerNum"):GetComponent("Text")
self.lv=Util.GetGameObject(self.transform, "Content/bg/armorInfo/lv"):GetComponent("Text")
self.refineLv=Util.GetGameObject(self.transform, "Content/bg/armorInfo/refineLv"):GetComponent("Text")
- self.treeImg=Util.GetGameObject(self.transform, "Content/bg/armorInfo/treeImg")
- self.treeLv=Util.GetGameObject(self.transform, "Content/bg/armorInfo/treeImg/treeTxt"):GetComponent("Text")
self.curMainProscroll=Util.GetGameObject(self.transform, "Content/mainProScroll")
self.curMainProGrid=Util.GetGameObject(self.transform, "Content/mainProScroll/proGrid")
@@ -48,10 +47,8 @@ function RewardTalismanSingleShowPopup:InitComponent()
self.refineAttri = Util.GetGameObject(self.transform, "grid/refineAttri")
self.refineAttriNum = Util.GetGameObject(self.refineAttri, "name/attriNum"):GetComponent("Text")
self.refineAttriGrid = Util.GetGameObject(self.refineAttri, "grid")
- self.treeAttri = Util.GetGameObject(self.transform, "grid/treeAttri")
- self.treeAttriNum = Util.GetGameObject(self.treeAttri, "name/attriNum"):GetComponent("Text")
- self.treeAttriGrid = Util.GetGameObject(self.treeAttri, "grid")
- self.TextPre=Util.GetGameObject(self.transform, "TextPre")
+
+ self.TextPre = Util.GetGameObject(self.transform, "Content/TextPre")
--装备获取途径
--this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre")
@@ -133,25 +130,34 @@ function RewardTalismanSingleShowPopup:OnShow()
self:OnShowPanelData()
ForceRebuildLayout(self.curMainProscroll.transform)
ForceRebuildLayout(self.curotherProscroll.transform)
+ self.bg1Scroll:SetActive(true)
end
function RewardTalismanSingleShowPopup:OnShowPanelData()
local curEquipTreasureFigData = {}
local curEquipTreasureStrongFigData = {}
local curEquipTreasureSefineFigData = {}
- local curEquipTreasureTreeFigData = {}
-
- local data = EquipTreasureManager.GetSingleTreasureByIdDyn(dId)
+ local data = {}
+ if dId then
+ data = EquipTreasureManager.GetSingleTreasureByIdDyn(dId)
+ else
+ data.levelPool = jewelConfig[sId].LevelupPool
+ data.refinePool = jewelConfig[sId].RankupPool
+ data.maxLv = jewelConfig[sId].Max[1]
+ data.maxRefineLv = jewelConfig[sId].Max[2]
+ data.lv = lv
+ data.refineLv = refineLv
+ end
if type == 1 then
self.powerNum1.text=EquipTreasureManager.CalculateWarForce(dId)
itemConfig = data.itemConfig
curEquipTreasureFigData = ConfigManager.GetConfigData(ConfigName.JewelConfig, data.id)
- curEquipTreasureStrongFigData,curEquipTreasureSefineFigData,curEquipTreasureTreeFigData = self:GetStrongAndRefineConFig(curEquipTreasureFigData,data.lv,data.refineLv,data.treeLv)
+ curEquipTreasureStrongFigData,curEquipTreasureSefineFigData = self:GetStrongAndRefineConFig(curEquipTreasureFigData,data.lv,data.refineLv,data.treeLv)
else
self.powerNum1.text=EquipTreasureManager.CalculateWarForceBySid(sId,lv,refineLv,treeLv)
itemConfig = ConfigManager.GetConfigData(ConfigName.ItemConfig,sId)
curEquipTreasureFigData = ConfigManager.GetConfigData(ConfigName.JewelConfig, sId)
- curEquipTreasureStrongFigData,curEquipTreasureSefineFigData,curEquipTreasureTreeFigData = self:GetStrongAndRefineConFig(curEquipTreasureFigData,lv,refineLv,treeLv)
+ curEquipTreasureStrongFigData,curEquipTreasureSefineFigData = self:GetStrongAndRefineConFig(curEquipTreasureFigData,lv,refineLv,treeLv)
end
self.curEquipDesc1.text=GetLanguageStrById(itemConfig.ItemDescribe)
self.qualityText.text=GetStringByEquipQua(itemConfig.Quantity,GetQuaStringByEquipQua(itemConfig.Quantity))
@@ -168,12 +174,7 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
else
self.refineLv.gameObject:SetActive(false)
end
- if data.upHeroDid == "" or data.upHeroDid == "0" or treeLv == 0 then
- self.treeImg:SetActive(false)
- else
- self.treeImg:SetActive(true)
- self.treeLv.text=treeLv
- end
+
self.curEquipFrame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig.Quantity))
self.curEquipIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfig.ResourceID))
self.proIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig.PropertyName))
@@ -194,59 +195,6 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
self.bg1Scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,250)
self:SetPropertyShow1(refineInfo,curRefinePropertyList,self.refineAttriGrid)
end
- --(神应属性)
- local treeInfo=EquipTreasureManager.GetCurLvPropertyValue(3,data.treePool,data.treeLv)
- self.treeAttriNum.text = "[神应等级:"..data.treeLv.."/"..data.maxTreeLv.."]"
- if data.upHeroDid == "" or data.upHeroDid == "0" or treeLv == 0 then
- self.treeAttri:SetActive(false)
- else
- self.treeAttri:SetActive(true)
- self.bg1Scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,500)
- self:SetPropertyShow2(treeInfo,curTreePropertyList,self.treeAttriGrid)
- end
-
- --强化属性
- -- Util.ClearChild(self.curMainProGrid.transform)
- -- if #curEquipTreasureStrongFigData.Property>0 then --
- -- self.curMainProscroll:SetActive(true)
- -- for i = 1, #curEquipTreasureStrongFigData.Property do
- -- local go = newObject(self.otherProPre)
- -- go.transform:SetParent(self.curMainProGrid.transform)
- -- go.transform.localScale = Vector3.one
- -- go.transform.localPosition = Vector3.zero
- -- go:SetActive(true)
- -- local proConFig = ConfigManager.GetConfigData(ConfigName.PropertyConfig,curEquipTreasureStrongFigData.Property[i][1])
- -- if proConFig then
- -- Util.GetGameObject(go.transform, "proName"):GetComponent("Text").text =proConFig.Info
- -- Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "+"..GetEquipPropertyFormatStr(proConFig.Style,curEquipTreasureStrongFigData.Property[i][2])
- -- end
- -- end
- -- else
- -- self.curMainProscroll:SetActive(false)
- -- end
- -- --精炼属性
- -- Util.ClearChild(self.otherProGrid.transform)
- -- if curEquipTreasureSefineFigData.Property and #curEquipTreasureSefineFigData.Property>0 then --
- -- self.curotherProscroll:SetActive(true)
- -- for i = 1, #curEquipTreasureSefineFigData.Property do
- -- local go = newObject(self.otherProPre)
- -- go.transform:SetParent(self.otherProGrid.transform)
- -- go.transform.localScale = Vector3.one
- -- go.transform.localPosition = Vector3.zero
- -- go:SetActive(true)
- -- local proConFig = ConfigManager.GetConfigData(ConfigName.PropertyConfig,curEquipTreasureSefineFigData.Property[i][1])
- -- if proConFig then
- -- Util.GetGameObject(go.transform, "proName"):GetComponent("Text").text =proConFig.Info
- -- if curEquipTreasureSefineFigData.Property[i][2]==0 and proConFig.Style~=1 then
- -- Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "+0%"
- -- else
- -- Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "+"..GetEquipPropertyFormatStr(proConFig.Style,curEquipTreasureSefineFigData.Property[i][2])
- -- end
- -- end
- -- end
- -- else
- -- self.curotherProscroll:SetActive(false)
- -- end
--装备获得途径
Util.ClearChild(self.getTuGrid.transform)
@@ -292,7 +240,6 @@ end
function RewardTalismanSingleShowPopup:GetStrongAndRefineConFig(curEuipTreaSureConfig,lv,rlv,tlv)
local curEquipTreasureStrongFigData = {}
local curEquipTreasureSefineFigData = {}
- local curEquipTreasureTreeFigData = {}
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelRankupConfig)) do
--强化的属性
if configInfo.PoolID == curEuipTreaSureConfig.LevelupPool and configInfo.Type == 1 and configInfo.Level == lv then
@@ -302,52 +249,8 @@ function RewardTalismanSingleShowPopup:GetStrongAndRefineConFig(curEuipTreaSureC
if configInfo.PoolID == curEuipTreaSureConfig.RankupPool and configInfo.Type == 2 and configInfo.Level == rlv then
curEquipTreasureSefineFigData = configInfo
end
- --神应的属性
- if configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and configInfo.Level == tlv then
- curEquipTreasureTreeFigData = configInfo
- end
- end
- return curEquipTreasureStrongFigData,curEquipTreasureSefineFigData,curEquipTreasureTreeFigData
-end
-
---神应专用
-function RewardTalismanSingleShowPopup:SetPropertyShow2(_infos,_preList,_grid)
- local curTree = SacredTreeManager.CulAttri()
- local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0).PropertyUnlcokLevelForClient
- local dataCount=LengthOfTable(_infos)
- local preCount=#_preList
- for i = 1, dataCount-preCount do
- local go = newObject(self.TextPre)
- go.transform:SetParent(_grid.transform)
- go.transform.localScale = Vector3.one
- go.transform.localPosition = Vector3.zero
- go.gameObject:SetActive(false)
- table.insert(_preList,go)
- end
- local index=1
- for key, value in pairs(attriConfig) do
- local obj=_preList[index]
- local proper=propertyConfig[value[1]]
- local string
- if proper.Style==1 then
- string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue--value.currValue
- else
- string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue/100 .."%"
- end
- if index <= curTree then
- string = ""..string..""
- else
- string = ""..string.."\n".."(四灵试炼"..attriConfig[index][2].."层解锁)"
- end
- obj.transform:GetComponent("Text").text = string
- obj.gameObject:SetActive(true)
- index=index+1
- end
- for i = 1, #_preList do
- if i>=index then
- _preList[i]:SetActive(false)
- end
end
+ return curEquipTreasureStrongFigData,curEquipTreasureSefineFigData
end
function RewardTalismanSingleShowPopup:SetPropertyShow1(_infos,_preList,_grid)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
index 57fa8ed63e..e85488c3e6 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
@@ -302,7 +302,7 @@ function this.SetWindShow(_index)
end
Util.AddClick(Util.GetGameObject(obj,"icon"),function ()
if jewelConfig[v.id] then
- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",v.id,0,0,0)
+ UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,nil,v.id,0,0,0)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,v.id)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
index ef18102fc8..000fadeacb 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
@@ -3,25 +3,14 @@ local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig)
RoleEquipPanel = Inherit(BasePanel)
local isGonming = 0
---local SortTypeConst = {
--- Natural = 1,--品阶 ur+ --> r 6 --> 1
--- Lv = 2
---}
local PosIdConst = {
- All = 0,
- --全部
- WuQi = 1,
- --武器
- ZhanFu = 2,
- --战服
- TouShi = 3,
- --头饰
- ZhanXue = 4,
- --战靴
- Hun = 5,
- --魂宝
- Ling = 6
- --灵宝
+ All = 0,--全部
+ WuQi = 1,--武器
+ ZhanFu = 2,--战服
+ TouShi = 3,--头饰
+ ZhanXue = 4,--战靴
+ Hun = 5,--魂宝
+ Ling = 6--灵宝
}
local this = RoleEquipPanel
--当前英雄穿的装备
@@ -113,17 +102,7 @@ function RoleEquipPanel:InitComponent()
this.ScrollBar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
- this.ScrollView =
- SubUIManager.Open(
- SubUIConfig.ScrollCycleView,
- Util.GetGameObject(self.transform, "scroll").transform,
- this.equipPre,
- this.ScrollBar,
- Vector2.New(v2.width, v2.height),
- 1,
- 5,
- Vector2.New(40, 15)
- )
+ this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(self.transform, "scroll").transform,this.equipPre,this.ScrollBar,Vector2.New(v2.width, v2.height),1,5,Vector2.New(40, 15))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = Util.LoadSprite("t_tongyong-zhanli_zh")
@@ -152,96 +131,68 @@ end
--绑定事件(用于子类重写)
function RoleEquipPanel:BindEvent()
- Util.AddClick(
- this.btnBack,
- function()
- PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
- if openThisPanel.RefreshHeroDatas then
- openThisPanel:RefreshHeroDatas(curHeroData, HeroManager.heroSortedDatas)
- end
- self:ClosePanel()
+ Util.AddClick(this.btnBack,function()
+ PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
+ if openThisPanel.RefreshHeroDatas then
+ openThisPanel:RefreshHeroDatas(curHeroData, HeroManager.heroSortedDatas)
end
- )
- Util.AddClick(
- this.leftBtn,
- function()
- isPlayAnim = true
- this:LeftBtnOnClick()
- end
- )
+ self:ClosePanel()
+ end)
- Util.AddClick(
- this.rightBtn,
- function()
- isPlayAnim = true
- this:RightBtnOnClick()
- end
- )
- Util.AddOnceClick(
- this.allEquipUp,
- function()
- this:AllEquipUpBtnOnClick()
- end
- )
+ Util.AddClick(this.leftBtn,function()
+ isPlayAnim = true
+ this:LeftBtnOnClick()
+ end)
- Util.AddOnceClick(
- this.allEquipDown,
- function()
- --HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId) and
- --print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
- if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
- -- body
- PopupTipPanel.ShowTip(Language[12222])
- else
- this:AllEquipDownBtnOnClick()
- end
-
+ Util.AddClick(this.rightBtn,function()
+ isPlayAnim = true
+ this:RightBtnOnClick()
+ end)
+
+ Util.AddOnceClick(this.allEquipUp,function()
+ this:AllEquipUpBtnOnClick()
+ end)
+
+ Util.AddOnceClick(this.allEquipDown,function()
+ if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
+ PopupTipPanel.ShowTip(Language[12222])
+ else
+ this:AllEquipDownBtnOnClick()
end
- )
+ end)
for i = 0, 6 do
- Util.AddClick(
- tabs[i],
- function()
- isPlayAnim = true
- if i == indexBtnNum then
- return
- end
- indexBtnNum = i
- if indexBtnNum == PosIdConst.All then
- this:OnClickAllBtn()
- else
- this:OnClickTabBtn(indexBtnNum)
- end
- end
- )
- end
- Util.AddClick(
- this.equipTreasureBtn,
- function()
- if LengthOfTable(curEquipTreasureDatas) < 2 then
- PopupTipPanel.ShowTip(Language[11797])
+ Util.AddClick(tabs[i],function()
+ isPlayAnim = true
+ if i == indexBtnNum then
return
end
- UIManager.OpenPanel(UIName.EquipTreasureResonancePanel, curHeroData)
+ indexBtnNum = i
+ if indexBtnNum == PosIdConst.All then
+ this:OnClickAllBtn()
+ else
+ this:OnClickTabBtn(indexBtnNum)
+ end
+ end)
+ end
+ Util.AddClick(this.equipTreasureBtn,function()
+ if LengthOfTable(curEquipTreasureDatas) < 2 then
+ PopupTipPanel.ShowTip(Language[11797])
+ return
end
- )
+ UIManager.OpenPanel(UIName.EquipTreasureResonancePanel, curHeroData)
+ end)
Util.AddClick(this.sacredTreeBtn,function()
JumpManager.GoJump(3004)
end)
- Util.AddClick(
- this.equipBtn5,
- function()
- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9999,nil)
- end
- )
+ Util.AddClick(this.equipBtn5,function()
+ UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9999,nil)
+ end)
- Util.AddClick(
- this.equipBtn6,
- function()
- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9998,nil)
- end
- )
+ Util.AddClick(this.equipBtn6,
+ function()
+ UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9998,nil)
+ end)
end
--添加事件监听(用于子类重写)
@@ -298,6 +249,7 @@ function RoleEquipPanel:OnShow()
this.ShowHeroEquip(true)
this:OnClickAllBtn()
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
+ this.sacredTreeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
end
function this:OnSortingOrderChange()
@@ -404,11 +356,6 @@ function this:AllEquipUpBtnOnClick()
equiData = curEquip
end
end
- -- if index == 5 or index == 6 then
- -- LogYellow("宝物id:"..equiData.idDyn.." id:"..equiData.id)
- -- else
- -- LogYellow("装备id:"..equiData.id)
- -- end
if (index == 5 or index == 6) then
if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn)
@@ -447,44 +394,31 @@ function this:AllEquipUpBtnOnClick()
-- LogGreen("一键装备"..allEquipIds[i])
-- end
--穿装备协议
- NetManager.EquipWearRequest(
- curHeroData.dynamicId,
- allEquipIds,
- 1,
- function()
- this.UpdateEquipPosHeroData(1, 4, allEquipIds)
- --特效播放
- if equipEffectPos then
- for i = 1, #equipEffectPos do
- effectList[equipEffectPos[i]]:SetActive(false)
- effectList[equipEffectPos[i]]:SetActive(true)
- end
+ NetManager.EquipWearRequest(curHeroData.dynamicId,allEquipIds,1,function()
+ this.UpdateEquipPosHeroData(1, 4, allEquipIds)
+ --特效播放
+ if equipEffectPos then
+ for i = 1, #equipEffectPos do
+ effectList[equipEffectPos[i]]:SetActive(false)
+ effectList[equipEffectPos[i]]:SetActive(true)
end
end
- )
+ end)
end
if curHeroData.harmonyGongMing then
PopupTipPanel.ShowTip(Language[12223])
end
--穿戴宝物
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
- -- for i = 1, #allTreasureIds do
- -- LogGreen("一键宝物"..allTreasureIds[i])
- -- end
--穿装备协议
- NetManager.EquipWearRequest(
- curHeroData.dynamicId,
- allTreasureIds,
- 2,
- function()
- this.UpdateEquipPosHeroData(2, 4, allTreasureIds)
- --特效播放
- for i, v in pairs(treasureEffectPos) do
- effectList[v]:SetActive(false)
- effectList[v]:SetActive(true)
- end
+ NetManager.EquipWearRequest(curHeroData.dynamicId,allTreasureIds,2,function()
+ this.UpdateEquipPosHeroData(2, 4, allTreasureIds)
+ --特效播放
+ for i, v in pairs(treasureEffectPos) do
+ effectList[v]:SetActive(false)
+ effectList[v]:SetActive(true)
end
- )
+ end)
end
else
if not allEquipIds or #allEquipIds < 1 then
@@ -508,26 +442,16 @@ function this:AllEquipDownBtnOnClick()
(curHeroData.jewels and #curHeroData.jewels > 0 and isCanUpEquipTreasure)
then
if curHeroData.equipIdList and #curHeroData.equipIdList > 0 then
- NetManager.EquipUnLoadOptRequest(
- curHeroData.dynamicId,
- curHeroData.equipIdList,
- 1,
- function()
- this.UpdateEquipPosHeroData(1, 5, curHeroData.equipIdList)
- end
- )
+ NetManager.EquipUnLoadOptRequest(curHeroData.dynamicId,curHeroData.equipIdList,1,function()
+ this.UpdateEquipPosHeroData(1, 5, curHeroData.equipIdList)
+ end)
end
--寶物
if curHeroData.jewels and #curHeroData.jewels > 0 then
-- 一键卸下音效
- NetManager.EquipUnLoadOptRequest(
- curHeroData.dynamicId,
- curHeroData.jewels,
- 2,
- function()
- this.UpdateEquipPosHeroData(2, 5, curHeroData.jewels)
- end
- )
+ NetManager.EquipUnLoadOptRequest(curHeroData.dynamicId,curHeroData.jewels,2,function()
+ this.UpdateEquipPosHeroData(2, 5, curHeroData.jewels)
+ end)
end
else
PopupTipPanel.ShowTip(Language[11800])
@@ -611,9 +535,9 @@ function this.ShowHeroEquip()
Util.GetGameObject(go.transform, "mask"):SetActive(false)
--Util.GetGameObject(go.transform,"proIcon"):SetActive(false)
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
- Util.LoadSprite(curHeroEquipDatas[i].icon)
+ Util.LoadSprite(curHeroEquipDatas[i].icon)
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
- Util.LoadSprite(curHeroEquipDatas[i].frame)
+ Util.LoadSprite(curHeroEquipDatas[i].frame)
--Util.GetGameObject(go.transform,"proIcon"):GetComponent("Image").sprite=Util.LoadSprite(curHeroEquipDatas[i].frame)
if lvObj then
lvObj:SetActive(false)
@@ -635,9 +559,9 @@ function this.ShowHeroEquip()
Util.GetGameObject(go.transform, "mask"):SetActive(false)
--Util.GetGameObject(go.transform,"proIcon"):SetActive(true)
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
- Util.LoadSprite(curEquipTreasureDatas[i].icon)
+ Util.LoadSprite(curEquipTreasureDatas[i].icon)
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
- Util.LoadSprite(curEquipTreasureDatas[i].frame)
+ Util.LoadSprite(curEquipTreasureDatas[i].frame)
--Util.GetGameObject(go.transform,"proIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
Util.GetGameObject(go.transform, "frame/star"):SetActive(false)
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
@@ -645,14 +569,12 @@ function this.ShowHeroEquip()
Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
--鸿蒙阵 共享数据判断
if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 then
- -- body
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
else
- -- body
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
end
@@ -699,40 +621,27 @@ function this.ShowHeroEquip()
-- end
end
local iconBtn = Util.GetGameObject(go.transform, "icon")
- Util.AddOnceClick(
- iconBtn,
- function()
-
- if curHeroEquipDatas[i] then
-
- curSelectEquipData = curHeroEquipDatas[i]
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i])
+ Util.AddOnceClick(iconBtn,function()
+ if curHeroEquipDatas[i] then
+ curSelectEquipData = curHeroEquipDatas[i]
+ UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i])
- elseif curEquipTreasureDatas[i] then
- if itemConfig[curEquipTreasureDatas[i].id].ItemType == ItemType.EquipTreasure then
- local pos = 0
- local jewerConfig =
- ConfigManager.TryGetConfigData(ConfigName.JewelConfig, curEquipTreasureDatas[i].id)
- if jewerConfig then
- if jewerConfig.Location == 1 then
- pos = 5
- elseif jewerConfig.Location == 2 then
- pos = 6
- end
- UIManager.OpenPanel(
- UIName.RoleEquipTreasureChangePopup,
- this,
- 2,
- curHeroData,
- curEquipTreasureDatas[i],
- nil,
- pos
- )
+ elseif curEquipTreasureDatas[i] then
+ if itemConfig[curEquipTreasureDatas[i].id].ItemType == ItemType.EquipTreasure then
+ local pos = 0
+ local jewerConfig =
+ ConfigManager.TryGetConfigData(ConfigName.JewelConfig, curEquipTreasureDatas[i].id)
+ if jewerConfig then
+ if jewerConfig.Location == 1 then
+ pos = 5
+ elseif jewerConfig.Location == 2 then
+ pos = 6
end
+ UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,curEquipTreasureDatas[i],nil,pos)
end
end
end
- )
+ end)
end
-- local allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false)
local allAddProVal
@@ -759,18 +668,14 @@ end
function this:OpenTips(nextEquipData,pos)
local content = Language[12224]
MsgPanel.ShowTwo(content,function ()
-
end,function ()
-
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,tostring(nextEquipData.id))
table.insert(equipDataList,nextEquipData)
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,1,function ()
-
this.UpdateEquipPosHeroData(1,3,equipDataList,nextEquipData,pos)
end)
-
end,Language[10731],Language[11934])
end
@@ -779,16 +684,15 @@ function this:UpdateEquipItem(go,data,lvObj,refineObj)
Util.GetGameObject(go.transform, "frame"):SetActive(true)
Util.GetGameObject(go.transform, "mask"):SetActive(false)
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
- -- body
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
else
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
end
--Util.GetGameObject(go.transform,"proIcon"):SetActive(false)
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
- Util.LoadSprite(data.icon)
+ Util.LoadSprite(data.icon)
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
- Util.LoadSprite(data.frame)
+ Util.LoadSprite(data.frame)
--Util.GetGameObject(go.transform,"proIcon"):GetComponent("Image").sprite=Util.LoadSprite(curHeroEquipDatas[i].frame)
if lvObj then
lvObj:SetActive(false)
@@ -808,9 +712,9 @@ function this:OnClickAllBtn()
local itemData = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession)
this:SortEquipDatas(itemData)
local count = 0
- for i=1,#itemData do
- count = count + 1--itemData[i].num
- end
+ for i=1,#itemData do
+ count = count + 1--itemData[i].num
+ end
--加上宝器数据
local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName)
--宝器排序
@@ -837,25 +741,21 @@ function this:OnClickTabBtn(_index)
this:SetItemData(allEquip)
else
local allEquipTreasure
- allEquipTreasure =
- EquipTreasureManager.GetAllTreasuresByLocation(_index - 4, curHeroData.heroConfig.PropertyName)
- table.sort(
- allEquipTreasure,
- function(a, b)
- if a.refineLv == b.refineLv then
- if a.lv == b.lv then
- return a.id > b.id
- else
- return a.lv > b.lv
- end
+ allEquipTreasure = EquipTreasureManager.GetAllTreasuresByLocation(_index - 4, curHeroData.heroConfig.PropertyName)
+ table.sort(allEquipTreasure,function(a, b)
+ if a.refineLv == b.refineLv then
+ if a.lv == b.lv then
+ return a.id > b.id
else
- return a.refineLv > b.refineLv
+ return a.lv > b.lv
end
+ else
+ return a.refineLv > b.refineLv
end
- )
+ end)
--"装备数量:"
this.itemNumText.text = Language[12181] .. LengthOfTable(allEquipTreasure)
- this:SetItemData(allEquipTreasure)
+ this:SetItemData(allEquipTreasure)
end
end
@@ -889,18 +789,18 @@ function this:SetItemData(_itemDatas)
this.SingleItemDataShow(go, _itemDatas[index])
end
)
- if isPlayAnim then
+ if isPlayAnim then
if isFristOpenTime then
isFristOpenTime:Stop()
isFristOpenTime = nil
end
isFristOpenTime = Timer.New(function()
this.mask:SetActive(false)
- end, 0.3):Start()
- this.mask:SetActive(true)
+ end, 0.3):Start()
+ this.mask:SetActive(true)
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
- end
+ end
end
function this.SingleItemDataShow(_go, _itemData)
if not itemConfig[_itemData.id] then
@@ -956,29 +856,13 @@ function this.SingleItemDataShow(_go, _itemData)
end
-- 0.查看属性 1.穿戴 2.卸下 3.交换
--宝物界面
- Util.AddOnceClick(
- Util.GetGameObject(_go.transform, "icon"),
- function()
- if curEquipTreasureDatas[pos] then
-
-
- UIManager.OpenPanel(
- UIName.RoleEquipTreasureChangePopup,
- this,
- 3,
- curHeroData,
- curEquipTreasureDatas[pos],
- _itemData,
- pos
- )
- -- end
-
- else
-
- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, pos)
- end
- end
- )
+ Util.AddOnceClick(Util.GetGameObject(_go.transform, "icon"),function()
+ if curEquipTreasureDatas[pos] then
+ UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,3,curHeroData,curEquipTreasureDatas[pos],_itemData,pos)
+ else
+ UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, pos)
+ end
+ end)
else
frame.sprite = Util.LoadSprite(_itemData.frame)
icon.sprite = Util.LoadSprite(_itemData.icon)
@@ -1005,38 +889,16 @@ function this.SingleItemDataShow(_go, _itemData)
redPoint:SetActive(false)
end
Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num
- Util.AddOnceClick(
- Util.GetGameObject(_go.transform, "icon"),
- function()
- print(Language[12225])
+ Util.AddOnceClick(Util.GetGameObject(_go.transform, "icon"),function()
if curHeroEquipDatas[equipConfig[_itemData.id].Position] then
local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
- print(Language[12226]..#curHeroData.equipIdList)
if curHeroData.harmonyGongMing then
- -- body
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
-
else
- UIManager.OpenPanel(
- UIName.RoleEquipChangePopup,
- this,
- 3,
- curHeroData,
- curHeroEquipDatas[equipConfig[_itemData.id].Position],
- nextEquipData,
- equipConfig[_itemData.id].Position
- )
- end
+ UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,3,curHeroData,curHeroEquipDatas[equipConfig[_itemData.id].Position],nextEquipData,equipConfig[_itemData.id].Position)
+ end
else
- print(Language[12227])
- UIManager.OpenPanel(
- UIName.RoleEquipChangePopup,
- this,
- 1,
- curHeroData,
- _itemData,
- equipConfig[_itemData.id].Position
- )
+ UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,1,curHeroData,_itemData,equipConfig[_itemData.id].Position)
end
end
)
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
index 28d733cf7c..d5c1794d80 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
@@ -72,21 +72,29 @@ function SacredTreePanel:OnShow()
curTreeLevel = SacredTreeManager.treeLevel
length = LengthOfTable(SacredTreeManager.treeLevelConfig)
+ local str1,str2
Util.SetGray(self.upgradeBtn,curTreeLevel >= length)
if curTreeLevel > 0 and curTreeLevel < length then
- self.treeLevel.text = string.format(GetLanguageStrById("等级:%s"),curTreeLevel)
- self.upGrade.text = Language[11063]
+ str1 = string.format(GetLanguageStrById("等级:%s"),curTreeLevel)
+ str2 = Language[11063]
elseif curTreeLevel >= length then
- self.treeLevel.text = string.format(GetLanguageStrById("等级:%s"),length)
- self.upGrade.text = "等级已满"
+ str1 = string.format(GetLanguageStrById("等级:%s"),length)
+ str2 = "等级已满"
elseif curTreeLevel <= 0 then
- self.treeLevel.text = "未解锁"
- self.upGrade.text = "解 锁"
+ str1 = "未解锁"
+ str2 = "解 锁"
end
+ self.treeLevel.text = str1
+ self.upGrade.text = str2
+ local needId = treeLevelConfig[curTreeLevel].LvupCost[1]
+ local needCost = treeLevelConfig[curTreeLevel].LvupCost[2]
if curTreeLevel < length then
self.needIcon.sprite = Util.LoadSprite(artConfig[itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].ResourceID].Name)
self.needNum.text = treeLevelConfig[curTreeLevel].LvupCost[2]
+ if BagManager.GetTotalItemNum(needId) < needCost then
+ self.needNum.text = ""..treeLevelConfig[curTreeLevel].LvupCost[2]..""
+ end
else
self.needIcon.gameObject:SetActive(curTreeLevel < length)
self.needNum.gameObject:SetActive(curTreeLevel < length)