diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab index 391b744b86..eda5d8980f 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab @@ -257,7 +257,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: -444} + m_AnchoredPosition: {x: 0, y: -471.4} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7582485083871318483 @@ -361,6 +361,85 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &1515078122714593877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7742776686983308557} + - component: {fileID: 1327007466758219400} + - component: {fileID: 7754796398504311503} + m_Layer: 5 + m_Name: hint2Txt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7742776686983308557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515078122714593877} + 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: 7713829738865233941} + 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: 0, y: 64.10007} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1327007466758219400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515078122714593877} + m_CullTransparentMesh: 0 +--- !u!114 &7754796398504311503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515078122714593877} + 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.27058825, g: 0.14509805, b: 0.03137255, 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: 34 + 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: "\u73B0\u5728\u8D2D\u4E70\u7ACB\u4EAB \u4F18\u60E0" --- !u!1 &1673502287822212547 GameObject: m_ObjectHideFlags: 0 @@ -469,7 +548,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -84.5} + m_AnchoredPosition: {x: 0, y: -70} m_SizeDelta: {x: 0, y: 7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4110709529705386527 @@ -1369,12 +1448,14 @@ RectTransform: - {fileID: 895120839504143205} - {fileID: 5097144026546573310} - {fileID: 2707379888323031684} + - {fileID: 8179556619658479921} + - {fileID: 7742776686983308557} m_Father: {fileID: 692265768206534371} 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: 3.7000732, y: -454} + m_AnchoredPosition: {x: 0, y: -471} m_SizeDelta: {x: 280, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4917811247606444445 @@ -1668,7 +1749,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: -1.3, y: -85} + m_AnchoredPosition: {x: -1.3, y: -70.499954} m_SizeDelta: {x: 127.97, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4053261882187032708 @@ -1989,6 +2070,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u8D2D\u4E70\u540E\u6BCF\u65E5\u83B7\u5F97\uFF1A" +--- !u!1 &6013324239848475084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8179556619658479921} + - component: {fileID: 4699516866204228658} + - component: {fileID: 4547195008728403671} + m_Layer: 5 + m_Name: scaleTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8179556619658479921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6013324239848475084} + 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: 7713829738865233941} + m_RootOrder: 3 + 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: 68.6, y: 66.899994} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4699516866204228658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6013324239848475084} + m_CullTransparentMesh: 0 +--- !u!114 &4547195008728403671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6013324239848475084} + 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.654902, g: 0.19607843, b: 0, 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: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "6\u6298" --- !u!1 &6212377461881537225 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua index ed63ceef14..8bb881ddbe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua @@ -5,10 +5,10 @@ GMShuaChongTeQuan = Inherit(BasePanel) self=GMShuaChongTeQuan local sortingOrder = 0 local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷冲GM",img = "gm_shuachong_scGM_01_zh",id=2201 }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级GM" ,img = "gm_shuachong_cjGM_01_zh",id=2202 }, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级GM" ,img = "gm_shuachong_sjGM_01_zh",id=2203 }, - [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上GM",img = "gm_shuachong_wsGM_01_zh",id=2204 }, +local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷冲GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级GM" ,img = "gm_shuachong_cjGM_01_zh",id=2202,scale=6,all=30 }, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级GM" ,img = "gm_shuachong_sjGM_01_zh",id=2203,scale=5,all=176 }, + [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上GM",img = "gm_shuachong_wsGM_01_zh",id=2204,scale=2,all=1640 }, } -- function GMShuaChongTeQuan:New(gameObject) @@ -31,13 +31,16 @@ function GMShuaChongTeQuan:InitComponent() self.titleImg=Util.GetGameObject(self.gameObject, "bg1/shenzuntequanName"):GetComponent("Image") self.btn_buy=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy") self.hintTxt=Util.GetGameObject(self.gameObject, "bg1/bg2/hintTxt"):GetComponent("Text") + self.hintTxt3=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy/hint2Txt") self.tabBox = Util.GetGameObject(self.gameObject, "TabBox") self.infoGrid=Util.GetGameObject(self.gameObject, "bg1/bg2/info/tequan") self.infoPre=Util.GetGameObject(self.gameObject, "bg1/bg2/tequanText") self.rewardGrid=Util.GetGameObject(self.gameObject, "bg1/bg2/Reward") self.dayGrid=Util.GetGameObject(self.gameObject, "bg1/bg2/dayReward") self.payTxt=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy/Text"):GetComponent("Text") + self.scaleImg=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy/Image") self.hint2Txt=Util.GetGameObject(self.gameObject, "bg1/bg2/Rewardbg/Text"):GetComponent("Text") + self.scaleTxt=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy/scaleTxt"):GetComponent("Text") self.oldPriceTxt=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy/old_buy"):GetComponent("Text") local rootHight = self.infoGrid.transform.rect.height local width = self.infoGrid.transform.rect.width @@ -60,18 +63,32 @@ function GMShuaChongTeQuan:InitComponent() local len=#recharge.OpenPrivilege local mission=ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan,activityId) local state=mission.state - self.oldPriceTxt.text=recharge.Price*10 .."元" + if state==0 then self.payTxt.text=recharge.Price.."元" self.hint2Txt.gameObject:SetActive(true) + self.hintTxt3:SetActive(true) + self.scaleTxt.gameObject:SetActive(true) + self.oldPriceTxt.gameObject:SetActive(true) + self.scaleImg:SetActive(true) self.hint2Txt.text="已累计"..mission.progress.."天奖励,奖励最多累计30天" elseif state==1 then self.payTxt.text="领取" + self.hintTxt3:SetActive(false) self.hint2Txt.gameObject:SetActive(false) + self.scaleTxt.gameObject:SetActive(false) + self.scaleImg:SetActive(false) + self.oldPriceTxt.gameObject:SetActive(false) elseif state==2 then self.payTxt.text="已领取" self.hint2Txt.gameObject:SetActive(false) + self.scaleTxt.gameObject:SetActive(false) + self.scaleImg:SetActive(false) + self.hintTxt3:SetActive(false) + self.oldPriceTxt.gameObject:SetActive(false) end + self.oldPriceTxt.text=_TabData[_index].all .."元" + self.scaleTxt.text=_TabData[_index].scale.."折" if _index>1 then local lastId=_TabData[_index-1].id local lastmiss=ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan,lastId) @@ -93,6 +110,11 @@ function GMShuaChongTeQuan:InitComponent() PayManager.Pay(recharge.Id, function() -- self.curAllMonthCardData = MonthCardManager.GetMonthCardData() self.payTxt.text="领取" + self.hintTxt3:SetActive(false) + self.hint2Txt.gameObject:SetActive(false) + self.scaleTxt.gameObject:SetActive(false) + self.scaleImg:SetActive(false) + self.oldPriceTxt.gameObject:SetActive(false) state=1 end) elseif state==1 then