From 39bd3e85232d9b1379a16dc6595fcea323d4f284 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 14 Jul 2020 11:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=8F=AC=E5=94=A4ui=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Operating/OperatingPanel.prefab | 244 ++++++++++++++---- .../ActivityGift/ActivityGiftManager.lua | 2 +- .../Modules/Operating/TimeLimitedCall.lua | 6 +- 3 files changed, 193 insertions(+), 59 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index b5496a93ae..d40dba9569 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -2618,8 +2618,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: -9.03, y: -1.5072} - m_SizeDelta: {x: 362, y: 114} + m_AnchoredPosition: {x: -6.81, y: 1.6082} + m_SizeDelta: {x: 318.22, y: 108.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1010505281797819944 CanvasRenderer: @@ -2649,7 +2649,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: 9282a727850779b4c982b7339b750be0, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c3a0437ae0a0ea4a85275c9a27bf73f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13471,8 +13471,7 @@ GameObject: m_Component: - component: {fileID: 2943178877559612817} - component: {fileID: 8556495867214217867} - - component: {fileID: 5005951622191640681} - - component: {fileID: 5442315611632634967} + - component: {fileID: 5236787047158790192} m_Layer: 5 m_Name: maxtimes m_TagString: Untagged @@ -13490,14 +13489,15 @@ RectTransform: 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_Children: + - {fileID: 1317025218907942069} m_Father: {fileID: 4861732001835339994} m_RootOrder: 4 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: 242.9, y: -653} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -283.51, y: 854.77} + m_SizeDelta: {x: 512.98, y: 56.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8556495867214217867 CanvasRenderer: @@ -13507,7 +13507,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1666992508801022590} m_CullTransparentMesh: 0 ---- !u!114 &5005951622191640681 +--- !u!114 &5236787047158790192 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13516,46 +13516,26 @@ MonoBehaviour: m_GameObject: {fileID: 1666992508801022590} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.42745098, g: 0.98039216, b: 0.33333334, a: 1} + 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: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5355\u65E5\u6700\u5927\u62BD\u53D6\u6B21\u6570\uFF1A2/99999" ---- !u!114 &5442315611632634967 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1666992508801022590} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: 2} - m_UseGraphicAlpha: 1 + m_Sprite: {fileID: 21300000, guid: 040b2d02b8b551748b95d94345cbcfe6, 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 &1671659940034736257 GameObject: m_ObjectHideFlags: 0 @@ -15053,8 +15033,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: -13.814, y: 3.6} - m_SizeDelta: {x: 362, y: 114} + m_AnchoredPosition: {x: 12.066, y: 8.63} + m_SizeDelta: {x: 310.4, y: 89.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2257171887338917382 CanvasRenderer: @@ -15084,7 +15064,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: 9282a727850779b4c982b7339b750be0, type: 3} + m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16518,7 +16498,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: 151.33118, y: 40} + m_AnchoredPosition: {x: 129.8, y: 40} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7420353497248341969 @@ -43469,7 +43449,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: 117.8, y: -38.17} + m_AnchoredPosition: {x: 126.9, y: -38.17} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1710377963916506075 @@ -45856,7 +45836,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: 40.15, y: -38.17} + m_AnchoredPosition: {x: 43.183334, y: -38.17} m_SizeDelta: {x: 80.3, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5638541037889376890 @@ -46312,6 +46292,7 @@ RectTransform: - {fileID: 133406343278040831} - {fileID: 8477380984683347905} - {fileID: 771717322046565802} + - {fileID: 78798665873689952} m_Father: {fileID: 224326955275377428} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46588,9 +46569,9 @@ RectTransform: m_Father: {fileID: 187152867808059859} m_RootOrder: 0 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: 8.4, y: 55.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 50, y: -25} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6862162761333370600 @@ -48805,7 +48786,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: 4.6, y: -766.5} + m_AnchoredPosition: {x: 4.6, y: -736.6} m_SizeDelta: {x: 574, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &82962969014761975 @@ -54931,7 +54912,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: 193.55, y: -38.17} + m_AnchoredPosition: {x: 208.71667, y: -38.17} m_SizeDelta: {x: 76.5, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4296817861848931118 @@ -67395,7 +67376,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: -9.6, y: 9.39} + m_AnchoredPosition: {x: 15.7, y: 6.8} m_SizeDelta: {x: 267, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2920749518122637498 @@ -68015,9 +67996,9 @@ RectTransform: m_Father: {fileID: 187152867808059859} m_RootOrder: 1 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: -66, y: 6.8} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 50, y: -75} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7757148817204996626 @@ -77883,6 +77864,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 2000 LanguageIndex: 0 +--- !u!1 &8712981583519647423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1317025218907942069} + - component: {fileID: 4624657570487755594} + - component: {fileID: 8811449368513371643} + m_Layer: 5 + m_Name: times + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1317025218907942069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712981583519647423} + 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: 2943178877559612817} + 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: 10.4, y: -2} + m_SizeDelta: {x: -24.77, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4624657570487755594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712981583519647423} + m_CullTransparentMesh: 0 +--- !u!114 &8811449368513371643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8712981583519647423} + 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: 0.9921569, g: 0.8980393, b: 0.8705883, 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: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4ECA\u65E5\u53EC\u5524\u4E0A\u9650\uFF1A1/9999999" --- !u!1 &8751648712014661283 GameObject: m_ObjectHideFlags: 0 @@ -80230,6 +80290,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &9166265444150149798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 78798665873689952} + - component: {fileID: 5701856726327077899} + - component: {fileID: 2511615911663583851} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &78798665873689952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9166265444150149798} + 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: 4861732001835339994} + m_RootOrder: 9 + 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: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5701856726327077899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9166265444150149798} + m_CullTransparentMesh: 0 +--- !u!114 &2511615911663583851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9166265444150149798} + 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: 0.627451} + 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: 76276952c1a38a3449f2ddf94e94a11c, 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 &9168547109925034939 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index b38447796b..af1ab5ef26 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -238,7 +238,7 @@ end function this.GetActivityValueInfo(type, Id) if this.mission[type] then - LogBlue("this.mission[type].value:"..this.mission[type].value) + -- LogBlue("this.mission[type].value:"..this.mission[type].value) return this.mission[type].value end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index 125f3d38c0..00739f88e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -37,7 +37,7 @@ function TimeLimitedCall:InitComponent(gameObject) self.activityBtn = Util.GetGameObject(self.gameObject,"btngroup/activity") self.rewardBtn = Util.GetGameObject(self.gameObject,"btngroup/reward") self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --剩余时间 - self.upper=Util.GetGameObject(self.gameObject,"maxtimes"):GetComponent("Text") ---召唤上限 + self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限 self.slider = Util.GetGameObject(self.gameObject, "nextlevel/Slider"):GetComponent("Slider") self.sliderText=Util.GetGameObject(self.gameObject,"nextlevel/Text"):GetComponent("Text") self.curtext = Util.GetGameObject(self.gameObject, "curvalue/Text"):GetComponent("Text") @@ -234,7 +234,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() local maxtimesId=lotterySetting[RecruitType.TimeLimitSingle].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) self.curtext.text=curTimes - self.upper.text= Language[12185]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限 + self.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限 local freeTime= 0 if freeTimesId>0 then freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) @@ -260,7 +260,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() local d if(isFree) then info.text=Language[11759] - else + else d=RecruitManager.GetExpendData(m.type) itemId=d[1] itemNum=d[2]