From 96ab48c22f9bd2b32bc0dcea92f0459a01e54814 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 23 Sep 2020 15:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=B4=E9=80=89=20=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=20=E4=B8=89=E5=91=A8=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20=E5=AF=BB=E5=AE=9D=E8=BE=BE=E4=BA=BA=20=20=E5=9B=9B?= =?UTF-8?q?=E5=91=A8=20=E5=A4=A9=E5=AE=AB=E8=BE=BE=E4=BA=BA2=20=20?= =?UTF-8?q?=E6=9C=89=E4=B8=AD=E6=96=87=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../ManagedResources/~Lua/Common/Language.lua | 2 + .../ActivityGift/ActivityGiftManager.lua | 3 +- .../ActivityGift/AllActivityManager.lua | 891 ++++++++++++++++++ .../~Lua/Modules/Expert/Expert.lua | 2 +- .../~Lua/Modules/Expert/ExpertPanel.lua | 1 - .../~Lua/Modules/Player/RedpotManager.lua | 3 +- .../Ranking/RankingSingleListPanel.lua | 4 +- .../ExcelTool/DataConfigMD5Record.asset | 612 ++++++------ data_execl/Language_data/LanguageLua.csv | 2 + 10 files changed, 1209 insertions(+), 313 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 531ce78bb6..ac4c09fcdb 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1013,7 +1013,7 @@ ActivityTypeDef = { GoldExper = 20,--点金达人 FightExper = 21,--副本达人 EnergyExper = 22,--体力达人 - ExpeditionExper = 23,--天宫达人 + ExpeditionExper = 26,--天宫达人 AccumulativeRechargeExper = 24,--限时累计充值 PatFace = 29,--神兵天降 LuckyTurnTable_One=30,--幸运探宝 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index a204bbc003..8cb63b807d 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2390,4 +2390,6 @@ [12389] = "包含4星或更高星级的神将", [12390] = "挑战关卡快速升级", [12391] = "抢夺成功,获得%s积分!", + [12392] = "次数:", + [12393] = "积分:", } diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 691bd3266a..e1e673a92e 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -546,6 +546,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.Expert_FindTreasure) CheckRedPointStatus(RedPointType.Expert_Recruit) CheckRedPointStatus(RedPointType.Expert_SecretBox) + CheckRedPointStatus(RedPointType.Expert_Expedition) --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) --东海寻仙 @@ -606,7 +607,7 @@ function this.ExpterActivityIsShowRedPoint(activeIndex) if expertRewardTabs.mission[i].state == 0 then if activeType == ActivityTypeDef.UpStarExper or activeType == ActivityTypeDef.Talisman or activeType == ActivityTypeDef.SoulPrint or activeType == ActivityTypeDef.EquipExper - or activeType == ActivityTypeDef.FindTreasureExper then + or activeType == ActivityTypeDef.FindTreasureExper or activeType == ActivityTypeDef.ExpeditionExper then --进阶因为每个都不一样 特殊判断 if expertRewardTabs.mission[i].progress >= value then --Log("expertRewardTabs.mission[i].progress " .. expertRewardTabs.mission[i].progress) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua new file mode 100644 index 0000000000..98bee66d8e --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -0,0 +1,891 @@ +AllActivityManager = {}; +local this = AllActivityManager +local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) +local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity) +local giftData = {} +function this.Initialize() +end + +-- 获取服务器活动领取进度数据 +function this.InitActivityServerData(msg, isUpdate) + if not isUpdate then + this.mission = {} + end + for i, v in ipairs(msg.activityInfo) do + + this.CheckMoneyProgress(v) + this.mission[v.activityId] = v + LogRed("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + end +end + +function this.RefreshActivityData(respond) + --closed + if respond.closeActivityId then + for i = 1, #respond.closeActivityId do + if this.mission[respond.closeActivityId[i]] then + LogRed(Language[10003] .. respond.closeActivityId[i]) + this.mission[respond.closeActivityId[i]] = nil + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { + type = activityType, + status = 0 --关闭 + }) + end + end + end + --newOpen + if respond.activityInfo then + for i = 1, #respond.activityInfo do + LogRed(Language[10004] .. respond.activityInfo[i].activityId) + this.mission[respond.activityInfo[i].activityId] = respond.activityInfo[i] + local activityType = this.GetActivityTypeFromId(respond.activityInfo[i].activityId) + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { + type = this.GetActivityTypeFromId(respond.activityInfo[i].activityId), + status = 1 --开启 + }) + end + end + this.InitActivityServerData(respond, true) + this.RefreshActivityRedPoint() +end + +--刷新某个活动的数据进度 +function this.RefreshActivityProgressData(msg) + -- 检测 + this.CheckMoneyProgress(msg.activityInfo) + LogRed("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) + if this.mission[msg.activityInfo.activityId] then + this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value + for i = 1, #msg.activityInfo.mission do + for _, missionInfo in pairs(this.mission[msg.activityInfo.activityId].mission) do + if missionInfo.missionId == msg.activityInfo.mission[i].missionId then + missionInfo.state = msg.activityInfo.mission[i].state + missionInfo.progress = msg.activityInfo.mission[i].progress + LogRed(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) + end + end + end + this.RefreshActivityRedPoint() + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityProgressStateChange) + --断线重连时 在线奖励活动 数据刷新 + this.CutUpLineUpdateOnLineData(msg) + end +end + + +--断线重连时 在线奖励活动 数据刷新 +function this.CutUpLineUpdateOnLineData(msg) + if (msg.activityInfo.activityId == ActivityTypeDef.OnlineGift) then + for i = 1, #msg.activityInfo.mission do + this.onlineOpen = true + this.onlineGetRewardState[ msg.activityInfo.mission[i].missionId] = msg.activityInfo.mission[i].state + this.haveOnlineTime = msg.activityInfo.mission[i].progress + this.onlineTime= msg.activityInfo.mission[i].progress + this.cuOnLineTimestamp = GetTimeStamp() - msg.activityInfo.mission[i].progress + LogRed("------------------------------------后端刷新在线时长3 "..msg.activityInfo.mission[i].progress.." "..TimeToHMS(msg.activityInfo.mission[i].progress)) + end + end +end + +--五点凌晨刷新 +function this.FiveAMRefreshActivityProgress(msg) + LogRed("5AM刷新活动数据") + for i = 1, #msg.activityInfo do + if not this.mission[msg.activityInfo[i].activityId] then + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { + type = this.GetActivityTypeFromId(msg.activityInfo[i].activityId), + status = 1 --开启 + }) + end + -- 检测活动钱数 + this.CheckMoneyProgress(msg.activityInfo[i]) + this.mission[msg.activityInfo[i].activityId] = msg.activityInfo[i] + LogRed("刷新活动数据activityId:" .. msg.activityInfo[i].activityId .. "value:" .. msg.activityInfo[i].value) + end + this.RefreshActivityRedPoint() +end + +-- 检测进度 +function this.CheckMoneyProgress(v) + if v.activityId == ActivityTypeDef.FirstRecharge + or v.activityId == ActivityTypeDef.LuckyCat + or v.activityId == ActivityTypeDef.DailyRecharge + -- or v.activityId == ActivityTypeDef.ContinuityRecharge + or v.activityId == ActivityTypeDef.AccumulativeRechargeExper + or v.activityId == ActivityTypeDef.DynamicAct_recharge + or v.activityId == ActivityTypeDef.FindFairyCeremony then + + for n, m in ipairs(v.mission) do + m.progress = m.progress / 1000 + end + v.value = v.value / 1000 + end +end + + +function this.RefreshActivityRedPoint() + Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged) + CheckRedPointStatus(RedPointType.FirstRecharge) + CheckRedPointStatus(RedPointType.ContinuityRecharge) + CheckRedPointStatus(RedPointType.SevenDayCarnival) + --限时活动 + CheckRedPointStatus(RedPointType.Expert_AdventureExper) + CheckRedPointStatus(RedPointType.Expert_AreaExper) + CheckRedPointStatus(RedPointType.Expert_UpStarExper) + CheckRedPointStatus(RedPointType.Expert_EquipExper) + CheckRedPointStatus(RedPointType.Expert_GoldExper) + CheckRedPointStatus(RedPointType.Expert_FightExper) + CheckRedPointStatus(RedPointType.Expert_EnergyExper) + CheckRedPointStatus(RedPointType.Expert_Talisman) + CheckRedPointStatus(RedPointType.Expert_SoulPrint) + CheckRedPointStatus(RedPointType.Expert_AccumulativeRecharge) + CheckRedPointStatus(RedPointType.DynamicActRecharge) + CheckRedPointStatus(RedPointType.CourtesyDress_SevenDay) + CheckRedPointStatus(RedPointType.LuckyCat_GetReward) + CheckRedPointStatus(RedPointType.Expert_LuckyTurn) + CheckRedPointStatus(RedPointType.Expert_FindTreasure) + CheckRedPointStatus(RedPointType.Expert_Recruit) + CheckRedPointStatus(RedPointType.Expert_SecretBox) + CheckRedPointStatus(RedPointType.Expert_Expedition) + --战力排行 + CheckRedPointStatus(RedPointType.WarPowerSort_Sort) + --东海寻仙 + CheckRedPointStatus(RedPointType.FindFairy_OneView) + CheckRedPointStatus(RedPointType.FindFairy_ThreeView) + CheckRedPointStatus(RedPointType.FindFairy_FourView) + CheckRedPointStatus(RedPointType.DynamicActTask) + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) +end + + +--通过活动类型获取活动数据 +function this.GetActivityTypeInfo(type) + local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type) + local missionData = nil + table.walk(globalActConfigs, function(actConfigInfo) + if this.mission[actConfigInfo.Id] then + missionData = this.mission[actConfigInfo.Id] + end + end) + return missionData +end + +--通过活动类型获取活动id +function this.GetActivityIdByType(type) + local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type) + local id = 0 + local missionData = nil + table.walk(globalActConfigs, function(actConfigInfo) + if this.mission[actConfigInfo.Id] then + --LogError("actConfigInfo.Id "..actConfigInfo.Id) + id = actConfigInfo.Id + end + end) + return id +end + +function this.GetActivityValueInfo(type, Id) + if this.mission[type] then + -- LogBlue("this.mission[type].value:"..this.mission[type].value) + return this.mission[type].value + end +end +function this.GetActivityInfo(type, Id) + if this.mission[type] then + for _, missInfo in pairs(this.mission[type].mission) do + if missInfo.missionId == Id then + return missInfo + end + end + else + Log(string.format(Language[10001], type, Id)) + return nil,0 + end +end + +function this.GetActivityInfoByType(type) + if this.mission[type] then + return this.mission[type] + end +end +function this.SetActivityInfo(type, Id, state) + for _, missInfo in pairs(this.mission[type].mission) do + if missInfo.missionId == Id then + missInfo.state = state + break + end + end +end + +function this.GetActivityOpenStatus(type) + local id = this.GetActivityIdByType(type) + if this.mission[id] then + return this.mission[id].reallyOpen == 1 + else + Log(string.format(Language[10002], type)) + return false + end +end +function this.SetActivityOpenStatus(type) + if this.mission[type] then + this.mission[type].reallyOpen = 1 + else + Log(string.format(Language[10002], type)) + end +end + + +--获取活动结束时间 +function this.GetTaskEndTime(activityType) + local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType) + local endTime = 0 + if activityInfo then + endTime = activityInfo.endTime + end + return endTime +end + +--获取活动开始时间 +function this.GetTaskStartTime(activityType) + local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType) + + local startTime = 0 + if activityInfo then + startTime = activityInfo.startTime + end + return startTime +end +------------------------------------------------ +------------------------------------------------ +------------------------------------------------ + + +function this.GetActivityRewardRequest(type, index) + --local rewardId=0 + --向服务器发送领取在线奖励请求 + NetManager.GetActivityRewardRequest(index, type, function(_drop) + UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1) + if (type == ActivityTypeDef.OnlineGift) then + this.onlineGetRewardState[index] = 1 + CheckRedPointStatus(RedPointType.CourtesyDress_Online) + table.sort(this.onlineData, function(a, b) + return a.Id < b.Id + end) + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.onlineData) + elseif (type == ActivityTypeDef.EightDayGift) then + this.sevenDayGetRewardState[index] = 1 + CheckRedPointStatus(RedPointType.CourtesyDress_SevenDay) + table.sort(this.sevenDayData, function(a, b) + if this.sevenDayGetRewardState[a.Id] == this.sevenDayGetRewardState[b.Id] then + return a.Id < b.Id + else + return this.sevenDayGetRewardState[a.Id] < this.sevenDayGetRewardState[b.Id] + end + end) + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.sevenDayData) + elseif (type == ActivityTypeDef.ChapterAward) then + this.chapterGetRewardState[index] = 1 + CheckRedPointStatus(RedPointType.CourtesyDress_Chapter) + table.sort(this.chapterGiftData, function(a, b) + if this.chapterGetRewardState[a.Id] == this.chapterGetRewardState[b.Id] then + return a.Id < b.Id + else + return this.chapterGetRewardState[a.Id] < this.chapterGetRewardState[b.Id] + end + end) + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.chapterGiftData) + end + --CheckRedPointStatus(RedPointType.SecretTer) + Game.GlobalEvent:DispatchEvent(GameEvent.Adventure.OnRefreshRedShow) + end) +end +-- 红点检测监听方法 +function this.CheckRedFunc(redType) + if redType == RedPointType.CourtesyDress_SevenDay then + if this.mission[ActivityTypeDef.EightDayGift] then + local number = 0 + for i, v in pairs(this.sevenDayGetRewardState) do + if (v == 1) then + number = number + 1 + end + end + local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400) + if (number < curDay) then + return true + else + return false + end + else + return false + end + elseif redType == RedPointType.CourtesyDress_Chapter then + local isShowRed = false + for i = 1, table.nums(this.chapterGetRewardState) do + for j, v in pairs(this.chapterGiftData) do + if (i == v.Sort) then + if FightPointPassManager.GetFightStateById(v.Values[1][1]) == FIGHT_POINT_STATE.PASS and this.chapterGetRewardState[v.Id] == 0 then + isShowRed = true + return isShowRed + end + end + end + end + return isShowRed + elseif redType == RedPointType.CourtesyDress_Online then + local number = 0 + for i, v in pairs(this.onlineGetRewardState) do + if (v == 1) then + number = number + 1 + end + end + + --当活动未开或奖励全部领取完毕 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Online_Reward)==false then + return false + else--当活动开启或奖励未领取完毕 + local timeNum = GetTimeStamp() - this.cuOnLineTimestamp + local currentTimeIndex = 0 + for i = 1, #this.onlineData do + if this.onlineGetRewardState[this.onlineData[i].Id] == 0 then + if (math.floor(timeNum)) >= (this.onlineData[i].Values[1][1]*60) then + currentTimeIndex = this.onlineData[i].Sort + end + end + end + --Log("number < this.currentTimeIndex "..number .." "..currentTimeIndex) + if (number < currentTimeIndex) then --当已领取数小于未领取数 + return true + else + return false + end + end + end +end + + +function this.GetActivityTypeFromId(activityId) + local globalActConfig = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity, "Id", activityId) + return globalActConfig.Type +end + +function this.IsActivityTypeOpen(type) + local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type) + local activityId = nil + table.walk(globalActConfigs, function(actConfigInfo) + if this.mission and this.mission[actConfigInfo.Id] then + activityId = actConfigInfo.Id + end + end) + return activityId +end + +function this.GetContinuityRechargeRedPoint() + local redPoint = false + if this.IsActivityTypeOpen(ActivityTypeDef.ContinuityRecharge) then + local continuityRechargeList = this.GetActivityTypeInfo(ActivityTypeDef.ContinuityRecharge) + for i = 1, #continuityRechargeList.mission do + local rechargeInfo = continuityRechargeList.mission[i] + redPoint = redPoint or (rechargeInfo.progress == 1 and rechargeInfo.state == 0) + end + end + return redPoint +end + +function this.GetGrowthRechargeExist() + if this.IsGetAllGrowthReward() or this.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) == nil then + return false + end + return true +end + +function this.IsGetAllGrowthReward() + local isGetAll = true + if this.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) then + local activityInfo = this.GetActivityTypeInfo(ActivityTypeDef.GrowthReward) + for i = 1, #activityInfo.mission do + isGetAll = isGetAll and activityInfo.mission[i].state == 1 + end + end + return isGetAll +end +--检测限时活动红点 +function this.ExpterActivityIsShowRedPoint(activeIndex) + local activeType = 0 + -- Log("activeIndex "..activeIndex) + --注意 红点枚举id %100 就是按钮顺序 + activeType = numExChange[math.floor(activeIndex % 100)] + -- Log("activeType "..activeType) + local expertRewardTabs = this.GetActivityTypeInfo(activeType) + if expertRewardTabs then + for i = 1, #expertRewardTabs.mission do + local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId) + local value = 0 + --限时累计活动特殊数值读取处理 + if activeType == ActivityTypeDef.AccumulativeRechargeExper then + value = conFigData.Values[1][1] + else + value = conFigData.Values[2][1] + end + if expertRewardTabs.mission[i].state == 0 then + if activeType == ActivityTypeDef.UpStarExper or activeType == ActivityTypeDef.Talisman + or activeType == ActivityTypeDef.SoulPrint or activeType == ActivityTypeDef.EquipExper + or activeType == ActivityTypeDef.FindTreasureExper then + --进阶因为每个都不一样 特殊判断 + if expertRewardTabs.mission[i].progress >= value then + --Log("expertRewardTabs.mission[i].progress " .. expertRewardTabs.mission[i].progress) + --Log("限时红点 --------------- true") + return true + end + elseif activeType == ActivityTypeDef.UpLvAct then + if expertRewardTabs.value >= value and expertRewardTabs.mission[i].progress >= 0 then + return true + end + elseif activeType == ActivityTypeDef.FastExplore then + if expertRewardTabs.value >= value then + return true + end + else + if expertRewardTabs.value >= value then + --Log("限时红点 --------------- true") + return true + end + end + end + end + end + --Log("限时红点 --------------- false") + return false +end +--检测升级限时礼包活动红点 +function this.ExperyUpLvActivityIsShowRedPoint() + local activeData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpLvAct) + if activeData and activeData.mission then + for i = 1, #activeData.mission do + local curConfigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,activeData.mission[i].missionId) + if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] and activeData.mission[i].progress>0 then + return true + end + end + end + return false +end +--检测周卡活动红点 +function this.WeedCardActivityIsShowRedPoint() + local weekCardData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.WeekCard, 12) + if weekCardData then + --Log("weekCardData.buyTimes "..weekCardData.buyTimes.." "..PatFaceManager.isFirstLog.." "..tostring(this.isOpenWeekCard)) + if weekCardData.buyTimes <= 0 and PatFaceManager.isFirstLog == 0 and this.isOpenWeekCard == false then + --Log("检测周卡活动红点 --------------- true") + return true + end + end + --Log("检测周卡活动红点 --------------- false") + return false +end +--检测战力排行活动红点 +function this.WarPowerSortActivityIsShowRedPoint() + local expertRewardTabs = this.GetActivityTypeInfo(ActivityTypeDef.WarPowerReach) + if expertRewardTabs then + for i = 1, #expertRewardTabs.mission do + local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId) + local value = conFigData.Values[1][1] + if expertRewardTabs.mission[i].state == 0 then + if expertRewardTabs.value >= value then + --Log("红点红点 ") + return true + end + end + end + end + return false +end +--限时活动里是否有活动开启 > 0 说明有开启的活动 +function this.GetExpertActiveisOpen() + --所有达人 + for i, v in pairs(numExChange) do + local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v) + if curActiveData then + if curActiveData.endTime - GetTimeStamp() > 0 then + return i + end + end + end + local LimitExchange = this.GetActivityTypeInfo(ActivityTypeDef.LimitExchange) + if LimitExchange then + if LimitExchange.endTime - GetTimeStamp() > 0 then + return ActivityTypeDef.LimitExchange + end + end + + local weekCardData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.WeekCard, 12) + if weekCardData then + if weekCardData.endTime - GetTimeStamp() > 0 then + return ExperType.WeekCard + end + end + local patFaceAllData = nil--{ConfigManager.GetConfigData(ConfigName.LoginPosterConfig,1)}--PatFaceManager.GetPatFaceAllDataTabs() + if RecruitManager.isTenRecruit == 0 then + patFaceAllData = { ConfigManager.GetConfigData(ConfigName.LoginPosterConfig, 1) } + end + if patFaceAllData and #patFaceAllData > 0 then + return ExperType.PatFace + end + --异妖直购 + for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.LoginPosterConfig)) do + if v.Type == 2 then + --异妖直购特殊处理 + if v.OpenRules[1] == 1 then + if PlayerManager.level >= v.OpenRules[2] and PlayerManager.level <= v.CloseRules[2] then + local conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.ShopId) + local shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type, v.ShopId) + if shopItemData then + return ExperType.DiffMonster + end + end + end + end + end + --幸运探宝 + --local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One) + --if curActiveData then + -- return 6 + --end + --福星高照 + local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat) + if curActiveData then + return ExperType.LuckyCat + end + -- 七日 + local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EightDayGift) + if curActiveData then + return ExperType.SevenDay + end + --星级成长礼 + if OperatingManager.IsHeroGiftActive() then + return ExperType.StarGrowGift + end + return 0 +end +--判断七日,在线,章节是否全部领取完了 +function this.ActivityIsHaveGetFinally(state) + local isGetAllReward = true + for i, v in pairs(state) do + if (v == 0) then + isGetAllReward = false + end + end + return isGetAllReward +end + + +-- 获取所有开启的显示活动ID +function this.GetExpertActiveisAllOpenIds() + local activityIds = {} + for i, v in pairs(numExChange) do + local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v) + if curActiveData then + if curActiveData.endTime - GetTimeStamp() > 0 then + --Log("开启活动id ======== " .. curActiveData.activityId) + table.insert(activityIds,curActiveData.activityId) + end + end + end + local LimitExchange = this.GetActivityTypeInfo(ActivityTypeDef.LimitExchange) + if LimitExchange then + if LimitExchange.endTime - GetTimeStamp() > 0 then + table.insert(activityIds,LimitExchange.activityId) + end + end + local patFaceAllData = nil + if RecruitManager.isTenRecruit == 0 then + patFaceAllData = { ConfigManager.GetConfigData(ConfigName.LoginPosterConfig, 1) } + end + if patFaceAllData and #patFaceAllData > 0 then + table.insert(activityIds,ActivityTypeDef.PatFace) + end + --幸运探宝 + local luckyTurnTable_One = 0 + luckyTurnTable_One = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One) + local upper_Two = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_Two) + if luckyTurnTable_One then + if luckyTurnTable_One > 0 then + table.insert(activityIds, luckyTurnTable_One) + end + end + + if upper_Two then + if upper_Two > 0 then + table.insert(activityIds, upper_Two) + end + end + + --福星高照 + local luckyCat = 0 + luckyCat = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat) + if luckyCat then + if luckyCat > 0 then + table.insert(activityIds, luckyCat) + end + end + -- 七日 + local sevenDay = 0 + sevenDay = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EightDayGift) + if sevenDay then + if sevenDay > 0 then + table.insert(activityIds, sevenDay) + end + end + return activityIds +end + +---关卡通关豪礼相关--- +--根据当前关数 获取最近下一关卡橙色角色 +function this.GetNextHeroInfo() + local allData={} + local heroData={} + --Log("当前通过关卡"..FightPointPassManager.lastPassFightId) + local startIndex=5001 + local mainLevelEndId=ConfigManager.TryGetConfigDataByKey(ConfigName.MainLevelConfig,"NextLevel",-1).Id--最高关卡 + local endIndex=this.GetConfigForValues(ConfigName.ActivityRewardConfig,mainLevelEndId).Id + + --活动表处于开始结束索引之间的全部数据 + for i = startIndex, endIndex do + local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i) + if reward then + table.insert(allData, reward) + end + end + + --输出ActivityRewardConfig里下一关的索引 + local index + for i = 1, #allData do + if ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight).SortId-1 < ConfigManager.GetConfigData(ConfigName.MainLevelConfig,allData[i].Values[1][1]).SortId then + index= this.GetConfigForValues(ConfigName.ActivityRewardConfig,allData[i].Values[1][1]).Id + break + end + end + + --剩余数据 + local residueData={} + for i = index, endIndex do + local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i) + if reward then + table.insert(residueData, reward) + end + end + + --剩余数据中将立绘数据存入 + for i = 1, #residueData do + local itemData=ConfigManager.GetConfigData(ConfigName.ItemConfig,residueData[i].Reward[1][1]) + if itemData.ItemType==1 and (itemData.Quantity==5 or itemData.Quantity==4)then --and allData[i].Reward[1][2]==1 + table.insert(heroData,residueData[i]) + end + end + + if #heroData>0 then --如果有数据 + return heroData[1].Reward[1][1],heroData[1].Values[1][1] --返回目标立绘id 关卡id + else + return #heroData,#heroData--如果没数据 返回0 + end +end + +--根据双重key的value锁定id value为2维数组(目前没有这种接口) +function this.GetConfigForValues(configName,pointId) + local data={} + for _, configInfo in ConfigPairs(ConfigManager.GetConfig(configName)) do + if configInfo.ActivityId == 3 and configInfo.Values[1][1] == pointId then + data = configInfo + break + end + end + return data +end +--------------------- +--- 根据活动ID获取表格中相同活动ID第一项的数据 +function this.GetActivityDataById(id) + for k, v in ConfigPairs(ActivityRewardConfig) do + if v and v.ActivityId == id then + return v + end + end +end + + +---剑影仙踪相关--- +--获取剑影仙踪任务数据 +function this.GetTaskData() + local taskList={} + local taskValue=0 + + local data= this.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) + + if not data then + return 0, taskList + end + + table.sort(data.mission,function(a,b) + return a.missionId= 1 then + taskValue = taskValue + 1 + end + end + + return taskValue,taskList +end + +--剑影仙踪红点检测 差一个通关完毕 符合要求的红点检测 点击领取红点未检测 +function this.CheckSupremeHeroRedPoint() + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then + return + end + local isOpen + local num,list= this.GetTaskData() + + local complete=0 --任务是否完成 + local receive=0 --任务是否领取 + for i = 1, #list do + if list[i]>0 then + complete=complete+1 + end + if list[i]==2 then + receive=receive+1 + end + end + + if complete<3 then--任务未完成 + isOpen=PatFaceManager.isFirstLog==0 and not this.isFirstForSupremeHero + else + isOpen=receive<3 + end + + return isOpen +end + + +--获取活动剩余时间 +function this.GetTaskRemainTime(activityType) + local remainTime = 0 + remainTime =this.GetTaskEndTime(activityType)- this.GetTaskEndTime(activityType) + return remainTime +end + +function this.GetRewardState() + local taskValue,missionData= this.GetTaskData() + local doneNum = 0 + for i = 1, 3 do + if missionData[i] == 2 then + doneNum = doneNum + 1 + end + end + local state = doneNum == 3 and 3 or 2 + return state +end + +---------------- +-- 获取下一个每日奖励的时间 +function this.GetNextOnlineRewardData() + for _, data in ipairs(this.onlineData) do + local state = this.onlineGetRewardState[data.Id] + if state ~= 1 then -- 如果不是已完成状态则返回数据 + if state == 0 then + local curOnlineTime = GetTimeStamp() - ActivityGiftManager.cuOnLineTimestamp + local needTime = data.Values[1][1]*60 + if curOnlineTime < needTime then + state = -1 + end + end + return data, state + end + end +end + +--达人获取id +function this.GetOpenExpertIdByActivityType(activityType) + local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType) + if activityInfo then + return activityInfo.activityId + end + return 0 +end + +-------------------------------------------- +--主动刷新 置本地数据 +function this.RefreshAcitvityData(acitvityIds,fun) + NetManager.RefreshAcitvityData(acitvityIds,function (msg) + for i = 1, #msg.activityInfo do + if this.mission[msg.activityInfo[i].activityId] then + this.mission[msg.activityInfo[i].activityId].value = msg.activityInfo[i].value + for j = 1, #msg.activityInfo[i].mission do + for _, missionInfo in pairs(this.mission[msg.activityInfo[i].activityId].mission) do + if missionInfo.missionId == msg.activityInfo[i].mission[j].missionId then + missionInfo.state = msg.activityInfo[i].mission[j].state + missionInfo.progress = msg.activityInfo[i].mission[j].progress + --LogError("msg.activityInfo[i].mission[j] "..msg.activityInfo[i].mission[j].missionId.." "..msg.activityInfo[i].mission[j].progress) + end + end + end + end + end + if fun then fun() end + CheckRedPointStatus(RedPointType.Expert_UpLv) + end) +end + +--获取活动已开启的时间 +function this.GetCurrentDayNumber(type) + local DayActInfo = ActivityGiftManager.GetActivityTypeInfo(type) + local startTime = DayActInfo.startTime + local needDayNumber = math.ceil((GetTimeStamp() - startTime) / 86400) + return needDayNumber +end + +--章节检测距离下次领奖还有几关 +function this.GetRewardNeedLevel() + for i = 1, table.nums(this.chapterGetRewardState) do + for j, v in pairs(this.chapterGiftData) do + if (i == v.Sort) then + if FightPointPassManager.GetFightStateById(v.Values[1][1]) ~= FIGHT_POINT_STATE.PASS and this.chapterGetRewardState[v.Id] == 0 then + return this.mainLevelConfig[v.Values[1][1]].SortId - this.mainLevelConfig[FightPointPassManager.curOpenFight].SortId + 1 + end + end + end + end + return 0 +end +--开服福利排序 +local OpenSeverWelfareSortTable = { + [0] = 1, + [1] = 0, +} +function this. OpenSeverWelfareRewardTabsSort(missions) + table.sort(missions,function(a,b) + if a.state == b.state then + return a.missionId < b.missionId + else + return OpenSeverWelfareSortTable[a.state] > OpenSeverWelfareSortTable[b.state] + end + end) +end + + +function this.GetTimeStartToEnd(type) + local info= ActivityGiftManager.GetActivityTypeInfo(type) + local startTime= this.GetTimeShow(info.startTime) + local endtime= this.GetTimeShow(info.endTime) + return startTime.."~"..endtime +end + +---时间格式化接口 +function this.GetTimeShow(data) + local year = math.floor(os.date("%Y", data)) + local month = math.floor(os.date("%m", data)) + local day = math.floor(os.date("%d", data)) + local time = year .. "-" .. month .. "-" .. day + return time +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua index bef96a23ad..703e40c340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua @@ -252,7 +252,7 @@ function Expert:ActivityRewardSingleShow(index,rewardData) Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0) if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper - or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then --进阶因为每个都不一样 特殊判断 + or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper or numExChange[activeIndext] == ActivityTypeDef.ExpeditionExper then --进阶因为每个都不一样 特殊判断 getRewardProgress:GetComponent("Text").text = rewardData.progress .."/"..value else getRewardProgress:GetComponent("Text").text = expertRewardTabs.value .."/"..value diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 34e65e454e..7f79db9364 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -577,7 +577,6 @@ function ExpertPanel:SetOpenActiveBtn() --end --所有达人 for i, v in pairs(numExChange) do - -- LogGreen("v "..v) local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v) if curActiveData then if defaultIndex == 0 or defaultIndex > i then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index fd28f54185..d41a26d8c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -222,6 +222,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Expert_SecretBox, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_UpLv, RedPointType.Expert) RPData:SetParent(RedPointType.ContinuityRecharge, RedPointType.Expert) + RPData:SetParent(RedPointType.Expert_Expedition, RedPointType.Expert) --战力排行 RPData:SetParent(RedPointType.WarPowerSort_Sort, RedPointType.WarPowerSort) --背包 @@ -356,7 +357,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_SoulPrint, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.LuckyTurn, LuckyTurnTableManager.ReturnRedPointState) RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint) - RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.WeedCardActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.ExpterActivityIsShowRedPoint) -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行 RPData:AddCheckFunc(RedPointType.WarPowerSort_Sort, ActivityGiftManager.WarPowerSortActivityIsShowRedPoint) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 0d62876612..7fa0141a80 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -362,9 +362,9 @@ function this.SetInfoShow(go,data,rankType,Value0) elseif sData.activiteId == ActivityTypeDef.FastExplore then goldExper:GetComponent("Text").text = Language[12382] elseif sData.activiteId == ActivityTypeDef.FindTreasureExper then - goldExper:GetComponent("Text").text = "次数:" + goldExper:GetComponent("Text").text = Language[12392] elseif sData.activiteId == ActivityTypeDef.ExpeditionExper then - goldExper:GetComponent("Text").text = "积分:" + goldExper:GetComponent("Text").text = Language[12393] end elseif rankType == RANK_TYPE.ARENA_RANK then arenaScore:SetActive(true) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 17bc3b0bce..f371956059 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -14,361 +14,361 @@ MonoBehaviour: m_EditorClassIdentifier: _keys: - F:\jl_data_execl\master_develop/base_data\ActivityDropReward.xlsx - - F:\jl_data_execl\master_develop/base_data\ActivityRankingReward.xlsx - - F:\jl_data_execl\master_develop/base_data\AchievementConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\AdventureReward.xlsx - - F:\jl_data_execl\master_develop/base_data\AreaConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ArenaBattleReward.xlsx - - F:\jl_data_execl\master_develop/base_data\AdventureConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GameSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildRedPackConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildLevelConfig.xlsx - F:\jl_data_execl\master_develop/base_data\ArenaReward.xlsx - - F:\jl_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx - F:\jl_data_execl\master_develop/base_data\ArenaRobotSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ActivityRankingReward.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildBossConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExchangeRate.xlsx + - F:\jl_data_execl\master_develop/base_data\ArenaBattleReward.xlsx + - F:\jl_data_execl\master_develop/base_data\AdventureReward.xlsx + - F:\jl_data_execl\master_develop/base_data\FakeBattle.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\AreaConfig.xlsx - F:\jl_data_execl\master_develop/base_data\ArenaSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\BeginnerTask.xlsx - - F:\jl_data_execl\master_develop/base_data\AudioConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\BlessingConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\FoodsConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx - F:\jl_data_execl\master_develop/base_data\BlessingRewardPool.xlsx - F:\jl_data_execl\master_develop/base_data\BloodyBattleReward.xlsx - - F:\jl_data_execl\master_develop/base_data\BeStronger.xlsx - F:\jl_data_execl\master_develop/base_data\BloodyBattleTask.xlsx - - F:\jl_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx - - F:\jl_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\BlessingConfig.xlsx - F:\jl_data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx - F:\jl_data_execl\master_develop/base_data\BloodyRankConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\BuffEffectConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ChallengeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ChallengeSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\ChallengeStarBox.xlsx - - F:\jl_data_execl\master_develop/base_data\ChampionshipReward.xlsx - - F:\jl_data_execl\master_develop/base_data\ChampionshipSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\CustomEventConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\CombatControl.xlsx - - F:\jl_data_execl\master_develop/base_data\DailyTasksConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GlobalActivity.xlsx + - F:\jl_data_execl\master_develop/base_data\GuideConfig.xlsx - F:\jl_data_execl\master_develop/base_data\DailyChallengeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DialRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx - - F:\jl_data_execl\master_develop/base_data\DialRewardSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\AdventureConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\BeStronger.xlsx + - F:\jl_data_execl\master_develop/base_data\AchievementConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\DailyTasksConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChallengeStarBox.xlsx + - F:\jl_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChampionshipReward.xlsx + - F:\jl_data_execl\master_develop/base_data\BuffEffectConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\BeginnerTask.xlsx + - F:\jl_data_execl\master_develop/base_data\MazeTreasure.xlsx + - F:\jl_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx + - F:\jl_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipSignSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildScoreConfig.xlsx - F:\jl_data_execl\master_develop/base_data\EndlessDifficulty.xlsx - F:\jl_data_execl\master_develop/base_data\EndlessMapConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DialogueViewConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipSignSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipStarsConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipPropertyPool.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx + - F:\jl_data_execl\master_develop/base_data\JewelConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx - F:\jl_data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ErrorCodeHint.xlsx - - F:\jl_data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipSign.xlsx - - F:\jl_data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ExchangeRate.xlsx - - F:\jl_data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ExpeditionSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\FakeBattle.xlsx - - F:\jl_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\FoodsConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GameSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\GlobalActivity.xlsx - - F:\jl_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuideConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildBossConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\FloodConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildHelpConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildLevelConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildRedPackConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildScoreConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildWarConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\HeroConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\HeroLevelConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx - F:\jl_data_execl\master_develop/base_data\HeroRankupConfig.xlsx - F:\jl_data_execl\master_develop/base_data\HeroRankupGroup.xlsx - - F:\jl_data_execl\master_develop/base_data\GuildTechnology.xlsx - F:\jl_data_execl\master_develop/base_data\HeroSacrifice.xlsx - - F:\jl_data_execl\master_develop/base_data\HeroReturn.xlsx - - F:\jl_data_execl\master_develop/base_data\JewelConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EventPointConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\JumpConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\JewelRankupConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\LevelSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\LoginPosterConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\ItemConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\LotterySetting.xlsx - - F:\jl_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\LuckyCatConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\EquipTalismana.xlsx + - F:\jl_data_execl\master_develop/base_data\CombatControl.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipSign.xlsx + - F:\jl_data_execl\master_develop/base_data\DialRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipStarsConfig.xlsx - F:\jl_data_execl\master_develop/base_data\LuxuryFund.xlsx - - F:\jl_data_execl\master_develop/base_data\MainMapIconConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\MazeTreasure.xlsx - - F:\jl_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\LuckyCatConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LotterySetting.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx - F:\jl_data_execl\master_develop/base_data\MissionEventsConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\MapPointConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\MonsterViewConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\MainMapIconConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\FloodConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\JumpConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\ChallengeSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChampionshipSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\DialogueViewConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ExpeditionSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildHelpConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildWarConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\CustomEventConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChallengeConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LoginPosterConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ItemConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\AudioConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LevelSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx + - F:\jl_data_execl\master_develop/base_data\DialRewardSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\ErrorCodeHint.xlsx + - F:\jl_data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipPropertyPool.xlsx - F:\jl_data_execl\master_develop/base_data\MonthcardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\OptionAddCondition.xlsx - - F:\jl_data_execl\master_develop/base_data\OptionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\MonsterGroup.xlsx - - F:\jl_data_execl\master_develop/base_data\PassiveSkillConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\PlayerAppearance.xlsx - - F:\jl_data_execl\master_develop/base_data\MainLevelConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\PlayerRole.xlsx - - F:\jl_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx - - F:\jl_data_execl\master_develop/base_data\PropertyConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\QAConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RaceTowerConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RandomName.xlsx - - F:\jl_data_execl\master_develop/base_data\RecommendTeam.xlsx - - F:\jl_data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RewardItemConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RunesConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RunesPoolConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SevenDaysActivity.xlsx - - F:\jl_data_execl\master_develop/base_data\RoleConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SeverConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SignInConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SevenDaysScore.xlsx - - F:\jl_data_execl\master_develop/base_data\SkillConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SpecialConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SkillLogicConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\StoreTypeConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\SystemMessageConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TaskConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TestWelfare.xlsx - - F:\jl_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\RewardGroup.xlsx + - F:\jl_data_execl\master_develop/base_data\MonsterViewConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\HeroReturn.xlsx + - F:\jl_data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\HeroConfig.xlsx - F:\jl_data_execl\master_develop/base_data\TrialGameConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TrialKillConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TrialConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\TrialSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\VipLevelConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopSetting.xlsx - - F:\jl_data_execl\master_develop/base_data\UIConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx + - F:\jl_data_execl\master_develop/base_data\QAConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SeverConfig.xlsx - F:\jl_data_execl\master_develop/base_data\WorldBossConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TestWelfare.xlsx + - F:\jl_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RunesConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx + - F:\jl_data_execl\master_develop/base_data\StoreTypeConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SevenDaysActivity.xlsx + - F:\jl_data_execl\master_develop/base_data\OptionAddCondition.xlsx + - F:\jl_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SignInConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\PlayerAppearance.xlsx + - F:\jl_data_execl\master_develop/base_data\TrialSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx + - F:\jl_data_execl\master_develop/base_data\SpecialConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TaskConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\VipLevelConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\JewelRankupConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\HeroLevelConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TrialKillConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\UIConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\PlayerRole.xlsx + - F:\jl_data_execl\master_develop/base_data\PropertyConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SystemMessageConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx - F:\jl_data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx - F:\jl_data_execl\master_develop/base_data\WorldBossSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\RewardItemConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\MapPointConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RaceTowerConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SevenDaysScore.xlsx + - F:\jl_data_execl\master_develop/base_data\RecommendTeam.xlsx + - F:\jl_data_execl\master_develop/base_data\RunesPoolConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\WorkShopSetting.xlsx + - F:\jl_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx - F:\jl_data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx - - F:\jl_data_execl\master_develop/base_data\StoreConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RandomName.xlsx + - F:\jl_data_execl\master_develop/base_data\GuildTechnology.xlsx + - F:\jl_data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RoleConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\TrialConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SkillConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\PassiveSkillConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\SkillLogicConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EventPointConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\EquipTalismana.xlsx - F:\jl_data_execl\master_develop/base_data\WorkShopTechnology.xlsx + - F:\jl_data_execl\master_develop/base_data\StoreConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\RewardGroup.xlsx + - F:\jl_data_execl\master_develop/base_data\OptionConfig.xlsx + - F:\jl_data_execl\master_develop/base_data\MonsterGroup.xlsx + - F:\jl_data_execl\master_develop/base_data\MainLevelConfig.xlsx - F:\jl_data_execl\master_develop/base_data\MonsterConfig.xlsx _values: - 3591751192 - - 3233002609 - - 3062382507 - - 613479935 - - 413963702 - - 3252026258 - - 1848421159 + - 3229246241 + - 1120913959 + - 1382260277 + - 421974146 + - 475620184 + - 3153364400 - 2296996310 - - 1656119918 - 1289424307 + - 1656119918 + - 986789930 + - 3233002609 + - 1442255327 + - 173728414 + - 1645456228 + - 702480255 + - 3252026258 + - 613479935 + - 1195934816 + - 3943131728 + - 413963702 - 1924824445 - - 427098595 - - 755222564 - - 2684915448 - - 2830891614 + - 2204989227 + - 2050621784 - 939963957 - 230994945 - - 2587490859 - 2131302457 - - 3507522218 - - 2050621784 + - 2830891614 - 4055477448 + - 3507522218 - 3548626589 - - 3389195548 - - 4138292608 - - 2759035733 - - 1705732776 - - 1565259591 - - 2943614740 - - 3338153430 - - 1572157444 - - 472584542 - - 2014737423 - - 2944506204 - - 3022619009 - - 220677422 + - 2618565706 + - 2014039849 + - 3749192783 - 1774803500 - - 3566908170 - - 680191298 - - 903221398 - - 249002466 - - 4198004043 - - 329162371 - - 932779961 - - 460607005 - - 583891024 + - 1848421159 + - 2587490859 + - 3062382507 + - 220677422 + - 1565259591 + - 1023901955 + - 2943614740 + - 3389195548 + - 1996735664 + - 427098595 + - 755222564 + - 866186388 + - 4138292608 + - 3228740331 + - 1572157444 + - 2014737423 + - 3517900411 + - 3079207713 - 1241055907 - 3356066097 - - 1402356663 - - 2809447110 - - 2403795715 - - 3517900411 - - 494399256 - - 4124958540 - - 3153107712 - - 2568046174 - - 2294226303 + - 727009153 + - 249002466 + - 903221398 - 3846713010 - - 568553271 - - 1448464981 - - 894523047 - - 1790592577 - - 986789930 - - 702480255 - - 1120913959 - - 2618565706 - - 3930424554 - - 1023901955 - - 1195934816 - - 1382260277 - - 2204989227 - - 421974146 - - 2014039849 - - 3229246241 - - 3749192783 - - 173728414 - - 3943131728 - - 3766499137 - - 1645456228 - - 3894020600 - - 3153364400 - - 475620184 - - 1442255327 - - 1996735664 - - 1468913191 - - 3079207713 - - 3472737567 - - 3228740331 - - 3585263874 - - 2445182985 - - 1452490095 - - 3255901169 + - 3597116301 + - 583891024 - 3773792064 - 1493914227 - - 312894044 - 306567717 - - 322704922 - - 727009153 - - 567764364 - - 3597116301 - - 929354238 - - 980629513 - - 3705022903 - - 1757541933 - - 144017008 - - 3787793196 - - 4088438912 - - 2479323017 - - 295715991 - - 4033164304 + - 3022619009 + - 1790592577 + - 3566908170 + - 494399256 - 2903827109 - - 260126611 - - 1393544882 - - 242814620 - - 866186388 - - 3746847302 + - 2479323017 + - 3787793196 + - 2568046174 + - 4124958540 + - 472584542 + - 4088438912 - 3625815197 - - 3489124197 - - 515856748 + - 260126611 + - 3766499137 + - 929354238 + - 3746847302 + - 1705732776 + - 1393544882 + - 3338153430 + - 2809447110 + - 3930424554 + - 3894020600 + - 1468913191 + - 3472737567 + - 3585263874 + - 932779961 + - 2944506204 + - 2759035733 + - 2445182985 + - 2403795715 + - 1757541933 + - 460607005 + - 680191298 + - 2664024792 + - 329162371 + - 2684915448 + - 3705022903 + - 2294226303 + - 4198004043 + - 1448464981 + - 894523047 + - 3153107712 - 2181074157 - - 683415129 - - 2563511001 - - 249999430 - - 2037042661 - - 2534897219 - - 1568647799 - - 1173373930 - - 3641128642 - - 319164499 - - 838751704 - - 4065623856 - - 678093140 - - 595190689 - - 4114437015 - - 38983593 - - 371577342 - - 1823741956 - - 2149795273 - - 3486858631 - - 1155516420 - - 804383039 - - 160427834 - - 4285496955 - - 2748321716 - - 29725303 - - 1952787401 - - 728643604 - - 3314623045 - - 594844862 - - 269889771 - - 297530923 - - 148429609 - - 4291486445 - - 3431809730 - - 2930068975 - - 80325891 - - 2433642113 - - 2032130078 + - 515856748 + - 1402356663 + - 242814620 + - 322704922 + - 568553271 + - 1452490095 - 1982645928 - - 739739032 - - 266440734 - - 1891222748 - - 141295447 - - 2854113790 - - 241982493 - - 110435588 - - 98336120 - - 2405621183 - - 2777840995 - - 3663717884 - - 752215932 - - 3048495520 + - 678093140 + - 2748321716 - 1321320575 + - 4291486445 + - 2854113790 + - 1155516420 + - 319164499 + - 269889771 + - 160427834 + - 683415129 + - 2930068975 + - 29725303 + - 80325891 + - 2534897219 + - 141295447 + - 1173373930 + - 3048495520 + - 3314623045 + - 148429609 + - 2405621183 + - 241982493 + - 980629513 + - 1891222748 + - 3255901169 + - 595190689 + - 739739032 + - 98336120 + - 3431809730 + - 3873092379 + - 295715991 + - 3641128642 + - 838751704 + - 110435588 + - 297530923 + - 2777840995 - 967064327 - 811712663 + - 2121869243 + - 3489124197 + - 4114437015 + - 1952787401 + - 371577342 + - 804383039 + - 3663717884 + - 4065623856 + - 2433642113 - 3127079988 - - 1713944378 + - 38983593 + - 312894044 + - 1823741956 + - 4285496955 + - 266440734 + - 728643604 + - 2037042661 + - 2149795273 + - 594844862 + - 567764364 + - 4033164304 - 2453679101 + - 1713944378 + - 1143673964 + - 2563511001 + - 249999430 + - 1568647799 - 2849905846 diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 7f85aa7f59..3e41680951 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2389,3 +2389,5 @@ 12389,4ǻǼ 12390,սؿ 12391,ɹ%s֣ +12392, +12393,֣