zhangjiannan 2025-06-09 13:58:48 +08:00
parent 3f36d19958
commit 3cd9098e0c
11 changed files with 45 additions and 21 deletions

View File

@ -149,7 +149,7 @@ function this.SingleDataShow(go, rewardData)
NetManager.GetActivityRewardRequest(rewardData.missionId, activityData.activityId, function(drop)
--ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.OpenSeverWelfare,rewardData.missionId, function(msg)
--获得英雄表现
LogError("领取奖励:"..tostring(rewardData.missionId))
LogError("领取奖励:"..tostring(activityData.activityId).."/"..tostring(rewardData.missionId))
if drop.Hero ~= nil and #drop.Hero > 0 then
local itemDataList = {}
local itemDataStarList = {}
@ -173,7 +173,7 @@ function this.SingleDataShow(go, rewardData)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function()
this.OnShowPanelData()
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint)
if rewardData.missionId == 10004 and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if rewardData.missionId == 10003 and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({ type = SDKSubMitType.TYPE_PINGJIA })
end
end)
@ -182,7 +182,7 @@ function this.SingleDataShow(go, rewardData)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function()
this.OnShowPanelData()
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint)
if rewardData.missionId == 10004 and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if rewardData.missionId == 10003 and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({ type = SDKSubMitType.TYPE_PINGJIA })
end
end)
@ -191,7 +191,7 @@ function this.SingleDataShow(go, rewardData)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function()
this.OnShowPanelData()
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint)
if rewardData.missionId == 10004 and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if rewardData.missionId == 10003 and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({ type = SDKSubMitType.TYPE_PINGJIA })
end
end)

View File

@ -99,6 +99,7 @@ function AdjutantChallengePanel:SetTime()
-- v.com.gameObject:SetActive(true)
if v and v.data.type == 1 then
if five_timeDown >= 3600 then
--LogError("dddddddddddddd"..tostring(five_timeDown))
v.time.text = GetLanguageStrById(10561) .. TimeToHMS(five_timeDown)
else
v.time.text = GetLanguageStrById(10561) .. TimeToMS(five_timeDown)

View File

@ -173,7 +173,7 @@ function this:SetSingleReward(item, i)
this:SetAllReward()
Game.GlobalEvent:DispatchEvent(GameEvent.EightDay.GetRewardSuccess)
CheckRedPointStatus(RedPointType.EightTheLogin)
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({type = SDKSubMitType.TYPE_PINGJIA})
end
end)
@ -184,7 +184,7 @@ function this:SetSingleReward(item, i)
this:SetAllReward()
Game.GlobalEvent:DispatchEvent(GameEvent.EightDay.GetRewardSuccess)
CheckRedPointStatus(RedPointType.EightTheLogin)
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({type = SDKSubMitType.TYPE_PINGJIA})
end
end)
@ -195,7 +195,7 @@ function this:SetSingleReward(item, i)
this:SetAllReward()
Game.GlobalEvent:DispatchEvent(GameEvent.EightDay.GetRewardSuccess)
CheckRedPointStatus(RedPointType.EightTheLogin)
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward", 0) == 0 then
if (i == 1 or i == 7) and PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
SubmitExtraData({type = SDKSubMitType.TYPE_PINGJIA})
end
end)

View File

@ -318,6 +318,7 @@ function this.SetBaseResourceDetails(msg)
lvTxt.text = "Lv.<size=30>"..resourceData.Level.."</size>"
local finalTime = EnergyBaseManager.ComputingTime(data)
if data.collieCount > 0 or data.snatchCollieCount > 0 then
--LogError("cccccccccccccccccccccccc"..tostring(finalTime))
timeTxt.text = TimeToHMS(finalTime-GetTimeStamp())
if not timeList[i] then
local isJoin = (data.snatchId == PlayerManager.uid) or (curPlayerId == PlayerManager.uid)

View File

@ -289,6 +289,8 @@ function this.ComputingTime(data)
-- LogError(string.format("1/(%s-%s*%s)*(1/%s)=",data.snatchCollieCount, data.collieCount, CC, data.blueSpeed)..coefficient)
-- LogError(string.format("%s*%s=", base, coefficient)..TimeToHMS(finalTime))
end
--LogError("cccccccccccccccccccccccc"..tostring(finalTime))
--LogError("xxxxxxxxxxxxxxxxxxxxxxxxz"..tostring(data.startTime))
return finalTime + data.startTime--this.curTime
end

View File

@ -126,7 +126,14 @@ function this.GetTimeStartToEnd()
return startTime,endtime,info.endTime
end
end
function this.GetSecondTimeStartToEnd()
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if info then
local startTime = info.startTime
local endtime = info.endTime
return startTime,endtime,info.endTime
end
end
---时间格式化接口
function this.GetTimeShow(data)
local year = math.floor(os.date("%Y", data))

View File

@ -126,9 +126,10 @@ function GrowthManualPanel:OnShow()
self:ClosePanel()
return
end
local startTime,endTime,endTimeScale = GrowthManualManager.GetTimeStartToEnd()
local startTime,endTime,endTimeScale = GrowthManualManager.GetSecondTimeStartToEnd()
this.time.text = string.format(" %s-%s",startTime,endTime)
--this.time.text = string.format(" %s-%s",startTime,endTime)
this.time.text = TimeToYMDHMS(startTime).." - "..TimeToYMDHMS(endTime)
this.refresh()
this.HeadFrameView:OnShow()

View File

@ -104,7 +104,7 @@ function this.InitData(guideData)
end
end
if openDic[GuideType.Force] ~= -1 then
if openDic[GuideType.Force] ~= -1 and GuideConfig[openDic[GuideType.Force]] then
local openType = GuideConfig[openDic[GuideType.Force]].OpenType
local openArgs = GuideConfig[openDic[GuideType.Force]].OpenArgs
this.RefreshTriggerListen(openDic[GuideType.Force], openType, openArgs)
@ -219,7 +219,7 @@ function this.ShowGuide(id, ...)
end
Log("执行引导panel" .. id)
--if id == 506 then
--SubmitExtraData({ type = SDKSubMitType.TYPE_TUTORIAL_COMPLETED })
--SubmitExtraData({ type = SDKSubMitType.TYPE_TUTORIAL_COMPLETED })
--end
-- 显示当前引导
UIManager.OpenPanel(UIName.GuidePanel, id, onGuideClose, ...)
@ -303,14 +303,14 @@ function this.RefreshTriggerListen(id, openType, openArgs)
GuidePanel.upArrow.transform.position = roleView.GameObject.transform.position
local enemyView = roleView.RootPanel.GetRoleView(BattleLogic.GetAggro(roleView.role))
GuidePanel.upArrow.transform.up = Vector3.Normalize(enemyView.GameObject.transform.position -
roleView.GameObject.transform.position)
roleView.GameObject.transform.position)
-- Util.GetTransform(GuidePanel.upArrow, "1").localEulerAngles = -GuidePanel.upArrow.transform.localEulerAngles
GuidePanel.upArrow:SetActive(true)
local canGO1 = roleView.GameObject.transform.parent.parent.gameObject:GetComponent("Canvas")
local canGO2 = enemyView.GameObject.transform.parent.gameObject:GetComponent("Canvas")
local canGO3 = Util.GetGameObject(roleView.RootPanel.EnemyPanel, "live_" .. canGO2.name):GetComponent(
"Canvas")
"Canvas")
canGO1.overrideSorting = true
canGO2.overrideSorting = true
canGO3.overrideSorting = true
@ -354,14 +354,14 @@ function this.RefreshTriggerListen(id, openType, openArgs)
GuidePanel.upArrow.transform.position = roleView.GameObject.transform.position
local enemyView = roleView.RootPanel.GetRoleView(BattleLogic.GetAggro(roleView.role))
GuidePanel.upArrow.transform.up = Vector3.Normalize(enemyView.GameObject.transform.position -
roleView.GameObject.transform.position)
roleView.GameObject.transform.position)
-- Util.GetTransform(GuidePanel.upArrow, "1").localEulerAngles = -GuidePanel.upArrow.transform.localEulerAngles
GuidePanel.upArrow:SetActive(true)
local canGO1 = roleView.GameObject.transform.parent.parent.gameObject:GetComponent("Canvas")
local canGO2 = enemyView.GameObject.transform.parent.gameObject:GetComponent("Canvas")
local canGO3 = Util.GetGameObject(roleView.RootPanel.EnemyPanel, "live_" .. canGO2.name):GetComponent(
"Canvas")
"Canvas")
canGO1.overrideSorting = true
canGO2.overrideSorting = true
canGO3.overrideSorting = true
@ -723,6 +723,16 @@ function this.RefreshTriggerListen(id, openType, openArgs)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
elseif openType == 37 then
--进入单抽界面
local trigger
trigger = function(panelType, panel)
if panelType == UIName.TenRecruitPanel then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger)
this.ShowGuide(id)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
end
end
@ -743,7 +753,7 @@ function this.RefreshGuide()
battle = true
else
local config = ConfigManager.GetConfigData(ConfigName.GuideTaskConfig, curGuideTaskData
.missionId)
.missionId)
if config.isGuideShow == 1 then
task = false
else

View File

@ -1103,9 +1103,11 @@ function this.SubmitGameData()
--PlayerPrefs.SetString(tostring(PlayerManager.uid), tostring(PlayerManager.uid))
--SubmitExtraData({ type = SDKSubMitType.TYPE_CREATE_ROLE })
--end
--if tostring(PlayerManager.uid) ~= tostring(PlayerManager.nickName) then
if tostring(PlayerManager.uid) ~= tostring(PlayerManager.nickName) then
SubmitExtraData({ type = SDKSubMitType.TYPE_ENTER_GAME })
--end
else
SubmitExtraData({ type = SDKSubMitType.TYPE_FIRST_ENTER_GAME })
end
end
return LoginPanel

View File

@ -66,7 +66,7 @@ function this.LoginRequest(openId, func)
"" --pt_pid.."#"..pt_gid
data.platform_s = tostring(UnityEngine.Application.platform)
data.area = LoginManager.area
data.server_id = tonumber(LoginManager.ServerId)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.LOGIN_REQUEST, MessageTypeProto_pb.LOGIN_RESPONSE, msg,
function(buffer)

View File

@ -217,7 +217,7 @@ function this.InitLive2dState2(setId, resPath, live2dRoot, effectRoot, isNeedLoa
-- 没有配置数据,直接返回
local setData = dialogueSetData[setId]
-- if not setData then return end
if not setData then return end
this.SetLive2dState2(setData, isNeedLoad, resPath, live2dRoot, effectRoot, dialoguePanel,moveStart,moveEnd,times,isNeedShake,inagefun,scaleAni)
end