diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 index 0c815a4d1c..47a0af5ca8 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 index 9547e08aa5..0df894e638 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_02.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 index 742ee4a12a..77403b60da 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_03.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 index 89c79cbc81..8799ad5a4b 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 index e2b1244a8f..6977af530d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 index aaedeacf4d..38d3402b65 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/UI/View/UpView.prefab b/Assets/ManagedResources/Prefabs/UI/View/UpView.prefab index da2d139f8b..a359c70035 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/UpView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/UpView.prefab @@ -176,9 +176,9 @@ RectTransform: m_Father: {fileID: 224081220488562528} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -540.0001, y: -960.0001} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 539.9999, y: -960.0001} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1551019693790370 diff --git a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab index 2fb72b6741..2663d4458d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab @@ -28280,10 +28280,10 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 560, y: 50} + m_CellSize: {x: 500, y: 50} m_Spacing: {x: 30, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -43106,10 +43106,10 @@ RectTransform: m_Father: {fileID: 2689199158799360139} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2691604319409928151 CanvasRenderer: @@ -43482,7 +43482,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000015258789} + m_AnchoredPosition: {x: 0, y: -0.000045776367} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2871929161858473383 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3c3da6b965..eee62e14a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -47,8 +47,8 @@ local jumpDic = { end end, [JumpType.Arena] = function(data)--竞技场 - -- local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) - local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) + local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) + -- local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) --首次进入竞技场 将主线编队复制到竞技场防守、进攻编队 -- if #arenaAttack.teamHeroInfos==0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index 9169548c5f..863ea4890f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -46,22 +46,28 @@ function this:OnShow(_parent,...) local var if _args[1] == RecruitType.Single then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten - this.rootText.text = "确认花费200妖晶进行1次神将召唤?" + local d=RecruitManager.GetExpendData(RecruitType.Single) + this.rootText.text = string.format("确认花费%s妖晶进行1次神将召唤?",d[2]) elseif _args[1] == RecruitType.QianKunBoxSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - this.rootText.text = "确认花费200妖晶抽取1次乾坤宝盒?" + local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) + this.rootText.text = string.format("确认花费%s妖晶抽取1次乾坤宝盒?",d[2]) elseif _args[1] == RecruitType.TimeLimitSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - this.rootText.text = "确认花费200妖晶进行1次限时召唤? " + local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle) + this.rootText.text = string.format("确认花费%s妖晶进行1次限时召唤?",d[2]) elseif _args[1] == RecruitType.Ten then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten - this.rootText.text = "确认花费2000妖晶进行10次神将召唤?" + local d=RecruitManager.GetExpendData(RecruitType.Ten) + this.rootText.text = string.format("确认花费%s妖晶进行10次神将召唤?",d[2]) elseif _args[1] == RecruitType.QianKunBoxTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - this.rootText.text = "确认花费2000妖晶抽取10次乾坤宝盒?" + local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) + this.rootText.text = string.format("确认花费%s妖晶抽取10次乾坤宝盒?",d[2]) elseif _args[1] == RecruitType.TimeLimitTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - this.rootText.text = "确认花费2000妖晶进行10次限时召唤?" + local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen) + this.rootText.text = string.format("确认花费%s妖晶进行10次限时召唤?",d[2]) end Util.AddOnceClick(this.btn,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 7a19c1d001..390d2e78bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -68,7 +68,7 @@ end --刷新招募红点 function this.CheckRecuritRedPoint() - if (this.freeUseTimeList[14] >= 1) then + if (PrivilegeManager.GetPrivilegeRemainValue(14) >= 1) then--this.freeUseTimeList[14]) return true else return false @@ -77,7 +77,7 @@ end --刷新普通招募红点 function this.CheckRecuritNormalPoint() - if (this.freeUseTimeList[38] >= 1) then + if (PrivilegeManager.GetPrivilegeRemainValue(38) >= 1) then--this.freeUseTimeList[38] return true else return false