diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab index 5a99e59048..707c01bc67 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab @@ -492,7 +492,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: 119, y: -14} + m_AnchoredPosition: {x: 119, y: -4} m_SizeDelta: {x: 565.5, y: 137.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &926895657 @@ -1054,7 +1054,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: -1113.5001, y: -1095.1001} + m_AnchoredPosition: {x: -1113.5, y: -1095.1001} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &587599632629317148 @@ -1301,7 +1301,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &151617981993525029 RectTransform: m_ObjectHideFlags: 0 @@ -1318,7 +1318,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: 21.41, y: 66.38} + m_AnchoredPosition: {x: 0, y: -63.3} m_SizeDelta: {x: 151.73, y: 45.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7324086819080386232 @@ -1342,7 +1342,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8745098, b: 0.7529412, a: 1} + m_Color: {r: 0.028301895, g: 0.0268334, b: 0.0268334, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1350,17 +1350,17 @@ 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 28 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 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: "\u7D2F\u8BA11\u5929" LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e459a094ca..27915ebdc1 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1202,7 +1202,6 @@ JumpType = { Gem = 122,--命格 Explor = 123,--探索 HomeLand = 124,--家园 - BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 Privilege = 10003, -- 特权 @@ -1226,6 +1225,8 @@ JumpType = { HeadChange = 10021, --巅峰赛 XianShiDuiHuan = 10022, --主题活动限时兑换 EndlessXingDongliBuy = 10023, --无尽行动力购买 + Song10Wan = 10024,--送10万真充 + SongWuXian = 10025, --送无限抽 chaozhijijin = 10078, ZhuTiHuoDong = 20000, --主题活动任务 QianKunShangDian = 20044, --乾坤商店 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index 5538075b1d..1acef4bbf9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -168,14 +168,35 @@ function GMChangePanel:SingleTask(go,data) local btn=Util.GetGameObject(go, "btn") local btnTxt=Util.GetGameObject(go, "btn/Text"):GetComponent("Text") local recharge=rechargeCommodityConfig[data.PackID] - name.text=recharge.Name - --LogError("type=="..recharge.Type.." id=="..recharge.Id) - local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) - if leftBuyTime==-1 then - num.text="" + local scale=1 + if recharge then + name.text=recharge.Name + --LogError("type=="..recharge.Type.." id=="..recharge.Id) + local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) + if leftBuyTime==-1 then + num.text="" + else + num.text="("..leftBuyTime.."/"..recharge.Limit..")" + end + btn:GetComponent("Button").interactable = leftBuyTime==-1 or leftBuyTime>0 + Util.SetGray(btn,leftBuyTime==0) + btnTxt.text="兑换" else - num.text="("..leftBuyTime.."/"..recharge.Limit..")" + name.text=data.Name + if data.Id==45 then + scale = BattleManager.GetTimeScale() + scale = math.floor(scale*10 + 0.5)/10 + if scale == BATTLE_TIME_SCALE_ONE then + btnTxt.text="一键破解" + else + btnTxt.text="暂停" + end + else + btnTxt.text="前往" + end + end + --LogError("data.id=="..data.Id.." data.name=="..data.Type) local des="" for i = 1, #data.Price do if itemConfig[data.Price[i][1]] then @@ -183,35 +204,58 @@ function GMChangePanel:SingleTask(go,data) end end itemDes.text=des - Util.SetGray(btn,leftBuyTime==0) - btn:GetComponent("Button").interactable = leftBuyTime==-1 or leftBuyTime>0 - Util.AddClick(btn, function() - - local sureFunc=function() - NetManager.SendGmBuyGoodRequest(data.PackID,function() - if data.Jump~=0 then - self:ClosePanel() - JumpManager.GoJump(data.Jump) - return - end - local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) - if leftBuyTime==-1 then - num.text="" + + + Util.AddOnceClick(btn, function() + if data.PackID==0 then + if data.Id==45 then + scale = BattleManager.GetTimeScale() + scale = math.floor(scale*10 + 0.5)/10 + --LogError("scale========="..scale) + if scale == BATTLE_TIME_SCALE_ONE then + BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO) + btnTxt.text="暂停" else - num.text="("..leftBuyTime.."/"..recharge.Limit..")" + BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE) + btnTxt.text="一键破解" end - Util.SetGray(btn,leftBuyTime==0) - btn:GetComponent("Button").interactable = leftBuyTime==-1 or leftBuyTime>0 - this:ShowTopInfo() - end) + scale = BattleManager.GetTimeScale() + scale = math.floor(scale*10 + 0.5)/10 + else + JumpManager.GoJump(data.Jump) + end + return + else + local sureFunc=function() + NetManager.SendGmBuyGoodRequest(data.PackID,function() + if data.Jump~=0 then + self:ClosePanel() + JumpManager.GoJump(data.Jump) + return + end + local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) + if leftBuyTime==-1 then + num.text="" + else + num.text="("..leftBuyTime.."/"..recharge.Limit..")" + end + Util.SetGray(btn,leftBuyTime==0) + btn:GetComponent("Button").interactable = leftBuyTime==-1 or leftBuyTime>0 + this:ShowTopInfo() + end) + end + local args={} + args[1]="是否兑换?" + args[2]="兑换" + args[3]="取消" + args[4]=sureFunc + UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) end - local args={} - args[1]="是否兑换?" - args[2]="兑换" - args[3]="取消" - args[4]=sureFunc - UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) + + end) + + end function GMChangePanel:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua index ace8b250f8..aa2849694b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua @@ -114,38 +114,8 @@ function GMSong10WanPanel:OnShow() end LogError("#missionData==="..#dayList) LogError("linetime=="..lineTime) - if this.timer then - this.timer:Stop() - this.timer = nil - end - local cha= tonumber(GetTimeStamp()-ActivityGiftManager.loginTime) - local needTime=rewardTime- (lineTime+cha) - LogError("needTime=="..needTime) - this.getRed:SetActive(false) - if needTime>=0 then - this.timeTxt.gameObject:SetActive(true) - this.timer = Timer.New(function () - --LogError("needTime=="..needTime) - needTime=needTime-1 - if needTime<=0 then - isCanGet=true - this.timeTxt.text = "有可领取奖励" - this.getRed:SetActive(true) - this.timer:Stop() - this.timer = nil - else - this.timeTxt.text = string.format("领取倒计时：".."%s",TimeToFelaxible(needTime)) - end - - end,1,-1,true) - this.timer:Start() - else - if rewardTime~=0 then - isCanGet=true - - end - this.timeTxt.gameObject:SetActive(false) - end + + this.scrollView:SetData(dayList,function(index, rewardItem) this:UpdateSingleInfo(rewardItem, dayList[index],index) end,not false,not false) @@ -172,6 +142,7 @@ function this:UpdateSingleInfo(go,data,index) this.itemList[go][i].red=Util.GetGameObject(this.itemList[go][i].go, "redPoint") this.itemList[go][i].get=Util.GetGameObject(this.itemList[go][i].go, "yilingqu") this.itemList[go][i].out=Util.GetGameObject(this.itemList[go][i].go, "guoqi") + this.itemList[go][i].name=Util.GetGameObject(this.itemList[go][i].go, "name") this.itemList[go][i].itemView= SubUIManager.Open(SubUIConfig.ItemView,this.itemList[go][i].pos.transform) end @@ -180,11 +151,51 @@ function this:UpdateSingleInfo(go,data,index) this.itemList[go][i].get:SetActive(false) this.itemList[go][i].out:SetActive(false) this.itemList[go][i].itemView:OnOpen(false, data.reward[i],0.75, false, false, false, self.sortingOrder) - local state=activityData.mission[(index-1)*4+i].state --data.reward[i].state + local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,data.reward[i][1]) + this.itemList[go][i].name:GetComponent("Text").text=itemConfig.Name + local id=(index-1)*4+i + local state=activityData.mission[id].state --data.reward[i].state + local progress=activityData.mission[id].progress + local config=ConfigManager.GetConfigData(ConfigName.SuperZhenChong,id) --LogError("state====="..state) if state==0 then + if progress~=-1 then + if this.timer then + this.timer:Stop() + this.timer = nil + end + local cha= tonumber(GetTimeStamp()-ActivityGiftManager.loginTime) + local needTime=config.Time- (lineTime+cha) + LogError("needTime=="..needTime) + this.getRed:SetActive(false) + if needTime>=0 then + this.timeTxt.gameObject:SetActive(true) + this.timer = Timer.New(function () + --LogError("needTime=="..needTime) + needTime=needTime-1 + if needTime<=0 then + isCanGet=true + this.timeTxt.text = "有可领取奖励" + this.getRed:SetActive(true) + this.timer:Stop() + this.timer = nil + this.itemList[go][i].red:SetActive(true) + else + this.timeTxt.text = string.format("领取倒计时：".."%s",TimeToFelaxible(needTime)) + end + + end,1,-1,true) + this.timer:Start() + else + if rewardTime~=0 then + isCanGet=true + this.itemList[go][i].red:SetActive(true) + end + this.timeTxt.gameObject:SetActive(false) + end + end elseif state==1 then - --this.itemList[go][i].red:SetActive(true) + this.itemList[go][i].red:SetActive(true) elseif state==2 then this.itemList[go][i].get:SetActive(true) elseif state==3 then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 8727ed6891..91286da73e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -413,7 +413,8 @@ local jumpDic = { UIManager.OpenPanel(UIName.SettingPanel,data[1]) end, [JumpType.LuckyTurn] = function(data)--幸运探宝 - UIManager.OpenPanel(UIName.LuckyTurnTablePanel,data[1]) + --UIManager.OpenPanel(UIName.LuckyTurnTablePanel,data[1]) + UIManager.OpenPanel(UIName.ActivityMainPanel,40,5) end, [JumpType.TopMatch] = function(data)--巅峰赛 UIManager.OpenPanel(UIName.ArenaTopMatchPanel,data[1]) @@ -786,6 +787,12 @@ local jumpDic = { [JumpType.likeability] = function() UIManager.OpenPanel(UIName.LikeAbilityPanel) end, + [JumpType.Song10Wan] = function() + UIManager.OpenPanel(UIName.GMSong10WanPanel) + end, + [JumpType.SongWuXian] = function() + UIManager.OpenPanel(UIName.OpenSeverWelfarePanel) + end, [JumpType.xiaoyaoyou] = function() XiaoYaoManager.OpenMapList() end,