diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab index 774a9f20fc..66e62e052e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab @@ -188,7 +188,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: 160, y: 48.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &618488542 @@ -221,7 +221,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 @@ -229,8 +229,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6311\u6218" --- !u!1 &1143143374 @@ -416,8 +416,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: -187, y: 24} - m_SizeDelta: {x: 331.9, y: 300} + m_AnchoredPosition: {x: -339, y: -238} + m_SizeDelta: {x: 331.9, y: 160.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1565031755 CanvasRenderer: @@ -449,18 +449,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 80 + m_FontSize: 92 m_FontStyle: 2 m_BestFit: 0 - m_MinSize: 8 - m_MaxSize: 80 + m_MinSize: 1 + m_MaxSize: 100 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u9632\u5FA1\u526F\u672C" + m_Text: "\u4F24\u5BB3\u526F\u672C" --- !u!114 &1565031753 MonoBehaviour: m_ObjectHideFlags: 0 @@ -790,10 +790,10 @@ RectTransform: m_Father: {fileID: 7507629671965430324} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 42} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 170.815, y: -24.54} + m_SizeDelta: {x: 73, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3634872552215850355 CanvasRenderer: @@ -824,7 +824,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 @@ -2016,7 +2016,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: 401.68, y: -89.4} + m_AnchoredPosition: {x: 392, y: -60.5} m_SizeDelta: {x: 276.63, y: 49.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1817530621458675841 @@ -2791,8 +2791,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: 442.7, y: 556.7} - m_SizeDelta: {x: 110, y: 110} + m_AnchoredPosition: {x: 498, y: 392} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5745960901753002478 CanvasRenderer: @@ -3200,7 +3200,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4370945160089384286 RectTransform: m_ObjectHideFlags: 0 @@ -3217,7 +3217,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: 62.5, y: 51.7} + m_AnchoredPosition: {x: 72.5, y: 67.5} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4499140567808794713 @@ -3585,7 +3585,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: 398.67, y: 0} + m_AnchoredPosition: {x: 398.67, y: 6.7} m_SizeDelta: {x: 212.41, y: 82.665} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3233701052159668965 @@ -3774,10 +3774,10 @@ RectTransform: m_Father: {fileID: 7507629671965430324} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 94.315, y: -24.54} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5511417033217248667 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab index a54b696995..5452a2b4d5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationExamplePopup.prefab @@ -3740,7 +3740,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 120, y: 120} - m_Spacing: {x: -20, y: 0} + m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &4294966961115010919 @@ -5541,7 +5541,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -61.4, y: 0.000031789} - m_SizeDelta: {x: 158, y: 158} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6591834185277516299 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 19126ad876..767193ddc9 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -283,8 +283,8 @@ Language = { [10282] = GetLanguageStrById("金币副本"), [10283] = GetLanguageStrById("经验副本"), [10284] = GetLanguageStrById("英雄副本"), - [10285] = GetLanguageStrById("生命卡副本"), - [10286] = GetLanguageStrById("霸气副本"), + [10285] = GetLanguageStrById("防御副本"), + [10286] = GetLanguageStrById("伤害副本"), [10287] = GetLanguageStrById("挑战"), [10288] = GetLanguageStrById("战力:%s"), [10289] = GetLanguageStrById("扫荡"), diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua index 16247d35e5..9f96df2b09 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua @@ -186,6 +186,7 @@ function this.SetData(root, data) local power=Util.GetGameObject(root,"powerBtn/value"):GetComponent("Text") power.transform.parent.gameObject:SetActive(false) local goBtn=Util.GetGameObject(root,"GoBtn") + local btnTxt=Util.GetGameObject(root,"GoBtn/Text"):GetComponent("Text") local goBtnImage=goBtn:GetComponent("Image") local cost=Util.GetGameObject(root,"cost") local goIconNumText=Util.GetGameObject(cost,"IconNum"):GetComponent("Text") @@ -254,11 +255,13 @@ function this.SetData(root, data) score.gameObject:SetActive(false) if type==1 or type==2 then -- goBtnImage.sprite=this.spLoader:LoadSprite("chall_btn_tiaozhan") + btnTxt.text="挑战" power.text = _power tip.gameObject:SetActive(false) goBtnImage.gameObject:SetActive(true) cost:SetActive(isOpen and freeTime<=0) if type==2 then + btnTxt.text="扫荡" -- goBtnImage.sprite=this.spLoader:LoadSprite("chall_btn_saodang") score.gameObject:SetActive(true) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 88d02ebef3..94a49b5a30 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -102,7 +102,7 @@ function this.CheckGiftFrontIsOpen(gift) return true end - LogError("time================="..time.." v.FrontCommodityNumber==========="..v.FrontCommodityNumber.." buyTime=="..buyTime.."   giftid===="..gift) + -- LogError("time================="..time.." v.FrontCommodityNumber==========="..v.FrontCommodityNumber.." buyTime=="..buyTime.."   giftid===="..gift) if time>v.FrontCommodityNumber then return false end