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,
}

View File

@ -192,6 +192,7 @@ function PrintWanNum(num)
return tostring(num)
end
end
function PrintWanNum2(num)
if num >= 100000000 then
return string.format(GetLanguageStrById(12100), string.format("%.1f", num / 100000000))
@ -201,6 +202,7 @@ function PrintWanNum2(num)
return tostring(num)
end
end
function PrintWanNum3(num)
if num >= 100000000 then
return string.format(GetLanguageStrById(12100), string.format("%.2f", num / 100000000))
@ -210,15 +212,19 @@ function PrintWanNum3(num)
return tostring(num)
end
end
function PrintWanNum5(num, num2)
if num >= 100000000 then
return string.format(GetLanguageStrById(12100), string.format("%.2f", num / 100000000)) .."/"..string.format(GetLanguageStrById(12100), string.format("%.2f", num2 / 100000000))
return string.format(GetLanguageStrById(12100), string.format("%.2f", num / 100000000)) ..
"/" .. string.format(GetLanguageStrById(12100), string.format("%.2f", num2 / 100000000))
elseif num >= 100000 then
return string.format("%.2f",num / 10000) .. GetLanguageStrById(10042).."/"..string.format("%.2f", num2 / 10000) .. GetLanguageStrById(10042)
return string.format("%.2f", num / 10000) ..
GetLanguageStrById(10042) .. "/" .. string.format("%.2f", num2 / 10000) .. GetLanguageStrById(10042)
else
return tostring(num) .. "/" .. tostring(num2)
end
end
function PrintWanNum4(num)
if num >= 10000 then
return tostring(math.floor(num / 10000)) .. GetLanguageStrById(10042)
@ -283,10 +289,12 @@ function Util_Check_insameweek(time1, time2)
end
return false
end
--秒转换成文字对应时间
function GetTimeStrBySeconds(_seconds)
return os.date(GetLanguageStrById(10779), _seconds)
end
--秒转换成文字对应时间 只有分秒
function GetTimeMaoHaoStrBySeconds(_seconds)
return os.date("%M:%S", _seconds)
@ -324,7 +332,8 @@ function PrintTable(root)
elseif type(v) == "table" then
local new_key = name .. "." .. key
cache[v] = new_key
tinsert(temp, "+" .. key .. _dump(v, space .. (next(t, k) and "|" or " ") .. srep(" ", #key), new_key))
tinsert(temp,
"+" .. key .. _dump(v, space .. (next(t, k) and "|" or " ") .. srep(" ", #key), new_key))
else
tinsert(temp, "+" .. key .. " [" .. tostring(v) .. "]")
end
@ -385,6 +394,7 @@ end
function Map_UV2Pos(u, v)
return u * 256 + v
end
--地图uv坐标
function Map_Pos2UV(pos)
return math.floor(pos / 256), pos % 256
@ -397,6 +407,7 @@ function GuildMap_UV2Pos(u, v)
local _v = math.floor(v * 100)
return _u * 25600 + _v
end
function GuildMap_Pos2UV(pos)
-- return math.floor(pos / 256), pos % 256
local _u = math.floor(pos / 25600) / 100
@ -454,6 +465,7 @@ function SetCardStars(starGrid, star)
starGrid.transform:GetChild(star).gameObject:SetActive(true)
end
end
-- 在给定节点下加载预设, 返回实例化的预设
function newObjToParent(prefab, parent)
local go = newObject(prefab)
@ -611,7 +623,6 @@ end
-- 将秒转换成分:秒格式返回
function SetTimeFormation(seconds)
local str = ""
local ten_minute = math.modf(seconds / 600)
local minute = math.modf(seconds / 60) % 10
@ -664,7 +675,6 @@ function Dump(data, showMetatable, lastCount)
for i = 1, lastCount or 0 do
B0 = B0 .. " "
end
end
--Format
if not lastCount then
@ -996,6 +1006,7 @@ function GetHeroCardQuantityWaiImageByquality(quality)
return "r_hero_huangkuang"
end
end
-- --通过Hero或异妖稀有度读取资质框
-- function GetQuantityImage(quality)
-- local sprite
@ -1240,7 +1251,6 @@ function GetAreaNameIconByAreaNumer(index)
elseif index == 8 then
return "r_guaji_wanshenghuanghun"
end
end
--根据英雄品质获取抽卡英雄颜色
@ -1294,6 +1304,7 @@ function GetLeftTimeStrByDeltaTime(deltaTime)
end
return math.floor(deltaTime) .. GetLanguageStrById(10364)
end
function GetLeftTimeStrByDeltaTime2(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
@ -1307,6 +1318,7 @@ function GetLeftTimeStrByDeltaTime2(second)
end
return " " .. minute .. " " .. GetLanguageStrById(12117) .. " " .. sec .. GetLanguageStrById(10364)
end
--- 获取经历的时间字符串
--- 刚刚N分钟前N小时前N天前
function GetDeltaTimeStrByDeltaTime(deltaTime)
@ -1321,11 +1333,13 @@ function GetDeltaTimeStrByDeltaTime(deltaTime)
end
return GetLanguageStrById(10824)
end
function GetDeltaTimeStr(timestamp)
local curTimeStemp = GetTimeStamp()
local deltaTime = curTimeStemp - timestamp
return GetDeltaTimeStrByDeltaTime(deltaTime)
end
--- 计算公式 a*x^3 + b*x^2 + c*x +d
--- 1、 CalculateCostCount(x, a, b, c, d)
--- 2、 CalculateCostCount(x, array)
@ -1400,7 +1414,6 @@ function TimeToFelaxible(second)--大于一天用多少天多少小时,小于
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format(GetLanguageStrById(12278), day, hour)
end
end
--- 将一段时间转换为天时分秒
@ -1438,6 +1451,7 @@ function TimeToH(second)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format(GetLanguageStrById(11751), hour)
end
--- 将一段时间转换为时分秒
function TimeToHMS(t)
if not t or t < 0 then
@ -1449,10 +1463,11 @@ function TimeToHMS(t)
local _hour = math.floor(allMin / 60)
return string.format("%02d:%02d:%02d", _hour, _min, _sec), _hour, _min, _sec
end
--- 将一段时间转换为时分秒,分开返回
function TimeToH_M_S(t)
if not t or t < 0 then
return "00:00:00"
return 0, 0, "00:00:00"
end
local _sec = t % 60
local allMin = math.floor(t / 60)
@ -1493,7 +1508,8 @@ end
-- 将一段时间转换为月日
function TimeToMD(t)
if GetChannelConfig().ListID == "Android_Funtap" or GetChannelConfig().ListID == "iOS_Funtap" then
return os.date(" "..GetLanguageStrById(12303).." ".."%d".." "..GetLanguageStrById(12360).." ".."%m", t)
return os.date(" " .. GetLanguageStrById(12303) .. " " .. "%d" .. " " .. GetLanguageStrById(12360) .. " " .. "%m",
t)
end
return os.date("%m" .. GetLanguageStrById(12360) .. "%d" .. GetLanguageStrById(12303), t)
end
@ -1604,6 +1620,7 @@ function GetPropertyFormatStr(type, value)
end
end
end
--统用属性展示
function GetPropertyFormatStrOne(type, value)
if type == 1 then
@ -1616,6 +1633,7 @@ function GetPropertyFormatStrOne(type, value)
end
end
end
--装备专属属性展示
function GetEquipPropertyFormatStr(type, value)
if type == 1 then
@ -1628,6 +1646,7 @@ function GetEquipPropertyFormatStr(type, value)
end
end
end
-- 将秒转换成显示使用的时间
function FormatSecond(second)
local day = math.floor(second / (24 * 3600))
@ -1647,6 +1666,7 @@ function TimeStampToDateStr(timestamp)
end
return string.format(GetLanguageStrById(12119), date.year, date.month, date.day, date.hour, date.min)
end
-- 将时间戳转换为用于显示的日期字符串(时分秒)
function TimeStampToDateStr3(second)
local minute = math.floor(second / 60) % 60
@ -1786,7 +1806,6 @@ function SetObjPosByUV(pos)
v2.x = v2.x - (Screen.width - UIManager.width) / 2
v2.y = v2.y - (Screen.height - UIManager.height) / 2
return v2
end
--获取技能描述 notColor不加颜色
@ -1894,8 +1913,8 @@ function GetMailConfigDesc(cfg, mailparam)--cfg插入内容mailparam插入数
-- string.format(GetLanguageStrById(cfg), mailparam)
end
return GetLanguageStrById(cfg)
end
-- 设置排名所需要的数字框
function SetRankNumFrame(rankNum)
local rankNumRes = {
@ -1928,7 +1947,8 @@ function ResetItemView(root,rewardRoot,itemList,max,scale,sortingOrder,type,...)
else
for i = 1, #data1 do
if itemList[root][i] then
itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2]},scale,false,false,false,sortingOrder)
itemList[root][i]:OnOpen(false, { data1[i][1], data1[i][2] }, scale, false, false, false,
sortingOrder)
itemList[root][i]:Reset({ data1[i][1], data1[i][2] }, ItemType.Hero, { false, true, true, true })
itemList[root][i].gameObject:SetActive(true)
end
@ -1996,6 +2016,7 @@ function SubString2(inputstr,num)
end
return str
end
--> 连接live
function ConnectTankName(fabName, isDown)
local strNameConnect = "up"
@ -2256,7 +2277,8 @@ function LoadHerolive(_heroConfig, _objPoint, isStatic)
--动态加载立绘
local liveName = artResourcesConfig[_heroConfig.RoleImage].Name
if liveName == "lihui_baiqi" then liveName = "lihui_baiqi_01" end
local testLive = poolManager:LoadLive(liveName, _objPoint.transform, Vector3.one * _heroConfig.Scale, Vector3.New(_heroConfig.Position[1], _heroConfig.Position[2], 0))
local testLive = poolManager:LoadLive(liveName, _objPoint.transform, Vector3.one * _heroConfig.Scale,
Vector3.New(_heroConfig.Position[1], _heroConfig.Position[2], 0))
local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
return testLive
else
@ -2271,6 +2293,7 @@ function LoadHerolive(_heroConfig, _objPoint, isStatic)
return roleStaticImg
end
end
--卸载立绘
function UnLoadHerolive(_heroConfig, _obj)
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)

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)
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

@ -109,17 +109,18 @@ function this.InitMsg(msg)
--注释掉特效转盘,因为协议报错 2024/7/16
--PrivilegeTurnManager.SetPrivilrgeTurnData()
end
end
-- 根据活动类型获取当前活动表数据
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)
@ -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
--活动结束倒计时
@ -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
@ -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
@ -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
@ -483,9 +482,12 @@ function this.DemonNeedVipLv(index,srtType)
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 --等级判断
@ -501,7 +503,6 @@ function this.TipText(index)
return tip
end
-- 恶心的副本的单独提示
function this.CarbonOpenTip()
local minFight = 99999

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>