Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei

Branch_DNA
PC-202302260912\Administrator 2025-05-15 16:43:43 +08:00
commit 2613999882
20 changed files with 5544 additions and 4830 deletions

View File

@ -23,11 +23,14 @@ namespace SDK
currentActivity.Call("Init");
}
public override void Community()
{
currentActivity.Call("Community");
}
public override void Login()
{
currentActivity.Call("Login");
}
//登出
public override void Logout()
{

View File

@ -45,7 +45,7 @@ namespace SDK
iOS_Ky_Quick,
iOS_Ky_Quick_aq,
iOS_Ky_Quick_btgo,
QKZB01,
F5,
iOS_QUICK_027,
}

File diff suppressed because it is too large Load Diff

View File

@ -139,7 +139,7 @@ function PoolManager:LoadAsset(resName, assetType)
table.remove(tempTable.resList,#tempTable.resList)
end
else
LogError("===="..resName)
--LogError("===="..resName)
local _obj = resMgr:LoadAsset(resName)
if _obj == nil then

View File

@ -126,7 +126,11 @@ function ChatPanel:BindEvent()
this.buyCountText:GetComponent("Text").text = "x"..costItem[2]
end
end
this.RefreshShow(true)
--this.RefreshShow(true)
local timer = Timer.New(function()
this.RefreshShow(true)
end, 0.1, false, true)
timer:Start()
this.chatImgView:SetActive(false)
end)
end)

View File

@ -243,9 +243,25 @@ function this.UpdataPanel(medaList)
this.costIcons:SetActive(true)
local cost = this.selectMedal.medalConfig.MergeCostItem
this.costIcon1:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[cost[1][1]].ResourceID))
this.costNum1:GetComponent("Text").text = string.format("%s/%s",BagManager.GetItemCountById(cost[1][1]),cost[1][2])
this.costIcon1:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[cost[1][1]].ResourceID))
if BagManager.GetItemCountById(cost[1][1]) >= cost[1][2] then
this.costNum1:GetComponent("Text").text = string.format("%s/%s", BagManager.GetItemCountById(cost[1][1]),
cost[1][2])
else
this.costNum1:GetComponent("Text").text = string.format("<color=#FF0000FF>%s/%s</color>",
BagManager.GetItemCountById(cost[1][1]), cost[1][2])
end
this.costIcon2:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[cost[2][1]].ResourceID))
this.costNum2:GetComponent("Text").text = string.format("%s/%s",PrintWanNum(BagManager.GetItemCountById(cost[2][1])),cost[2][2] )
if BagManager.GetItemCountById(cost[2][1])>= cost[2][2] then
this.costNum2:GetComponent("Text").text = string.format("%s/%s",
PrintWanNum(BagManager.GetItemCountById(cost[2][1])), cost[2][2])
else
this.costNum2:GetComponent("Text").text = string.format("<color=#FF0000FF>%s/%s</color>",
PrintWanNum(BagManager.GetItemCountById(cost[2][1])), cost[2][2])
end
--this.costNum1:GetComponent("Text").text = string.format("%s/%s",BagManager.GetItemCountById(cost[1][1]),cost[1][2])
--this.costIcon2:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[cost[2][1]].ResourceID))
--this.costNum2:GetComponent("Text").text = string.format("%s/%s",PrintWanNum(BagManager.GetItemCountById(cost[2][1])),cost[2][2] )
Util.AddOnceClick(this.costIcon1, function ()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, cost[1][1])
end)

View File

@ -30,7 +30,7 @@ function this.Initialize()
-- 工坊等级提升
Game.GlobalEvent:AddEvent(GameEvent.WorkShow.WorkShopLvChange, function()
local lv = WorkShopManager.WorkShopData.lv
local lv = WorkShopManager.WorkShopData.lv
this.CheckFuncActiveByType(3, lv)
end)
-- 等级提升
@ -51,7 +51,7 @@ function this.CheckFuncActiveByType(activeType, params)
if funcInfo.OpenRules[1] == activeType then
local typeId = funcInfo.IsIDdSame
local isActive = this.SingleFuncState(typeId)
if not funcData.isActive and isActive then
-- 未解锁,但是判断已解锁
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen, typeId)
@ -67,7 +67,7 @@ end
--判断功能是否解锁
function this.CheckFuncIsActive(isIDdSame)
local isActive = this.SingleFuncState(isIDdSame)
local isActive = this.SingleFuncState(isIDdSame)
return isActive
end
@ -106,20 +106,21 @@ function this.InitMsg(msg)
this.WatchFuncState()
GeneralManager.GetGeneralMode()
if ActTimeCtrlManager.SingleFuncState(203) then
--注释掉特效转盘,因为协议报错 2024/7/16
--注释掉特效转盘,因为协议报错 2024/7/16
--PrivilegeTurnManager.SetPrivilrgeTurnData()
end
end
-- 根据活动类型获取当前活动表数据
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
function this.GetTableDataByTypeId(typeId)
if not ActTypeConfigList[typeId] then
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId)
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame",
typeId)
end
return ActTypeConfigList[typeId]
end
-- 根据活动类型获取当前活动得数据
function this.GetSerDataByTypeId(typeId)
local configList = this.GetTableDataByTypeId(typeId)
@ -151,7 +152,7 @@ function this.FixedUpDate()
end
if this.hasSendMsg then
sendTime = sendTime + 1
sendTime = sendTime + 1
if sendTime >= 5 then
sendTime = 0
this.hasSendMsg = false
@ -165,7 +166,6 @@ function this.WatchFuncState()
for i, v in pairs(this.serData) do
local typeId = AllActSetConfig[i].IsIDdSame
if this.IsQualifiled(typeId) then
local timeType = ""
if this.serTime >= v.startTime and this.serTime < v.endTime then
--活动结束倒计时
@ -183,14 +183,14 @@ function this.WatchFuncState()
timeType = GetLanguageStrById(10771) .. showStr
end
end
this.serData[i].countDown = timeType -- 活动计时文字
this.serData[i].countDown = timeType -- 活动计时文字
this.serData[i].isOpen = this.SingleFuncState(typeId) -- 活动开启状态
-- 活动开启前同步一次状态
if this.serTime == v.startTime + 1 then
if not this.hasSendMsg then
this.hasSendMsg = true
NetManager.GetAllFunState(function ()
NetManager.GetAllFunState(function()
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen, typeId)
end)
end
@ -199,7 +199,7 @@ function this.WatchFuncState()
if this.serTime == v.endTime + 1 then
if not this.hasSendMsg then
this.hasSendMsg = true
NetManager.GetAllFunState(function ()
NetManager.GetAllFunState(function()
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionClose, typeId)
end)
end
@ -215,7 +215,7 @@ function this.FuncTimeJudge(id)
if serData then
local startTime = serData.startTime
local endTime = serData.endTime
if id == 30 then --异端之战时间延时开启
if id == 30 then --异端之战时间延时开启
startTime = serData.startTime + 60
end
if this.serTime >= startTime and this.serTime <= endTime then
@ -237,7 +237,7 @@ function this.GetFuncTip(id)
tip = GetLanguageStrById(10773)
return tip
end
if not qualifiled then
-- 相同活动类型解锁数据相同,所以只用第一个进行判断
local data = this.GetTableDataByTypeId(id)[1]
@ -249,9 +249,9 @@ function this.GetFuncTip(id)
elseif rules[1] == 3 then
tip = string.format(GetLanguageStrById(10776), rules[2])
elseif rules[1] == 4 then
tip = string.format(GetLanguageStrById(50378), rules[2],PrivilegeTypeConfig[rules[3]].Name)
tip = string.format(GetLanguageStrById(50378), rules[2], PrivilegeTypeConfig[rules[3]].Name)
elseif rules[1] == 5 then
tip = string.format(GetLanguageStrById(50379), rules[2],PrivilegeTypeConfig[rules[3]].Name)
tip = string.format(GetLanguageStrById(50379), rules[2], PrivilegeTypeConfig[rules[3]].Name)
end
else
if not isActive then
@ -271,7 +271,6 @@ function this.SingleFuncState(id)
local isOpen = false
local qualifiled = this.IsQualifiled(id)
local isActive = this.FuncTimeJudge(id)
if qualifiled and isActive then
isOpen = true
else
@ -285,9 +284,9 @@ function this.ShowActText(id)
local serData = this.GetSerDataByTypeId(id)
if not serData then return end
-- 如果活动正在进行,返回活动开启结束文字
if this.FuncTimeJudge(id)then
local beginStr = os.date(GetLanguageStrById(10779),this.serData[id].startTime)
local endStr = os.date(GetLanguageStrById(10779),this.serData[id].endTime)
if this.FuncTimeJudge(id) then
local beginStr = os.date(GetLanguageStrById(10779), this.serData[id].startTime)
local endStr = os.date(GetLanguageStrById(10779), this.serData[id].endTime)
return beginStr, endStr
else
return GetLanguageStrById(10780)
@ -313,15 +312,15 @@ function this.IsQualifiled(id)
local qualifiled = false
local playerLv = PlayerManager.level
local openRule = data.OpenRules
if openRule[1] == 1 then -- 关卡开启
if openRule[1] == 1 then -- 关卡开启
qualifiled = FightPointPassManager.IsFightPointPass(openRule[2])
elseif openRule[1] == 2 then-- 等级开启
elseif openRule[1] == 2 then -- 等级开启
qualifiled = playerLv >= openRule[2]
elseif openRule[1] == 3 then-- 工坊等级开启
elseif openRule[1] == 3 then -- 工坊等级开启
qualifiled = WorkShopManager.WorkShopData.lv >= openRule[2]
elseif openRule[1] == 4 then-- 玩家等级特权 或
elseif openRule[1] == 4 then -- 玩家等级特权 或
qualifiled = playerLv >= openRule[2] or PrivilegeManager.GetPrivilegeOpenStatusById(openRule[3])
elseif openRule[1] == 5 then-- 玩家等级特权 与
elseif openRule[1] == 5 then -- 玩家等级特权 与
qualifiled = playerLv >= openRule[2] and PrivilegeManager.GetPrivilegeOpenStatusById(openRule[3])
end
return qualifiled
@ -331,22 +330,22 @@ end
function this.FunctionIsOpen(id)
local state = false
local openRule = AllActSetConfig[id].OpenRules
if openRule[1] == 1 then -- 关卡开启
if openRule[1] == 1 then -- 关卡开启
state = FightPointPassManager.IsFightPointPass(openRule[2])
elseif openRule[1] == 2 then-- 等级开启
elseif openRule[1] == 2 then -- 等级开启
state = PlayerManager.level >= openRule[2]
elseif openRule[1] == 3 then-- 工坊等级开启
elseif openRule[1] == 3 then -- 工坊等级开启
state = WorkShopManager.WorkShopData.lv >= openRule[2]
elseif openRule[1] == 4 then-- 玩家等级特权 或
elseif openRule[1] == 4 then -- 玩家等级特权 或
state = PlayerManager.level >= openRule[2] or PrivilegeManager.GetPrivilegeOpenStatusById(openRule[3])
elseif openRule[1] == 5 then-- 玩家等级特权 与
elseif openRule[1] == 5 then -- 玩家等级特权 与
state = PlayerManager.level >= openRule[2] and PrivilegeManager.GetPrivilegeOpenStatusById(openRule[3])
end
return state
end
--传入需要锁上的功能, state 为true需要置灰
function this.SetFuncLockState(obj, id, state,isWorkShop)
function this.SetFuncLockState(obj, id, state, isWorkShop)
local isOpen = this.SingleFuncState(id)
if isWorkShop == true then
if not isOpen then
@ -354,7 +353,8 @@ function this.SetFuncLockState(obj, id, state,isWorkShop)
Util.GetGameObject(obj.transform, "maskImage"):SetActive(true)
local data = this.GetTableDataByTypeId(id)[1]
local rules = data.OpenRules
Util.GetGameObject(obj.transform, "maskImage/unLockText"):GetComponent("Text").text=string.format(GetLanguageStrById(10776), rules[2])
Util.GetGameObject(obj.transform, "maskImage/unLockText"):GetComponent("Text").text = string.format(
GetLanguageStrById(10776), rules[2])
else
obj:SetActive(false)
end
@ -405,9 +405,9 @@ function this.UnLockCondition(index)
local formatData = gameSetConfig[1].HeroLocation
local judgeType = formatData[index][1]
local value = formatData[index][2]
if judgeType == 1 then -- 关卡判断
if judgeType == 1 then -- 关卡判断
tip = GetLanguageStrById(10356) .. censorshipConfig[value].Name
elseif judgeType == 2 then-- 等级判断
elseif judgeType == 2 then -- 等级判断
tip = GetLanguageStrById(10782) .. tostring(value) .. GetLanguageStrById(10072)
end
return tip
@ -424,7 +424,7 @@ function this.NextArmCondition()
local judgeType = formatData[nextIndex][1]
local value = formatData[nextIndex][2]
local nextTip = GetLanguageStrById(10783)
if judgeType == 1 then -- 关卡判断
if judgeType == 1 then -- 关卡判断
nextTip = GetLanguageStrById(10356) .. censorshipConfig[value].Name .. GetLanguageStrById(10784)
elseif judgeType == 2 then -- 等级判断
nextTip = GetLanguageStrById(10782) .. tostring(value) .. GetLanguageStrById(10785)
@ -438,8 +438,8 @@ function this.GetActLeftTime(typeId)
local serData = this.GetSerDataByTypeId(typeId)
if not typeId or not serData then return -1 end
-- 判断时间戳
local curTimeStamp = GetTimeStamp()---毫秒
if curTimeStamp < serData.startTime then --- 时间未到
local curTimeStamp = GetTimeStamp() ---毫秒
if curTimeStamp < serData.startTime then --- 时间未到
return -1
end
-- 计算剩余时间
@ -447,7 +447,6 @@ function this.GetActLeftTime(typeId)
return leftTime
end
function this.GetActOpenTime(id)
local serData = this.GetSerDataByTypeId(id)
if not serData then return end
@ -460,13 +459,13 @@ end
-- 最大上阵异妖数量
function this.MaxDemonNum()
local maxNum = 0
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting,1).DifferLocation
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1).DifferLocation
for i = 1, #gameSettingConFig do
if gameSettingConFig[i][1] == 1 then--关卡判断
if gameSettingConFig[i][1] == 1 then --关卡判断
if FightPointPassManager.IsFightPointPass(gameSettingConFig[i][2]) then
maxNum = maxNum + 1
end
elseif gameSettingConFig[i][1] == 2 then--等级判断
elseif gameSettingConFig[i][1] == 2 then --等级判断
if PlayerManager.level >= gameSettingConFig[i][2] then
maxNum = maxNum + 1
end
@ -476,20 +475,23 @@ function this.MaxDemonNum()
end
-- 开启下一个位置需要的VIP等级, 只有未解锁的才有用
function this.DemonNeedVipLv(index,srtType)
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting,1).DifferLocation
function this.DemonNeedVipLv(index, srtType)
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1).DifferLocation
for i = 1, #gameSettingConFig do
if i == index then
if gameSettingConFig[i][1] == 1 then--关卡判断
if gameSettingConFig[i][1] == 1 then --关卡判断
local str = ""
if srtType == 1 then
str = GetLanguageStrById(10356)..string.gsub(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,gameSettingConFig[i][2]).Name,"-","|")
str = GetLanguageStrById(10356) ..
string.gsub(ConfigManager.GetConfigData(ConfigName.MainLevelConfig, gameSettingConFig[i][2]).Name,
"-", "|")
else
str = GetLanguageStrById(10356)..ConfigManager.GetConfigData(ConfigName.MainLevelConfig,gameSettingConFig[i][2]).Name
str = GetLanguageStrById(10356) ..
ConfigManager.GetConfigData(ConfigName.MainLevelConfig, gameSettingConFig[i][2]).Name
end
return str
elseif gameSettingConFig[i][1] == 2 then--等级判断
return GetLanguageStrById(10786)..gameSettingConFig[i][2]
elseif gameSettingConFig[i][1] == 2 then --等级判断
return GetLanguageStrById(10786) .. gameSettingConFig[i][2]
end
end
end
@ -497,11 +499,10 @@ end
-- 异妖上阵数量提示内容
function this.TipText(index)
local tip = this.DemonNeedVipLv(index,2) .. GetLanguageStrById(10787)
local tip = this.DemonNeedVipLv(index, 2) .. GetLanguageStrById(10787)
return tip
end
-- 恶心的副本的单独提示
function this.CarbonOpenTip()
local minFight = 99999
@ -539,11 +540,11 @@ end
function this.SystemOpenTip(type)
local str = ""
if AllActSetConfig[type].OpenRules[1] == 1 then
str = string.format(GetLanguageStrById(10791),censorshipConfig[AllActSetConfig[type].OpenRules[2]].Name)
str = string.format(GetLanguageStrById(10791), censorshipConfig[AllActSetConfig[type].OpenRules[2]].Name)
elseif AllActSetConfig[type].OpenRules[1] == 2 then
str = string.format(GetLanguageStrById(10792),AllActSetConfig[type].OpenRules[2])
str = string.format(GetLanguageStrById(10792), AllActSetConfig[type].OpenRules[2])
end
return str
end
return this
return this

View File

@ -26,6 +26,7 @@ local WarWaySkillUpgradeCost = ConfigManager.GetAllConfigsDataByKey(ConfigName.W
local SpecialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
local heroDatas = {}
this.backupLimit = 0
this.heroSortedDatas = {}--排序后的英雄数据
this.heroDataLists = {}
this.heroLvEnd = {}

View File

@ -43,8 +43,8 @@ function this.Initialize()
ActivityGiftManager.phoneBuildingRewardIsGet = contents[2]
end
end
elseif PlayerPrefs.GetInt("CommentReward", 0) == 0 then
PlayerPrefs.SetInt("CommentReward", 1)
elseif PlayerPrefs.GetInt("CommentReward"..PlayerManager.uid, 0) == 0 then
PlayerPrefs.SetInt("CommentReward"..PlayerManager.uid, 1)
NetManager.GetGoogleCommentReward()
MsgPanel.ShowOne(msg)
end

View File

@ -1097,20 +1097,15 @@ function this.SubmitGameData()
area_id = 0,
last_login_time = System.DateTime.Now:ToString("yyyy/mm/dd HH:mm:ss.fff")
})
LogError("=============uid:" .. PlayerManager.uid)
LogError("=============uname:" .. PlayerManager.nickName)
CustomEventManager.GameCustomEvent("进入服务器")
--local isNewRole = PlayerPrefs.GetString(tostring(PlayerManager.uid), "")
--if PlayerManager.uid == PlayerManager.nickName then
--PlayerPrefs.SetString(tostring(PlayerManager.uid), tostring(PlayerManager.uid))
--SubmitExtraData({ type = SDKSubMitType.TYPE_CREATE_ROLE })
--end
if tostring(PlayerManager.uid) == tostring(PlayerManager.nickName) then
LogError("cccccccccccccccccccccc==uname:" .. PlayerManager.nickName)
else
LogError("=============uname:" .. PlayerManager.nickName)
--if tostring(PlayerManager.uid) ~= tostring(PlayerManager.nickName) then
SubmitExtraData({ type = SDKSubMitType.TYPE_ENTER_GAME })
end
--end
end
return LoginPanel

File diff suppressed because it is too large Load Diff

View File

@ -61,7 +61,7 @@ function HighMonthCardPage:RefreshStoneShow()
self.activation:SetActive(true)
self.time.text = ""
if GetChannelConfig().RechargeNum_Mode == 1 then
self.progress.text = GetLanguageStrById(50423)..OperatingManager.GetsmonthSaveAmt() .."/"..MoneyUtil.GetMoney(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price[2])
self.progress.text = GetLanguageStrById(50423)..MoneyUtil.GetMoney(OperatingManager.GetsmonthSaveAmt()) .."/"..MoneyUtil.GetMoney(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price[2])
else
self.progress.text = GetLanguageStrById(12564)..OperatingManager.GetsmonthSaveAmt()*10 .."/"..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price[2]*10
end

View File

@ -254,7 +254,6 @@ function RewardItemPopup:OnOpen(...)
this.nextStageTime.text = PrivilegeManager.GetPrivilegeOpenTip(PRIVILEGE_TYPE.AutoNextFight)
end
else
LogError("ddddddddddddddddddddddddddddd")
this.automatic:SetActive(false)
end
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY or fightType == BATTLE_TYPE.DEATH_POS then

View File

@ -41,10 +41,10 @@ function this:OnShow(_parent,...)
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local args = {...}
func = args[2]
local onlyDiamond = args[3]
this.titleText.text = GetLanguageStrById(11351)
local go = Util.GetGameObject(this.btn,"Go")
local var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"
local config = LotterySetting[args[1]]
if args[1] == RecruitType.Single then
var = var..RecruitType.Ten
@ -101,7 +101,7 @@ function this:OnShow(_parent,...)
-- local type = ActivityGiftManager.GetActivityTypeFromId(config.ActivityId)
if config.PerCount == 10 then
local count = BagManager.GetItemCountById(config.CostItem[1][1])
if count > 0 then
if count > 0 and onlyDiamond == nil then
this.btn:SetActive(false)
local singleCost = config.CostItem[2][2]/config.PerCount
local deficiencyCount = config.PerCount-count

View File

@ -54,6 +54,7 @@ function this:BindEvent()
MapTrialManager.UpdatePowerValue(msg.essenceValue)
MapTrialManager.SetKillCount(msg.trialKillCount)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, msg.cell.cellId, msg.cell.pointId)
Game.GlobalEvent:DispatchEvent(GameEvent.YiDuan.AutoGetBaoXiang)
end)
MapTrialManager.isHaveBoss = true
end)

View File

@ -363,6 +363,16 @@ function this.RefreshOtherPanelShow(index)
elseif index == 3 then
this.ShowQAPanel()
end
local timer = Timer.New(function()
if index == 2 then
this.ShowResPanel()
elseif index == 1 then
this.ShowRmdPanel()
elseif index == 3 then
this.ShowQAPanel()
end
end, 0.1, false, true)
timer:Start()
end
-- 显示资源获取方式界面
@ -452,7 +462,10 @@ function this.ShowResPanel(index)
this.ShowResPanel(dataIndex)
end)
end)
local timer = Timer.New(function()
this.ShowResPanel()
end, 0.1, false, true)
timer:Start()
-- 判断是否跳转
if index then
this.ResScrollView:SetIndex(index)
@ -518,7 +531,10 @@ function this.ShowRmdPanel(index)
this.ShowRmdPanel(dataIndex)
end)
end)
local timer = Timer.New(function()
this.ShowRmdPanel()
end, 0.1, false, true)
timer:Start()
-- 判断是否跳转
if index then
this.RmdScrollView:SetIndex(index)
@ -570,6 +586,10 @@ function this.ShowQAPanel(index)
this.ShowQAPanel(dataIndex)
end)
end)
local timer = Timer.New(function()
this.ShowQAPanel()
end, 0.1, false, true)
timer:Start()
-- 判断是否跳转
if index then
this.QAScrollView:SetIndex(index)

View File

@ -70,6 +70,7 @@ function this:BindEvent()
PopupTipPanel.ShowTip(string.format(GetLanguageStrById(22702), pernum))
end
this.Limit = msg.backpackLimitCount
HeroManager.backupLimit = msg.backpackLimitCount
this.heroNumText.text = "<size=36><color=#45D675><B>"..#tarHero .."</B></color></size>/"..msg.backpackLimitCount
this.Buytime = msg.hasBuyCount
end)
@ -124,6 +125,7 @@ end
function this:OnShow()
NetManager.BackpackLimitRequest(function(msg)
this.Limit = msg.backpackLimitCount
HeroManager.backupLimit = msg.backpackLimitCount
this.Buytime = msg.hasBuyCount
this.heroNumText.text = "<size=36><color=#45D675><B>"..#tarHero .. "</B></color></size>/" .. this.Limit
end)
@ -275,6 +277,11 @@ function this:SortHeroDatas(_heroDatas)
if a.lv == b.lv then
if a.heroConfig.Quality == b.heroConfig.Quality then--Natural
if a.star == b.star then
if a.heroConfig.HeroValue ~= 1 and b.heroConfig.HeroValue == 1 then
return false
elseif a.heroConfig.HeroValue == 1 and b.heroConfig.HeroValue ~= 1 then
return true
end
if a.warPower == b.warPower then
if a.heroConfig.Natural == b.heroConfig.Natural then--Natural
return a.heroConfig.Id < b.heroConfig.Id
@ -297,6 +304,11 @@ function this:SortHeroDatas(_heroDatas)
if a.heroConfig.Quality == b.heroConfig.Quality then--Natural
if a.star == b.star then
if a.lv == b.lv then
if a.heroConfig.HeroValue ~= 1 and b.heroConfig.HeroValue == 1 then
return false
elseif a.heroConfig.HeroValue == 1 and b.heroConfig.HeroValue ~= 1 then
return true
end
if a.warPower == b.warPower then
if a.heroConfig.Natural == b.heroConfig.Natural then--Natural
return a.heroConfig.Id < b.heroConfig.Id

View File

@ -399,9 +399,20 @@ function this.HeroSortData(heroData)
return a.heroConfig.Star < b.heroConfig.Star
end
else
if a.heroConfig.HeroValue ~= 1 and b.heroConfig.HeroValue == 1 then
return true
elseif a.heroConfig.HeroValue == 1 and b.heroConfig.HeroValue ~= 1 then
return false
end
if a.heroConfig.Star == b.heroConfig.Star then
if a.lv == b.lv then
if a.id ~= curHeroData.id and b.id ~= curHeroData.id or a.id == curHeroData.id and b.id == curHeroData.id then
if a.id ~= curHeroData.id and b.id ~= curHeroData.id then
if a.heroConfig.MaxRank ~= a.heroConfig.MaxRank then
return a.MaxRank < b.MaxRank
else
return a.id > b.id
end
elseif a.id == curHeroData.id and b.id == curHeroData.id then
return a.id > b.id
else
return not a.id ~= curHeroData.id and b.id == curHeroData.id

View File

@ -379,15 +379,19 @@ function SelfRecruit:RefreshGetHeroTimes()
end
CheckRedPointStatus(RedPointType.SelfRecruitPage)
end)
-- RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
-- if isJump then
-- local heros = RecruitManager.RandomHerosSort(msg.drop.Hero)--随机排序
-- UIManager.OpenPanel(UIName.TenRecruitPanel,heros,tenRecruit.Id,isJump)
-- else
-- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10)
-- end
-- CheckRedPointStatus(RedPointType.SelfRecruitPage)
-- end)
--[[
RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
if isJump then
local heros = RecruitManager.RandomHerosSort(msg.drop.Hero)--随机排序
UIManager.OpenPanel(UIName.TenRecruitPanel,heros,tenRecruit.Id,isJump)
else
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10)
end
CheckRedPointStatus(RedPointType.SelfRecruitPage)
end)
]]
end
-- if d[1] == 16 and BagManager.GetItemCountById(v1) > 0 then
-- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Recruit,tenRecruit.Id,recruitTen)
@ -397,7 +401,7 @@ function SelfRecruit:RefreshGetHeroTimes()
-- recruitTen()
-- end
if state_10 == 0 and d[1] == 16 then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Recruit,tenRecruit.Id,recruitTen)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Recruit,tenRecruit.Id,recruitTen,true)
else
recruitTen()
end

View File

@ -139,8 +139,8 @@ namespace GameEditor.FrameTool
/// <summary>
/// 奇葩时空测试服
/// </summary>
[ServerPathTypeValue("http://152.136.162.165:8080/sk_loginserver/", "https://skzc-1301100976.cos.ap-guangzhou.myqcloud.com/channel-1/", "http://152.136.162.165:8082/err", "http://152.136.162.165:8081/idip/sfzb/sdk", "http://152.136.162.165:8081/idip/sfzb", "dev")]
,
[ServerPathTypeValue("http://156.229.21.93:8080/sk_loginserver/", "https://ms-cdn.r2games.com/", "http://156.229.21.93:8082/err", "http://156.229.21.93:8081/idip/sfzb/sdk", "http://156.229.21.93:8081/idip/sfzb", "F5")]
,
/// <summary>
/// BT奇葩正式服
/// </summary>