diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab index 632cddc50e..d75cefd8a8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBossInfoPanel.prefab @@ -5841,7 +5841,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: 320.21, y: 198.48} + m_AnchoredPosition: {x: 242.20999, y: 198.48} m_SizeDelta: {x: 360.63, y: 57.22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4084650633271041978 @@ -5921,7 +5921,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: 86, y: 195} + m_AnchoredPosition: {x: 8, y: 195} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3620247102191759170 @@ -20944,7 +20944,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 229.8, y: 196.5} + m_AnchoredPosition: {x: 151.8, y: 196.5} m_SizeDelta: {x: 86, y: 375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1111625735732733829 diff --git a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab index 30eb5f1e42..a5f169c0bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab @@ -283,12 +283,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 16.16 + m_Spacing: 14 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 9e9f18c212..51cb44a88c 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3436,9 +3436,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.3334, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4706108599745469864 @@ -7545,10 +7545,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 188, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7726254978842767222 CanvasRenderer: @@ -7744,9 +7744,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.66667, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1178887444496303329 @@ -7925,8 +7925,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: 0, y: -20} - m_SizeDelta: {x: 900, y: 50} + m_AnchoredPosition: {x: 2.8, y: -0.25011} + m_SizeDelta: {x: 835.6, y: 89.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2259948056013139517 CanvasRenderer: @@ -8778,10 +8778,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 356, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7097363111968778765 CanvasRenderer: @@ -10822,9 +10822,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5071244673715781343 @@ -10929,10 +10929,10 @@ RectTransform: m_Father: {fileID: 7329562994253383465} 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: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 304.5, y: -39} + m_SizeDelta: {x: 569, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8436545501627112056 CanvasRenderer: @@ -13108,7 +13108,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bbd93b31adc71d74b96e42d564603572, type: 3} + m_Sprite: {fileID: 21300000, guid: e5f35959f762bbc44b0206adadd5deb3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16364,7 +16364,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6207233311855498205 RectTransform: m_ObjectHideFlags: 0 @@ -19938,10 +19938,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 692, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2548272237263765984 CanvasRenderer: @@ -20560,7 +20560,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5647114065478194402 RectTransform: m_ObjectHideFlags: 0 @@ -22433,9 +22433,9 @@ RectTransform: m_Father: {fileID: 7885627331012549082} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 277, y: -25} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3799765810563942401 @@ -24124,7 +24124,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7756266760337321785 RectTransform: m_ObjectHideFlags: 0 @@ -26852,10 +26852,10 @@ RectTransform: m_Father: {fileID: 7885627331012549082} 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: 54.89} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148.5, y: -27.445} + m_SizeDelta: {x: 257, y: 54.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1955159793380395330 CanvasRenderer: @@ -26932,10 +26932,10 @@ RectTransform: m_Father: {fileID: 338458655642849761} 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: 108.5, y: -35} - m_SizeDelta: {x: 177, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7934512073592766787 CanvasRenderer: @@ -28525,9 +28525,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} 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: 583.3334, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8955976630056367158 @@ -32143,9 +32143,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} 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: 116.66667, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6665704931721194040 @@ -43165,9 +43165,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} 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: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773993077155745798 @@ -44766,10 +44766,10 @@ RectTransform: m_Father: {fileID: 338458655642849761} 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: 511.5, y: -35} - m_SizeDelta: {x: 629, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5055004538366893150 CanvasRenderer: @@ -45203,7 +45203,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3505512144118831052 RectTransform: m_ObjectHideFlags: 0 @@ -46173,10 +46173,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} 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: 188, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2743128581437240062 CanvasRenderer: @@ -48726,10 +48726,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} m_RootOrder: 2 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 524, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2518845947000605921 CanvasRenderer: @@ -51700,10 +51700,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} m_RootOrder: 3 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 692, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3622757647159683476 CanvasRenderer: @@ -54264,10 +54264,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} 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: 524, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2793157614885932168 CanvasRenderer: @@ -54898,10 +54898,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} 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: 356, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5187175447103501528 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index 3e4cb7a91d..a6997edc3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -126,7 +126,7 @@ function ExChangePage:ExChangeShow() SetHEeroLiveToward(self.liveNode,self.heroConfig.Toward) self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(self.heroConfig.PropertyName)) self.heroName.text =GetLanguageStrById(self.heroConfig.ReadingName) - SetTextVerTial(self.heroName,Vector3.New(129.9,3.7,0)) + --SetTextVerTial(self.heroName,Vector3.New(129.9,3.7,0)) --Util.ClearChild(self.exChangeRewardParent.transform) diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index d0545a849f..b6f769acad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -64,6 +64,10 @@ function this.Pay(id, func) CheckRedPointStatus(RedPointType.GrowthPackage) --成长礼包的红点检测 --直购商品 local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id) + if rechargeConfig.Price == 0 then + NetManager.MoneyBuyGiftRequest(id) + return + end --现金点券购买 local xjdqNum = BagManager.GetItemCountById(131) if xjdqNum >= rechargeConfig.Price and rechargeConfig.Price > 0 and rechargeConfig.OtherBuy1 and #rechargeConfig.OtherBuy1 > 0 and rechargeConfig.OtherBuy1[1][1] == 131 then