无尽鼓舞购买

Assets/Content/Config/LanguagePackage_cn.csv

@@ -10025,6 +10025,7 @@ WjBattleBuff_Btn,鼓舞
 WjBattleBuff_Dec,{0} ：每層鼓舞增加{1}%攻擊力、防禦力和開場生成{2}%的最大生命值護盾\n當前鼓舞：{3}/{4}
 WjBattleBuff_Dec2,當前鼓舞增加{0}%攻擊力、防禦力和開場生成{1}%的最大生命值護盾
 WjBattleBuff_Dec3,每層鼓舞增加{0}%攻擊力、防禦力和開場生成{1}%的最大生命值護盾\n當前鼓舞：{2}/{3}
+WjBattleBuff_Dec4,是否消耗 <color=#00ab65>{0}</color>*<color=#078DF5>{1}</color> 购买一层 {2}
 DifficultMode,困難模式
 SimpleMode,普通模式
 DifLvName,[困難]

Assets/Content/Prefabs/UI/UIClimbingTower/UIWjBattleBuffView.prefab

@@ -847,9 +847,9 @@ RectTransform:
   m_Father: {fileID: 687365133177680143}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -262, y: -335.4}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -262, y: -199}
   m_SizeDelta: {x: 200, y: 256}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2563680039192610226

Assets/Content/Prefabs/UI/UIClimbingTower/WjBattleBuffInfoItem.prefab

@@ -204,7 +204,7 @@ RectTransform:
   m_Children:
   - {fileID: 5229431679860664524}
   m_Father: {fileID: 4931740212118464070}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -347,6 +347,165 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1387070729522311366
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7927687228632276472}
+  - component: {fileID: 5494040454710434606}
+  - component: {fileID: 2055036431255323146}
+  - component: {fileID: 4572351760009351192}
+  m_Layer: 5
+  m_Name: Number
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7927687228632276472
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1387070729522311366}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3097314030895175542}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 27.5, y: 0}
+  m_SizeDelta: {x: -95, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5494040454710434606
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1387070729522311366}
+  m_CullTransparentMesh: 0
+--- !u!114 &2055036431255323146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1387070729522311366}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UINode
+  - TMPro.TextMeshProUGUI
+  values: 00000001
+  depObjs:
+  - {fileID: 8908972827262993200}
+  activeType: 0
+--- !u!114 &4572351760009351192
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1387070729522311366}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 654321
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
+  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 40
+  m_fontSizeBase: 44
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 20
+  m_fontSizeMax: 40
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &1753146722603618150
 GameObject:
   m_ObjectHideFlags: 0
@@ -441,6 +600,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9F13\u821E\u4E0A\u9650"
+--- !u!1 &1920430552651384317
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1785806225963693034}
+  - component: {fileID: 2872604358278712154}
+  - component: {fileID: 7514364160325041380}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1785806225963693034
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1920430552651384317}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3097314030895175542}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2872604358278712154
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1920430552651384317}
+  m_CullTransparentMesh: 0
+--- !u!114 &7514364160325041380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1920430552651384317}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 89f40b42655663d458da7b787809fd56, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2229538812248869638
 GameObject:
   m_ObjectHideFlags: 0
@@ -818,9 +1053,9 @@ RectTransform:
   - {fileID: 6905686155065626492}
   - {fileID: 6075085158162668872}
   - {fileID: 7096259643255309556}
-  - {fileID: 6075085157667103374}
   - {fileID: 2923661501588915357}
   - {fileID: 4603329448191663510}
+  - {fileID: 3097314030895175542}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -960,7 +1195,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &6075085157667103375
+--- !u!1 &5970704055948593518
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -968,136 +1203,67 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6075085157667103374}
-  - component: {fileID: 6075085157667103372}
-  - component: {fileID: 5328069431028710917}
-  - component: {fileID: 2445687199868513553}
-  - component: {fileID: 7753513787381790449}
+  - component: {fileID: 4772933182877509454}
+  - component: {fileID: 2730438853275704768}
+  - component: {fileID: 1053783665782300899}
+  - component: {fileID: 3156833971053369633}
   m_Layer: 5
-  m_Name: GetBtn
+  m_Name: shadow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &6075085157667103374
+  m_IsActive: 1
+--- !u!224 &4772933182877509454
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085157667103375}
+  m_GameObject: {fileID: 5970704055948593518}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6075085159758486491}
-  m_Father: {fileID: 4931740212118464070}
-  m_RootOrder: 3
+  m_Children: []
+  m_Father: {fileID: 3097314030895175542}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 48}
-  m_SizeDelta: {x: 260, y: 72}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 44, y: -22}
+  m_SizeDelta: {x: 50, y: 15}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6075085157667103372
+--- !u!222 &2730438853275704768
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085157667103375}
+  m_GameObject: {fileID: 5970704055948593518}
   m_CullTransparentMesh: 0
---- !u!114 &5328069431028710917
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085157667103375}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  UIName: 
-  keys:
-  - UnityEngine.RectTransform
-  - UnityEngine.CanvasRenderer
-  - UINode
-  - UnityEngine.UI.Button
-  - UnityEngine.UI.Image
-  values: 0000000100
-  depObjs:
-  - {fileID: 0}
-  activeType: 0
---- !u!114 &2445687199868513553
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085157667103375}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Highlighted
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7753513787381790449}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &7753513787381790449
+--- !u!114 &1053783665782300899
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085157667103375}
+  m_GameObject: {fileID: 5970704055948593518}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_Color: {r: 0, g: 0, b: 0, a: 0.19607843}
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2f4b91e4ea33e5c478f66f49180ce47e, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 0e428edc1f08e564f88828484ec787dd, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1106,6 +1272,28 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3156833971053369633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5970704055948593518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UINode
+  values: 00000100
+  depObjs:
+  - {fileID: 8908972827262993200}
+  activeType: 0
 --- !u!1 &6075085158162668873
 GameObject:
   m_ObjectHideFlags: 0
@@ -1249,7 +1437,7 @@ MonoBehaviour:
   depObjs:
   - {fileID: 0}
   activeType: 0
---- !u!1 &6075085159758486484
+--- !u!1 &6199821812393566395
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1257,53 +1445,57 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6075085159758486491}
-  - component: {fileID: 6075085159758486489}
-  - component: {fileID: 5625801360294600810}
-  - component: {fileID: 8059462986712496936}
-  - component: {fileID: 6299912918014411091}
+  - component: {fileID: 3097314030895175542}
+  - component: {fileID: 7949435819588673163}
+  - component: {fileID: 8908972827262993200}
+  - component: {fileID: 6069879919546219178}
+  - component: {fileID: 8225851840684048924}
   m_Layer: 5
-  m_Name: Number
+  m_Name: GetBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6075085159758486491
+--- !u!224 &3097314030895175542
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085159758486484}
+  m_GameObject: {fileID: 6199821812393566395}
   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_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6075085157667103374}
-  m_RootOrder: 0
+  m_Children:
+  - {fileID: 1785806225963693034}
+  - {fileID: 4772933182877509454}
+  - {fileID: 7927687228632276472}
+  - {fileID: 5065764872668664590}
+  m_Father: {fileID: 4931740212118464070}
+  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}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 150, y: 60}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 48}
+  m_SizeDelta: {x: 260, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6075085159758486489
+--- !u!222 &7949435819588673163
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085159758486484}
+  m_GameObject: {fileID: 6199821812393566395}
   m_CullTransparentMesh: 0
---- !u!114 &5625801360294600810
+--- !u!114 &8908972827262993200
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085159758486484}
+  m_GameObject: {fileID: 6199821812393566395}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
@@ -1314,115 +1506,76 @@ MonoBehaviour:
   - UnityEngine.RectTransform
   - UnityEngine.CanvasRenderer
   - UINode
-  - TMPro.TextMeshProUGUI
-  - UILocalizeScript
+  - UnityEngine.UI.Button
+  - UnityEngine.Animator
   values: 0000000100
-  depObjs:
-  - {fileID: 5328069431028710917}
+  depObjs: []
   activeType: 0
---- !u!114 &8059462986712496936
+--- !u!114 &6069879919546219178
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085159758486484}
+  m_GameObject: {fileID: 6199821812393566395}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 3
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u9886\u53D6"
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
-  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
-    type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 48
-  m_fontSizeBase: 44
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 3
-  m_fontSizeMax: 48
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 1
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &6299912918014411091
-MonoBehaviour:
+--- !u!95 &8225851840684048924
+Animator:
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6075085159758486484}
+  m_GameObject: {fileID: 6199821812393566395}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_key: WjBattleBuff_Btn
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: ec099100a25a6e94facf1732e56ceb4c, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &6925702169425509602
 GameObject:
   m_ObjectHideFlags: 0
@@ -1455,7 +1608,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4931740212118464070}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1525,3 +1678,102 @@ MonoBehaviour:
   values: 00000100
   depObjs: []
   activeType: 0
+--- !u!1 &8099570843696860496
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5065764872668664590}
+  - component: {fileID: 3214402986173202866}
+  - component: {fileID: 1450079685294366564}
+  - component: {fileID: 847066082828103750}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5065764872668664590
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8099570843696860496}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3097314030895175542}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 44, y: 0}
+  m_SizeDelta: {x: 70, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3214402986173202866
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8099570843696860496}
+  m_CullTransparentMesh: 0
+--- !u!114 &1450079685294366564
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8099570843696860496}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: a56141ab944411248b06394cad24af1d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &847066082828103750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8099570843696860496}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UINode
+  values: 00000100
+  depObjs:
+  - {fileID: 8908972827262993200}
+  activeType: 0

Assets/Lua/Enum/UIEventNames.lua

@@ -611,6 +611,9 @@ local UIEventNames = {
     -- 困难 
 
     MAP_MODE_CHANGE = id(), -- 地图模式变化
+
+    -- 无尽
+    WJ_ON_BATTLE_CHANGE = id(), -- 鼓舞buff 发生变化
 }
 
 return UIEventNames

Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -754,4 +754,43 @@ function ClimbingTowerDataMgr:GetCurBattleBuffInfo()
 
     return self.wjBattleBuffInfo
 end
+
+function ClimbingTowerDataMgr:SetCurBattleBuffInfo(type,lv)
+    self.wjBattleBuffInfo['buff'..type] = lv
+    self:RefBattleInfo()
+    ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.WJ_ON_BATTLE_CHANGE);
+end
+
+function ClimbingTowerDataMgr:RefBattleInfo()
+    --self.AllBattleInfos = nil
+    local cfgs = ManagerContainer.CfgMgr:GetWjBattleBuffCfg()
+    local buffinfo = self:GetCurBattleBuffInfo()
+    local allInfo = {value = 0,infos ={}}
+    local value = 0
+    for i = 1, 3, 1 do
+        local tempInfo = {}
+        local cfg = cfgs[i]
+        tempInfo.curLv = buffinfo["buff" .. i]
+        tempInfo.id = i
+        tempInfo.lvEffect = cfg.BuffEffect[1][2]
+        tempInfo.curEffect = tempInfo.lvEffect * tempInfo.curLv
+        tempInfo.max = cfg.Max
+        tempInfo.cost = cfg.Cost[tempInfo.curLv + 1]
+        allInfo.infos[i] = tempInfo
+        if tempInfo.curLv > 0 then            
+            value = value + tempInfo.curEffect
+        end
+    end
+    allInfo.value = value
+   LogError(Inspect(allInfo))
+    self.AllBattleInfos = allInfo
+end
+
+
+function ClimbingTowerDataMgr:GetCurAllBattleBuffInfo()
+    if self.AllBattleInfos == nil then
+       self:RefBattleInfo()
+    end
+    return self.AllBattleInfos
+end
 return ClimbingTowerDataMgr

Assets/Lua/UI/Common/WjBattleBuffInfoItemCtr.lua

@@ -0,0 +1,37 @@
+local WjBattleBuffInfoItemCtr = {}
+
+function WjBattleBuffInfoItemCtr:SetData(wnd, itemlua, logicData, enterType, onClickOwner, onClickCB, params)
+    --LogError("---------------"..itemlua:getClassName().."----------------"..Inspect(logicData))
+	self:InitUI(wnd, itemlua, logicData, enterType, onClickOwner, onClickCB, params)
+    self:SetItemsData(itemlua, logicData)
+	--self:SetBtns(itemlua, logicData)
+	
+end 
+
+function WjBattleBuffInfoItemCtr:InitUI(wnd, itemlua, logicData, enterType, onClickOwner, onClickCB, params)
+    local p1 = I18N.T('WjBattleType'..logicData.id)
+    itemlua.itemName.text.text = p1
+    itemlua.descTxt.text.text = I18N.SetLanguageValue('WjBattleBuff_Dec3',logicData.lvEffect,logicData.lvEffect,logicData.curLv,logicData.max)
+    local ismax = logicData.curLv >= logicData.max
+    itemlua.getBtn:SetActive(not ismax)
+    itemlua.sealBtn:SetActive(ismax)
+    if not ismax then
+        wnd.uiBase:AddButtonUniqueEventListener(itemlua.getBtn.button,onClickOwner,onClickCB,logicData)
+        local itemCfgData = ManagerContainer.CfgMgr:GetItemById(logicData.cost[1])
+        CommonUtil.LoadIcon(self, itemCfgData.MiniIcon, function (sprite)
+            itemlua.getBtn.icon.image.sprite = sprite
+        end, itemlua, 'CurrenyIcon')
+        itemlua.getBtn.number.text.text = tostring(logicData.cost[2]) 
+    end
+end
+
+
+function WjBattleBuffInfoItemCtr:SetItemsData(itemlua, logicData)
+    
+end
+
+function  WjBattleBuffInfoItemCtr:SetBtns(itemlua, logicData)
+    
+end
+
+return WjBattleBuffInfoItemCtr

Assets/Lua/UI/UIClimbingTower/UIWjBattleBuffCtrCtr.lua.meta → Assets/Lua/UI/Common/WjBattleBuffInfoItemCtr.lua.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 894640f1478a9234cad01edc2d5f7872
+guid: 65ba1faadf9aa394ca7e83d9f89ca5b4
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Lua/UI/GridViewItem/WjBattleBuffInfoItem_Generate.lua

@@ -1,15 +1,25 @@
----@class WjBattleBuffInfoItem__Generate_descTxt
+---@class WjBattleBuffInfoItem__Generate_getBtn_icon
 ---@field public gameObject UnityEngine.GameObject
----@field public text UnityEngine.UI.Text
+---@field public image UnityEngine.UI.Image
 
 ---@class WjBattleBuffInfoItem__Generate_getBtn_number
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
 
+---@class WjBattleBuffInfoItem__Generate_getBtn_shadow
+---@field public gameObject UnityEngine.GameObject
+---@field public image UnityEngine.UI.Image
+
 ---@class WjBattleBuffInfoItem__Generate_getBtn
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
+---@field public shadow WjBattleBuffInfoItem__Generate_getBtn_shadow
 ---@field public number WjBattleBuffInfoItem__Generate_getBtn_number
+---@field public icon WjBattleBuffInfoItem__Generate_getBtn_icon
+
+---@class WjBattleBuffInfoItem__Generate_descTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text UnityEngine.UI.Text
 
 ---@class WjBattleBuffInfoItem__Generate_itemIcon
 ---@field public gameObject UnityEngine.GameObject
@@ -24,9 +34,9 @@
 ---@field private transform UnityEngine.Transform
 ---@field private itemName WjBattleBuffInfoItem__Generate_itemName
 ---@field private itemIcon WjBattleBuffInfoItem__Generate_itemIcon
----@field private getBtn WjBattleBuffInfoItem__Generate_getBtn
 ---@field private sealBtn UnityEngine.GameObject
 ---@field private descTxt WjBattleBuffInfoItem__Generate_descTxt
+---@field private getBtn WjBattleBuffInfoItem__Generate_getBtn
 local WjBattleBuffInfoItemView = class("WjBattleBuffInfoItemView")
 
 function WjBattleBuffInfoItemView:ctor()
@@ -50,6 +60,8 @@ function WjBattleBuffInfoItemView:InitGenerate(Root, data)
 	self:InitGenerate__5(Root,data)
 	self:InitGenerate__6(Root,data)
 	self:InitGenerate__7(Root,data)
+	self:InitGenerate__8(Root,data)
+	self:InitGenerate__9(Root,data)
 
 
 end
@@ -91,6 +103,32 @@ end
 
 ---@private
 function WjBattleBuffInfoItemView:InitGenerate__4(Root, data)
+--[[
+	Seal
+--]]
+	local tmp = Root:Find("Seal").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.sealBtn = tmp
+end
+
+---@private
+function WjBattleBuffInfoItemView:InitGenerate__5(Root, data)
+--[[
+	DescTxt
+--]]
+	local tmp = Root:Find("DescTxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.descTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function WjBattleBuffInfoItemView:InitGenerate__6(Root, data)
 --[[
 	GetBtn
 --]]
@@ -104,50 +142,58 @@ function WjBattleBuffInfoItemView:InitGenerate__4(Root, data)
 end
 
 ---@private
-function WjBattleBuffInfoItemView:InitGenerate__5(Root, data)
+function WjBattleBuffInfoItemView:InitGenerate__7(Root, data)
 --[[
-	GetBtn/Number
+	GetBtn/shadow
 --]]
-	local tmp = Root:Find("GetBtn/Number").gameObject
+	local tmp = Root:Find("GetBtn/shadow").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.getBtn.number = tmp
+	self.getBtn.shadow = tmp
 
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+	tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
 end
 
 ---@private
-function WjBattleBuffInfoItemView:InitGenerate__6(Root, data)
+function WjBattleBuffInfoItemView:InitGenerate__8(Root, data)
 --[[
-	Seal
+	GetBtn/Number
 --]]
-	local tmp = Root:Find("Seal").gameObject
+	local tmp = Root:Find("GetBtn/Number").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.sealBtn = tmp
+	self.getBtn.number = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
 ---@private
-function WjBattleBuffInfoItemView:InitGenerate__7(Root, data)
+function WjBattleBuffInfoItemView:InitGenerate__9(Root, data)
 --[[
-	DescTxt
+	GetBtn/Icon
 --]]
-	local tmp = Root:Find("DescTxt").gameObject
+	local tmp = Root:Find("GetBtn/Icon").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.descTxt = tmp
+	self.getBtn.icon = tmp
 
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+	tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
 end
 
 ---@private
 function WjBattleBuffInfoItemView:GenerateDestroy()
+	if tolua.getpeer(self.getBtn.icon) ~= nil then
+		tolua.setpeer(self.getBtn.icon, nil)
+	end
 	if tolua.getpeer(self.getBtn.number) ~= nil then
 		tolua.setpeer(self.getBtn.number, nil)
 	end
+	if tolua.getpeer(self.getBtn.shadow) ~= nil then
+		tolua.setpeer(self.getBtn.shadow, nil)
+	end
 	if tolua.getpeer(self.itemName) ~= nil then
 		tolua.setpeer(self.itemName, nil)
 	end
@@ -156,10 +202,6 @@ function WjBattleBuffInfoItemView:GenerateDestroy()
 		tolua.setpeer(self.itemIcon, nil)
 	end
 	self.itemIcon = nil
-	if tolua.getpeer(self.getBtn) ~= nil then
-		tolua.setpeer(self.getBtn, nil)
-	end
-	self.getBtn = nil
 	if tolua.getpeer(self.sealBtn) ~= nil then
 		tolua.setpeer(self.sealBtn, nil)
 	end
@@ -168,6 +210,10 @@ function WjBattleBuffInfoItemView:GenerateDestroy()
 		tolua.setpeer(self.descTxt, nil)
 	end
 	self.descTxt = nil
+	if tolua.getpeer(self.getBtn) ~= nil then
+		tolua.setpeer(self.getBtn, nil)
+	end
+	self.getBtn = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UIClimbingTower/UIClimbingTowerView.lua

@@ -20,7 +20,10 @@ function UIClimbingTowerView:AddEventListener()
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name,UIEventNames.EID_REFRESH_PEAKTOWER_WIN_DATA,self,self.UpdatePeakTowerDataAfterWin)
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name,UIEventNames.EID_Refresh_ClimbingTower_FriendInfo,self,self.RefreshClimbingTowerFriendInfo)
 
+	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name,UIEventNames.WJ_ON_BATTLE_CHANGE,self,self.RefreshBattleBuffInfo)
+
 	ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_TOWER_LEVEL_MIN_FIGHT_POWER_ACK, self.OnFightPowerAck,self)
+
 end
 
 function UIClimbingTowerView:GetPopGot(data)
@@ -157,6 +160,7 @@ function UIClimbingTowerView:AddUIEventListener()
 	self.uiBase:AddButtonEventListener(self.towerBgBtn.button,self,self.CloseModeNode)
 	self.uiBase:AddButtonEventListener(self.wjchallengeBtn.button,self,self.OnClickWJBtn)
 	self.uiBase:AddButtonEventListener(self.gotoBtn.button,self,self.OnClickRewardInfo)
+	self.uiBase:AddButtonEventListener(self.buyBuffBtn.button,self,self.OnClickGotoBuyBuff)
 end
 
 function UIClimbingTowerView:OnSnapItemFinished(loopListView, loopListViewItem)
@@ -1092,24 +1096,14 @@ function UIClimbingTowerView:GetItemByIndexPrivilege(loopListView, itemIdx)
 	local itemLua = CommonUtil.BindGridViewItem2Lua(self, 'EntryUnlockDscItem', item.gameObject)
 	local curID = itemIdx + 1
 	LogError("itemIdx = "..itemIdx)
-	local cfgs = ManagerContainer.CfgMgr:GetWjBattleBuffCfg()
-	local cfg = cfgs[curID]
-	if cfg == nil then
-		return
-	end
-	local buffinfo =  ManagerContainer.DataMgr.TowerDataMgr:GetCurBattleBuffInfo()
-	local curLv = buffinfo["buff"..curID]
-	if curLv == nil then
-		return
-	end
-	local lvEffect = cfg.BuffEffect[1][2]
-	--local curEffect = lvEffect * curLv
-
+	
+	local buffinfos =  ManagerContainer.DataMgr.TowerDataMgr:GetCurAllBattleBuffInfo()
+	local curInfo = buffinfos.infos[curID]
 	if itemLua then
 		local p1 = I18N.T('WjBattleType'..curID)
-		local txt = I18N.SetLanguageValue('WjBattleBuff_Dec',p1,lvEffect,lvEffect,curLv,cfg.Max)
+		local txt = I18N.SetLanguageValue('WjBattleBuff_Dec',p1,curInfo.lvEffect,curInfo.lvEffect,curInfo.curLv,curInfo.max)
 		local idx = 0
-		if curLv > 0 then
+		if curInfo.curLv > 0 then
 			idx = 1
 			txt = "<color=#00ff06>"..txt.."</color>"
 		end
@@ -1132,25 +1126,20 @@ function UIClimbingTowerView:RefreshBattleBuffInfo()
 
     self.privilegeScrollView.loopListView:SetListItemCount(3, true)
 
-    local cfgs = ManagerContainer.CfgMgr:GetWjBattleBuffCfg()
-    local buffinfo = ManagerContainer.DataMgr.TowerDataMgr:GetCurBattleBuffInfo()
-    local value = 0
-    for i = 1, 3, 1 do
-        local cfg = cfgs[i]
-        local curLv = buffinfo["buff" .. i]
-        if curLv > 0 then
-            local lvEffect = cfg.BuffEffect[1][2]
-            local curEffect = lvEffect * curLv
-            value = value + curEffect
-        end
-    end
-	local txt = I18N.SetLanguageValue('WjBattleBuff_Dec2',value,value)
-	if value > 0 then
+    
+    local buffinfo = ManagerContainer.DataMgr.TowerDataMgr:GetCurAllBattleBuffInfo()
+   
+	local txt = I18N.SetLanguageValue('WjBattleBuff_Dec2',buffinfo.value,buffinfo.value)
+	if buffinfo.value > 0 then
 		txt = "<color=#00ff06>"..txt.."</color>"
 	end
     self.privilegeScrollView.entryUnlockDscItem.battleBuffTxt.text.text = txt
 
 end
 
+
+function UIClimbingTowerView:OnClickGotoBuyBuff()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIWjBattleBuffView)
+end
 return UIClimbingTowerView
 

Assets/Lua/UI/UIClimbingTower/UIWjBattleBuffViewCtr.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0d8da427ffaffa748a52add56b0b5faa
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/UI/UIClimbingTower/UIWjBattleBuffViewView.lua

@@ -1,14 +1,15 @@
 local UIWjBattleBuffViewView = require("UIClimbingTower/UIWjBattleBuffViewView_Generate")
 
 function UIWjBattleBuffViewView:OnAwake(data)
-	self.controller = require("UIClimbingTower/UIWjBattleBuffViewCtr"):new()
-	self.controller:Init(self)
-	self.controller:SetData(data)
+    self.controller = require("UIClimbingTower/UIWjBattleBuffViewCtr"):new()
+    self.controller:Init(self)
+    self.controller:SetData(data)
 end
 
+
 function UIWjBattleBuffViewView:AddEventListener()
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name)
-
+	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name,UIEventNames.WJ_ON_BATTLE_CHANGE,self,self.SetItems)
 end
 
 function UIWjBattleBuffViewView:FillContent(data, uiBase)
@@ -24,6 +25,7 @@ function UIWjBattleBuffViewView:FillContent(data, uiBase)
 end
 
 function UIWjBattleBuffViewView:Init()
+	self:SetItems()
 end
 
 function UIWjBattleBuffViewView:RemoveEventListener()
@@ -32,7 +34,8 @@ function UIWjBattleBuffViewView:RemoveEventListener()
 end
 
 function UIWjBattleBuffViewView:AddUIEventListener()
-
+	self.uiBase:AddButtonEventListener(self.BtnClose.button,self,self.OnClickClose)
+	self.uiBase:AddButtonEventListener(self.btnBack.button,self,self.OnClickClose)
 end
 
 function UIWjBattleBuffViewView:OnHide()
@@ -51,5 +54,47 @@ function UIWjBattleBuffViewView:OnDispose()
 	self.controller:OnDispose()
 end
 
+
+function UIWjBattleBuffViewView:SetItems()
+	local buffinfos =  ManagerContainer.DataMgr.TowerDataMgr:GetCurAllBattleBuffInfo()
+	local datalist = buffinfos.infos
+	self.scrollView.loopHorizontalScrollRect:ClearCells()
+
+	CommonUtil.LoopGridViewEleCreateNew(self,
+	self.scrollView.loopHorizontalScrollRect,
+	self.content.horizontalLayoutGroup,
+	datalist,
+	0,
+	self,
+	self.UpdateItem,
+	nil,nil,0);
+end
+
+function UIWjBattleBuffViewView:UpdateItem(_itemLua, _idx,_data)
+	if not _itemLua or not _data then return end
+	--_itemLua.gameObject:SetParent(wnd.content.transform)
+	CommonUtil.UpdateItemPrefab(self, _itemLua, _data, Enum.ItemIEnterType.Bag,self,self.OnClickBattleBuffBtn)
+end
+function UIWjBattleBuffViewView:OnClickBattleBuffBtn(btn,data)
+	local curdata = data[0]
+	local itemCfgData = ManagerContainer.CfgMgr:GetItemById(curdata.cost[1])
+	local param = {}
+	param[1] = I18N.T(itemCfgData.Name)
+	param[2] = curdata.cost[2]
+	param[3] = I18N.T('WjBattleType'..curdata.id)
+	local tipData = {'WjBattleBuffBuy',param,curdata,self,self.BuyBattleBuf}
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, tipData)
+end
+
+
+function UIWjBattleBuffViewView:OnClickClose()
+	self:UIClose()
+end
+
+function UIWjBattleBuffViewView:BuyBattleBuf(data)
+	ManagerContainer.DataMgr.TowerDataMgr:SetCurBattleBuffInfo(data.id,data.curLv + 1)
+end
+
+
 return UIWjBattleBuffViewView
 

Assets/Lua/UI/UICommonTips/UINoticeTipsView.lua

@@ -112,6 +112,8 @@ local NoticeList = {
 	["ClimbingTowerDayRewardTips2"] = {title = "ClimbingTowerDayRewardTips", notice = "BtnPresentTips2", notice1 = "BtnPresentTips3", btnSure = "BtnConfirm"},
 	--许愿钱包
 	["Insufficient"] = {title = "InsufficientTitle", notice = "InsufficientLimit",notice1 = "GoTo2", btnSure = "BtnGoto"},
+	-- 无尽鼓舞购买
+	['WjBattleBuffBuy']={title = 'WjBattleBuffTxt',notice = 'WjBattleBuff_Dec4' , notice1 = '', btnSure = "BtnConfirm"}
 }
 
 function UINoticeTipsView:OnAwake(data)