diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab index 4584fa5e9a..53fe098365 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab @@ -819,6 +819,8 @@ RectTransform: - {fileID: 6651358336769451254} - {fileID: 1547769623450436878} - {fileID: 2261782799193269821} + - {fileID: 4530981083012590322} + - {fileID: 8030574034767942975} m_Father: {fileID: 6014646581378279677} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1206,7 +1208,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: 267.7, y: -28.46} + m_AnchoredPosition: {x: 267.7, y: -47} m_SizeDelta: {x: 208.3, y: 56.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6752839646424889057 @@ -2034,6 +2036,85 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &3428827741537948860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8030574034767942975} + - component: {fileID: 7990473134932037551} + - component: {fileID: 7477882377102872525} + m_Layer: 5 + m_Name: limit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8030574034767942975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428827741537948860} + 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: 1727724576} + m_RootOrder: 6 + 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: 270.6, y: -47} + m_SizeDelta: {x: 202.5, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7990473134932037551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428827741537948860} + m_CullTransparentMesh: 0 +--- !u!114 &7477882377102872525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428827741537948860} + 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.2784314, g: 0.18431373, b: 0.054901965, 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: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 0.9 + m_Text: "\u901A\u5173xxx\u89E3\u9501\u662F\u5565\u8FD9\u956F\u5B50\u987B\u578B" --- !u!1 &3433028691161016482 GameObject: m_ObjectHideFlags: 0 @@ -2196,6 +2277,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4062333875391903294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4530981083012590322} + - component: {fileID: 5393538360607578419} + - component: {fileID: 2781763572182555744} + m_Layer: 5 + m_Name: price + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4530981083012590322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062333875391903294} + 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: 1727724576} + 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: 267, y: 3} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5393538360607578419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062333875391903294} + m_CullTransparentMesh: 0 +--- !u!114 &2781763572182555744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4062333875391903294} + 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.95294124, g: 0.7254902, b: 0.21960786, 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: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "98\u5143" --- !u!1 &5057455284431257505 GameObject: m_ObjectHideFlags: 0 @@ -2232,8 +2392,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: -388, y: -151} - m_SizeDelta: {x: 205.8, y: 657} + m_AnchoredPosition: {x: -388, y: -188} + m_SizeDelta: {x: 205.8, y: 731} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7988883046895797184 CanvasRenderer: @@ -2668,7 +2828,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab index 10a7526fb6..394496247b 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab @@ -109,7 +109,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -1078,8 +1078,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: -1.07, y: -98.3} - m_SizeDelta: {x: 203.06, y: 47.7} + m_AnchoredPosition: {x: -0.44, y: -98.3} + m_SizeDelta: {x: 204.33, y: 47.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1108870465 CanvasRenderer: @@ -1110,7 +1110,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 31346691a184c274c9617cc17336b0a3, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index bf316eeba0..e8a045be8d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -142,7 +142,7 @@ function this.TabBtnOnClick(btn,config) local dataList={} local aa=config.Unlock[1] local isOpen,tip=CheckGMIsOpen(aa[1],aa[2]) - if isOpen then + --if isOpen then this.hint.gameObject:SetActive(false) this.scroll:SetActive(true) for k, v in ConfigPairs(GMMaster) do @@ -151,26 +151,35 @@ function this.TabBtnOnClick(btn,config) end end this.scrollView:SetData(dataList,function(index, rewardItem) - this:SingleTask(rewardItem, dataList[index]) + this:SingleTask(rewardItem, dataList[index],isOpen,tip) end,not false,not false) - else - this.hint.gameObject:SetActive(true) - this.hint.text=tip - this.scroll:SetActive(false) - end + -- else + -- this.hint.gameObject:SetActive(true) + -- this.hint.text=tip + -- this.scroll:SetActive(false) + -- end end -function GMChangePanel:SingleTask(go,data) +function GMChangePanel:SingleTask(go,data,isOpen,tip) local name=Util.GetGameObject(go, "name"):GetComponent("Text") local num=Util.GetGameObject(go, "num"):GetComponent("Text") local itemDes=Util.GetGameObject(go, "item"):GetComponent("Text") local btn=Util.GetGameObject(go, "btn") local btnTxt=Util.GetGameObject(go, "btn/Text"):GetComponent("Text") + local priceTxt=Util.GetGameObject(go, "price"):GetComponent("Text") + local limitTxt=Util.GetGameObject(go, "limit"):GetComponent("Text") local recharge=rechargeCommodityConfig[data.PackID] local scale=1 + btn:SetActive(true) + limitTxt.gameObject:SetActive(false) + priceTxt.gameObject:SetActive(true) if data.PackID~=0 and recharge then name.text=recharge.Name + priceTxt.gameObject:SetActive(isOpen) + limitTxt.gameObject:SetActive(not isOpen) + btn:SetActive(isOpen) + limitTxt.text=tip --LogError("type=="..recharge.Type.." id=="..recharge.Id) local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) if leftBuyTime==-1 then @@ -180,9 +189,17 @@ function GMChangePanel:SingleTask(go,data) end btn:GetComponent("Button").interactable = leftBuyTime==-1 or leftBuyTime>0 Util.SetGray(btn,leftBuyTime==0) - btnTxt.text="兑换" + if data.Type==7 or data.Type==8 then + btnTxt.text="前往" + else + btnTxt.text="兑换" + end + + priceTxt.gameObject:SetActive(true) + priceTxt.text=data.Price[1][2].."元" else name.text=data.Name + priceTxt.gameObject:SetActive(false) btn:GetComponent("Button").interactable = true Util.SetGray(btn,false) if data.Id==45 then @@ -229,6 +246,10 @@ function GMChangePanel:SingleTask(go,data) end return else + if data.Type==7 or data.Type==8 then + JumpManager.GoJump(data.Jump) + return + end local sureFunc=function() NetManager.SendGmBuyGoodRequest(data.PackID,function() if data.Jump~=0 then