From 81964976265c0d84e0b4d26f7607644fd1028e24 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 11:11:07 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=81=94=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/data_manager.lua | 15 +++++++++------ lua/app/module/login/login_manager.lua | 26 ++++++++------------------ lua/app/proto/proto_msg_type.lua | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index fa57aab5..8075eedc 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -88,18 +88,21 @@ end function DataManager:initWithServerData(data) self:init() Time:setServerTimeZone(0) + Time:updateServerTime(data.now_ts) + Time:updateServerTimeToday(data.today_ts) + self.initWithServer = true if EDITOR_MODE then Logger.logHighlight("initWithServerData") Logger.printTable(data) end - self.PlayerData:init(data.PlayerData) - self.ChapterData:init(data.ChapterData) - self.HeroData:init(data.HeroData) - self.BagData:init(data.BagData) - self.FormationData:init(data.FormationData) - self.TutorialData:init(data.TutorialData) + self.PlayerData:init(data.basic_info) + self.ChapterData:init(data.chapter) + self.HeroData:init(data.bag.heroes) + self.BagData:init(data.bag) + self.FormationData:init(data.fight_info) + self.TutorialData:init(data.guide) self.ActivityData:init() self.GodPigData:init() self.BountyData:init() diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 00203704..0ad4567a 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -20,24 +20,14 @@ end function LoginManager:loginGame() -- adjust 打开应用事件识别码 BIReport:postAdjustSimpleTrackEvent("xbszrl", {}) - - local serverTime = Time:getServerTime() * 1000 - local todayBeginTime = serverTime - serverTime%86400 - Time:updateByServer(serverTime, todayBeginTime) - - CS.BF.BFMain.IsGotServerTime = true - ServerDataManager:dataOperate(GConst.ServerDataConst.DATA_OP_BEHAVIOR.SYNC_DATA, GConst.EMPTY_TABLE, function(msgData) - DataManager:initWithServerData(msgData) - ConfigManager:preLoadConfig() - ModuleManager.MaincityManager:firstEnterMainCity() - local data = {} - data.max_chapter = DataManager.ChapterData:getNewChapterId() - -- data.ads_num = DataManager.PlayerData:getAdCount() - -- data.pay_money = DataManager.PlayerData:getPaymentCount() - data.play_days = DataManager.PlayerData:getLoginDay() - data.now_version = Platform:getClientVersion() - CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) - end) + local data = {} + data.max_chapter = DataManager.ChapterData:getNewChapterId() + -- data.ads_num = DataManager.PlayerData:getAdCount() + -- data.pay_money = DataManager.PlayerData:getPaymentCount() + data.play_days = DataManager.PlayerData:getLoginDay() + data.now_version = Platform:getClientVersion() + CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) + ModuleManager.MaincityManager:firstEnterMainCity() end function LoginManager:goToLoginScene() diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 50bd8c57..98fc91f1 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -1,5 +1,8 @@ local ProtoMsgType = { FromMsgId = { + [109633552] = "PigLevelDownNtf", + [109700242] = "PigLevelDownReq", + [109702075] = "PigLevelDownRsp", [132242856] = "ChapterSettlementReq", [132244689] = "ChapterSettlementRsp", [361733825] = "SkipGuideReq", @@ -66,10 +69,15 @@ local ProtoMsgType = { [3846223098] = "MallActTriggerGiftNtf", [3904148760] = "GMReq", [3904150593] = "GMRsp", + [3933875617] = "ChapterStartReq", + [3933877450] = "ChapterStartRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, FromMsgToId = { + PigLevelDownNtf = 109633552, + PigLevelDownReq = 109700242, + PigLevelDownRsp = 109702075, ChapterSettlementReq = 132242856, ChapterSettlementRsp = 132244689, SkipGuideReq = 361733825, @@ -136,10 +144,15 @@ local ProtoMsgType = { MallActTriggerGiftNtf = 3846223098, GMReq = 3904148760, GMRsp = 3904150593, + ChapterStartReq = 3933875617, + ChapterStartRsp = 3933877450, ExistReq = 4256333947, ExistRsp = 4256335780, }, FromMsgEnum = { + PigLevelDownNtf = "PigLevelDownNtf", + PigLevelDownReq = "PigLevelDownReq", + PigLevelDownRsp = "PigLevelDownRsp", ChapterSettlementReq = "ChapterSettlementReq", ChapterSettlementRsp = "ChapterSettlementRsp", SkipGuideReq = "SkipGuideReq", @@ -206,6 +219,8 @@ local ProtoMsgType = { MallActTriggerGiftNtf = "MallActTriggerGiftNtf", GMReq = "GMReq", GMRsp = "GMRsp", + ChapterStartReq = "ChapterStartReq", + ChapterStartRsp = "ChapterStartRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", }, From d0687f7d3774cead51c2131139abfdd55789b135 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 11:35:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/login/login_manager.lua | 1 - lua/app/userdata/hero/hero_data.lua | 5 ++--- lua/app/userdata/player/player_data.lua | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 9331796b..bcdd010e 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -56,7 +56,6 @@ function LoginManager:getClientInfo() return clientInfo end - function LoginManager:initSocket() local isConnected = NetManager:isConnected(NetManager.MAIN_SOCKET_NAME) if EDITOR_MODE then diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index a5fe3dee..c6db5503 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -1,8 +1,6 @@ local HeroEntity = require "app/userdata/hero/hero_entity" local HeroData = class("HeroData", BaseData) -local HERO_CFG = ConfigManager:getConfig("hero") - function HeroData:ctor() self.heroes = {} self.data.activeCount = 0 @@ -22,7 +20,8 @@ function HeroData:init(data) end end - for heroId, info in pairs(HERO_CFG) do + local heroCfg = ConfigManager:getConfig("hero") + for heroId, info in pairs(heroCfg) do local entity = self:getHeroById(heroId) if entity:isActived() then local matchType = entity:getMatchType() diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 8474fce1..d71ddcbf 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -3,7 +3,9 @@ local PlayerData = class("PlayerData", BaseData) function PlayerData:init(data) data = data or {} self.data.level = data.level or 1 + self.data.exp = data.exp or 0 self.data.dirty = false + self.data.payAmount = data.pay_amount or 0 self.loginDay = data.loginDay or 1 self.lastLoginTime = data.lastLoginTime or Time:getBeginningOfServerToday() end From eb1d1b9fbf9ae2f660fe5c97c0ce9dc21df06e59 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 14:39:11 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=81=94=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/login/login_manager.lua | 2 +- lua/app/proto/proto_msg_type.lua | 12 ++++++++++++ lua/app/userdata/bag/bag_data.lua | 2 -- lua/app/userdata/bag/item_data.lua | 2 +- lua/app/userdata/formation/formation_data.lua | 14 ++++++-------- lua/app/userdata/player/player_data.lua | 5 ----- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index bcdd010e..43bd4470 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -143,7 +143,7 @@ function LoginManager:loginFinish(data) data.max_chapter = DataManager.ChapterData:getNewChapterId() -- data.ads_num = DataManager.PlayerData:getAdCount() -- data.pay_money = DataManager.PlayerData:getPaymentCount() - data.play_days = DataManager.PlayerData:getLoginDay() + -- data.play_days = DataManager.PlayerData:getLoginDay() data.now_version = Platform:getClientVersion() CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index a67c404f..a9868109 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -5,9 +5,13 @@ local ProtoMsgType = { [109702075] = "PigLevelDownRsp", [132242856] = "ChapterSettlementReq", [132244689] = "ChapterSettlementRsp", + [147147672] = "EnergyByADReq", + [147149505] = "EnergyByADRsp", [516281556] = "GuideFundMarkReq", [516283389] = "GuideFundMarkRsp", [531558517] = "PigPlayUpdateNtf", + [554454681] = "EnergyByDiamondReq", + [554456514] = "EnergyByDiamondRsp", [565555292] = "MallPayNtf", [565621982] = "MallPayReq", [565623815] = "MallPayRsp", @@ -82,9 +86,13 @@ local ProtoMsgType = { PigLevelDownRsp = 109702075, ChapterSettlementReq = 132242856, ChapterSettlementRsp = 132244689, + EnergyByADReq = 147147672, + EnergyByADRsp = 147149505, GuideFundMarkReq = 516281556, GuideFundMarkRsp = 516283389, PigPlayUpdateNtf = 531558517, + EnergyByDiamondReq = 554454681, + EnergyByDiamondRsp = 554456514, MallPayNtf = 565555292, MallPayReq = 565621982, MallPayRsp = 565623815, @@ -159,9 +167,13 @@ local ProtoMsgType = { PigLevelDownRsp = "PigLevelDownRsp", ChapterSettlementReq = "ChapterSettlementReq", ChapterSettlementRsp = "ChapterSettlementRsp", + EnergyByADReq = "EnergyByADReq", + EnergyByADRsp = "EnergyByADRsp", GuideFundMarkReq = "GuideFundMarkReq", GuideFundMarkRsp = "GuideFundMarkRsp", PigPlayUpdateNtf = "PigPlayUpdateNtf", + EnergyByDiamondReq = "EnergyByDiamondReq", + EnergyByDiamondRsp = "EnergyByDiamondRsp", MallPayNtf = "MallPayNtf", MallPayReq = "MallPayReq", MallPayRsp = "MallPayRsp", diff --git a/lua/app/userdata/bag/bag_data.lua b/lua/app/userdata/bag/bag_data.lua index 30cbb19c..aca24a04 100644 --- a/lua/app/userdata/bag/bag_data.lua +++ b/lua/app/userdata/bag/bag_data.lua @@ -1,7 +1,5 @@ local BagData = class("BagData", BaseData) -local ItemConst = require "app/module/item/item_const" - BagData.RECOVERY_TYPE = { TIMELY = 1, DAILY = 2, diff --git a/lua/app/userdata/bag/item_data.lua b/lua/app/userdata/bag/item_data.lua index a197af32..7f23d30f 100644 --- a/lua/app/userdata/bag/item_data.lua +++ b/lua/app/userdata/bag/item_data.lua @@ -44,7 +44,7 @@ function ItemData:init(data) if recoveryInfo then local obj = { id = v.id, - ts = v.ts, + ts = v.ts // 1000, limit = recoveryInfo.limit, recoveryType = recoveryInfo.type, time = recoveryInfo.time diff --git a/lua/app/userdata/formation/formation_data.lua b/lua/app/userdata/formation/formation_data.lua index 7bda5064..e9b0d064 100644 --- a/lua/app/userdata/formation/formation_data.lua +++ b/lua/app/userdata/formation/formation_data.lua @@ -3,15 +3,13 @@ local FormationData = class("FormationData", BaseData) function FormationData:init(data) self.data.dirty = false self.formations = {} + -- 目前只有主线关卡的 if data and data.heroes then - -- for formationType, formation in pairs(data.heroes) do - local clientFormation = {} - -- self.formations[formationType] = clientFormation - self.formations[GConst.BattleConst.BATTLE_TYPE.STAGE] = clientFormation -- 暂时写死 - for matchType, heroId in pairs(data.heroes) do - clientFormation[matchType] = heroId - end - -- end + local clientFormation = {} + for matchType, heroId in pairs(data.heroes) do + clientFormation[tonumber(matchType)] = heroId + end + self.formations[GConst.BattleConst.BATTLE_TYPE.STAGE] = clientFormation end end diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index d71ddcbf..da04c290 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -6,7 +6,6 @@ function PlayerData:init(data) self.data.exp = data.exp or 0 self.data.dirty = false self.data.payAmount = data.pay_amount or 0 - self.loginDay = data.loginDay or 1 self.lastLoginTime = data.lastLoginTime or Time:getBeginningOfServerToday() end @@ -33,8 +32,4 @@ function PlayerData:getExpPercent() return 0 end -function PlayerData:getLoginDay() - return self.loginDay -end - return PlayerData \ No newline at end of file From 73d6e174d5c34669f8743c98dee7516da7a72644 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 15:55:14 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E5=AE=9D=E7=AE=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/chapter/chapter_data.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index 85a29e56..086b81a7 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -223,14 +223,16 @@ function ChapterData:getIsHaveRewardsMinId() break end - chapterBefore = chapterInfo.next_chapter - if chapterBefore == nil then - break - end if chapterBefore == self.data.maxChapterId then chapterBefore = self:getNextChapter(self.data.maxChapterId) break end + + chapterBefore = chapterInfo.next_chapter + if chapterBefore == nil then + break + end + chapterInfo = chapterCfg[chapterBefore] if chapterInfo == nil then break From 022b6849cc4bf33329d455cac0491b522291efca Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 16:04:46 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BD=93=E5=8A=9B=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/bag/item_data.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lua/app/userdata/bag/item_data.lua b/lua/app/userdata/bag/item_data.lua index 7f23d30f..a4f3eb36 100644 --- a/lua/app/userdata/bag/item_data.lua +++ b/lua/app/userdata/bag/item_data.lua @@ -39,7 +39,7 @@ function ItemData:init(data) self.recoveryMap = {} if data.recoveries then local recoveryCfg = ConfigManager:getConfig("recovery") - for k, v in ipairs(data.recoveries) do + for k, v in pairs(data.recoveries) do local recoveryInfo = recoveryCfg[v.id] if recoveryInfo then local obj = { @@ -264,6 +264,16 @@ function ItemData:resetItemRecoveryTime(itemId) local obj = self.recoveryMap[itemId] if obj then obj.ts = Time:getServerTime() + -- else + -- local obj = { + -- id = v.id, + -- ts = v.ts // 1000, + -- limit = recoveryInfo.limit, + -- recoveryType = recoveryInfo.type, + -- time = recoveryInfo.time + -- } + -- self.recoveryMap[v.id] = obj + -- table.insert(self.recoveryList, obj) end end From 8022de6c90648a1436caf57c9459293a3eb76326 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 20:09:55 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/server.meta | 8 -- lua/app/ui/game_setting/game_setting_ui.lua | 132 ++++---------------- lua/app/userdata/player/player_data.lua | 11 ++ 3 files changed, 35 insertions(+), 116 deletions(-) delete mode 100644 lua/app/server.meta diff --git a/lua/app/server.meta b/lua/app/server.meta deleted file mode 100644 index 25a26e37..00000000 --- a/lua/app/server.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 62ee7f8438dd807449866595e04c6600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/lua/app/ui/game_setting/game_setting_ui.lua b/lua/app/ui/game_setting/game_setting_ui.lua index e401a5da..c1802443 100644 --- a/lua/app/ui/game_setting/game_setting_ui.lua +++ b/lua/app/ui/game_setting/game_setting_ui.lua @@ -1,14 +1,5 @@ local GameSettingUI = class("GameSettingUI", BaseUI) -local BG_HEIGHT = { - NORMAL = 930, - [GConst.LANGUAGE.VIETNAMESE] = 812 -} - -local SWITCH_TX_COLOR = "#707390" -local IOS_ICON = "setting_decoration_8" -local GOOGLE_ICON = "setting_decoration_9" - local CHECK_WHITE_LIST_COUNT = 5 function GameSettingUI:ctor() @@ -24,6 +15,7 @@ function GameSettingUI:getPrefabPath() end function GameSettingUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() self:_display() self:_addListeners() self:_bind() @@ -34,44 +26,29 @@ function GameSettingUI:onPressBackspace() end function GameSettingUI:_display() - local uiMap = self.root:genAllChildren() - uiMap["game_setting_ui.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC)) - uiMap["game_setting_ui.bg.support_btn.status"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUPPORT_DESSC)) - uiMap["game_setting_ui.bg.player_id_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.COPY_ID)) - uiMap["game_setting_ui.bg.exchange_btn.status"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1)) - + self.uiMap["game_setting_ui.bg.title"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC)) + self.uiMap["game_setting_ui.bg.music_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_MUSIC)) + self.uiMap["game_setting_ui.bg.voice_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_VOICE)) + self.uiMap["game_setting_ui.bg.language_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_LANGUAGE)) + self.uiMap["game_setting_ui.bg.tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.SERVICE_DESC)) + self.uiMap["game_setting_ui.bg.tx_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.PRIVACY_DESC)) + local version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion() + self.uiMap["game_setting_ui.bg.version_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLIENT_VERSION, version)) local language = I18N:getCurLanguage() - uiMap["game_setting_ui.bg.language_btn.status"]:setSprite(GConst.ATLAS_PATH.UI_SETTING, "language_" .. language) - if CS.BF.BFMain.IsShenhe then - uiMap["game_setting_ui.bg.bg"]:setVisible(false) - end - - uiMap["game_setting_ui.bg.tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.SERVICE_DESC)) - uiMap["game_setting_ui.bg.tx_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.PRIVACY_DESC)) - - self.helpNode = uiMap["game_setting_ui.help_node"] - local helpTipsBG = uiMap["game_setting_ui.help_node.help_tips"] - local helpTips = uiMap["game_setting_ui.help_node.help_tips.desc"] - helpTips:setText(I18N:getGlobalText(I18N.GlobalConst.BIND_INFO_TIPS)) - local h = helpTips:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredHeight - helpTips:setSizeDeltaY(h) - helpTipsBG:setSizeDeltaY(h + 39) - self.helpNode:setActive(false) + self.uiMap["game_setting_ui.bg.language_btn.status"]:setSprite(GConst.ATLAS_PATH.UI_SETTING, "language_" .. language) + local acountId = DataManager.PlayerData:getAcountId() or GConst.EMPTY_STRING + self.uiMap["game_setting_ui.bg.player_id"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1, acountId)) self:refreshMusic() self:refreshVoice() - - self:refreshShenhe() - self:refreshBGHeight() end function GameSettingUI:_addListeners() - local uiMap = self.root:genAllChildren() - uiMap["game_setting_ui.bg.close_btn"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.close_btn"]:addClickListener(function() self:closeUI() end) - uiMap["game_setting_ui.bg.music_bg"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.music_bg"]:addClickListener(function() local status = AudioManager:isMusicEnabled() if not status then AudioManager:setMusicVolume(1) @@ -82,14 +59,14 @@ function GameSettingUI:_addListeners() if CS.BF.BFMain.IsWhite then self.clickMusicCount = self.clickMusicCount + 1 if self.clickMusicCount > CHECK_WHITE_LIST_COUNT then - GFunc.showToast("Please don’t frequently operate") + GFunc.showToast("Please don't frequently operate") end end self:refreshMusic() end) - uiMap["game_setting_ui.bg.voice_bg"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.voice_bg"]:addClickListener(function() local status = AudioManager:isEffectEnabled() if not status then AudioManager:setEffectVolume(1) @@ -99,65 +76,29 @@ function GameSettingUI:_addListeners() self:refreshVoice() end) - uiMap["game_setting_ui.bg.language_btn"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.language_btn"]:addClickListener(function() ModuleManager.GameSettingManager:showLanguageUI() end) - uiMap["game_setting_ui.bg.support_btn"]:addClickListener(function() - ModuleManager.GameSettingManager:sendSupport() - DataManager.AiHelpData:setUnreadCount() - end) - - uiMap["game_setting_ui.bg.player_id_btn"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.player_id_btn"]:addClickListener(function() -- GFunc.copyStr(objectId) end) - uiMap["game_setting_ui.bg.bg.facebook"]:addClickListener(function() - local url = GConst.GameSettingConst.SOCIAL_URL[I18N:getCurLanguage()] - if not url then - url = GConst.GameSettingConst.SOCIAL_URL.normal - end - GFunc.openUrl(url) - end) - - uiMap["game_setting_ui.bg.bg.discord"]:addClickListener(function() - local url = GConst.GameSettingConst.COMMUNITY_URL[I18N:getCurLanguage()] - if not url then - url = GConst.GameSettingConst.COMMUNITY_URL.normal - end - GFunc.openUrl(url) - end) - - uiMap["game_setting_ui.bg.exchange_btn"]:addClickListener(function() - ModuleManager.GameSettingManager:showCdkeyUI() - end) - - uiMap["game_setting_ui.bg.tx_1"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.tx_1"]:addClickListener(function() GFunc.openUrl("https://cobbygame.com/tos.html") end) - uiMap["game_setting_ui.bg.tx_2"]:addClickListener(function() + self.uiMap["game_setting_ui.bg.tx_2"]:addClickListener(function() GFunc.openUrl("https://www.cobbygame.com/pp.html") end) - - uiMap["game_setting_ui.bg.point"]:addClickListener(function() - if self.helpNode then - self.helpNode:setActive(true) - end - end) - - self.helpNode:addClickListener(function() - self.helpNode:setActive(false) - end) end function GameSettingUI:_bind() end function GameSettingUI:refreshMusic() - local uiMap = self.root:genAllChildren() - local offIcon = uiMap["game_setting_ui.bg.music_bg.off"] - local onIcon = uiMap["game_setting_ui.bg.music_bg.on"] + local offIcon = self.uiMap["game_setting_ui.bg.music_bg.off"] + local onIcon = self.uiMap["game_setting_ui.bg.music_bg.on"] local status = AudioManager:isMusicEnabled() offIcon:setVisible(status ~= true) @@ -165,37 +106,12 @@ function GameSettingUI:refreshMusic() end function GameSettingUI:refreshVoice() - local uiMap = self.root:genAllChildren() - local offIcon = uiMap["game_setting_ui.bg.voice_bg.off"] - local onIcon = uiMap["game_setting_ui.bg.voice_bg.on"] + local offIcon = self.uiMap["game_setting_ui.bg.voice_bg.off"] + local onIcon = self.uiMap["game_setting_ui.bg.voice_bg.on"] local status = AudioManager:isEffectEnabled() offIcon:setVisible(status ~= true) onIcon:setVisible(status == true) end -function GameSettingUI:refreshShenhe() - local uiMap = self.root:genAllChildren() - local codeBtn = uiMap["game_setting_ui.bg.exchange_btn"] - local codeBg = uiMap["game_setting_ui.bg.exchange_bg"] - - local supportBtn = uiMap["game_setting_ui.bg.support_btn"] - local supportBg = uiMap["game_setting_ui.bg.support_bg"] - - codeBtn:setActive(not GFunc.isShenhe()) - codeBg:setActive(not GFunc.isShenhe()) - supportBtn:setActive(not GFunc.isShenhe()) - supportBg:setActive(not GFunc.isShenhe()) -end - -function GameSettingUI:refreshBGHeight() - local uiMap = self.root:genAllChildren() - local bg = uiMap["game_setting_ui.bg"] - local communityBg = uiMap["game_setting_ui.bg.bg"] - local h = BG_HEIGHT[I18N:getCurLanguage()] - h = h or BG_HEIGHT.NORMAL - bg:setSizeDeltaY(h) - communityBg:setVisible(BG_HEIGHT[I18N:getCurLanguage()] == nil) -end - return GameSettingUI \ No newline at end of file diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index da04c290..f5c3aa8e 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -32,4 +32,15 @@ function PlayerData:getExpPercent() return 0 end +function PlayerData:getAccountInfo() + if not self.accountInfo then + self.accountInfo = LocalData:getAccountInfo() + end + return self.accountInfo +end + +function PlayerData:getAcountId() + return self:getAccountInfo().id or GConst.EMPTY_STRING +end + return PlayerData \ No newline at end of file From 1ca913bfcef271f3461393bb9e5caf2d86599058 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 20:39:33 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/global/global_const.lua | 1 + lua/app/ui/game_setting/cell.meta | 8 +++ .../ui/game_setting/cell/language_cell.lua | 17 +++++ .../game_setting/cell/language_cell.lua.meta | 10 +++ lua/app/ui/game_setting/game_setting_ui.lua | 5 +- lua/app/ui/game_setting/language_ui.lua | 67 +++++++++++++++++++ lua/app/ui/game_setting/language_ui.lua.meta | 10 +++ 7 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 lua/app/ui/game_setting/cell.meta create mode 100644 lua/app/ui/game_setting/cell/language_cell.lua create mode 100644 lua/app/ui/game_setting/cell/language_cell.lua.meta create mode 100644 lua/app/ui/game_setting/language_ui.lua create mode 100644 lua/app/ui/game_setting/language_ui.lua.meta diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index bf4ed0de..0f1efeb8 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -177,6 +177,7 @@ GConst.ATLAS_PATH = { ICON_SKILL_ROGUE = "assets/arts/atlas/icon/skill_rogue.asset", ICON_BUFF = "assets/arts/atlas/icon/buff.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset", + UI_SETTING = "assets/arts/atlas/ui/setting.asset", } GConst.TOUCH_EVENT = { diff --git a/lua/app/ui/game_setting/cell.meta b/lua/app/ui/game_setting/cell.meta new file mode 100644 index 00000000..930edd3a --- /dev/null +++ b/lua/app/ui/game_setting/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1db3a47fe64cce642a9453b2eac43c74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/game_setting/cell/language_cell.lua b/lua/app/ui/game_setting/cell/language_cell.lua new file mode 100644 index 00000000..fd5f16ef --- /dev/null +++ b/lua/app/ui/game_setting/cell/language_cell.lua @@ -0,0 +1,17 @@ +local LanguageCell = class("LanguageCell", BaseCell) + +function LanguageCell:refresh(language, selected) + local uiMap = self:getUIMap() + if selected then + uiMap["language_cell.bg"]:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_4") + else + uiMap["language_cell.bg"]:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_3") + end + uiMap["language_cell.name_bg"]:setSprite(GConst.ATLAS_PATH.UI_SETTING, "language_" .. language) +end + +function LanguageCell:addClickListener(func) + self:getBaseObject():addClickListener(func) +end + +return LanguageCell \ No newline at end of file diff --git a/lua/app/ui/game_setting/cell/language_cell.lua.meta b/lua/app/ui/game_setting/cell/language_cell.lua.meta new file mode 100644 index 00000000..e6ca34d7 --- /dev/null +++ b/lua/app/ui/game_setting/cell/language_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0aa5175460330d44383c4069d901229a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/game_setting/game_setting_ui.lua b/lua/app/ui/game_setting/game_setting_ui.lua index c1802443..97a15638 100644 --- a/lua/app/ui/game_setting/game_setting_ui.lua +++ b/lua/app/ui/game_setting/game_setting_ui.lua @@ -80,8 +80,9 @@ function GameSettingUI:_addListeners() ModuleManager.GameSettingManager:showLanguageUI() end) - self.uiMap["game_setting_ui.bg.player_id_btn"]:addClickListener(function() - -- GFunc.copyStr(objectId) + self.uiMap["game_setting_ui.bg.player_bg.player_id_btn"]:addClickListener(function() + local acountId = DataManager.PlayerData:getAcountId() or GConst.EMPTY_STRING + GFunc.copyStr(acountId) end) self.uiMap["game_setting_ui.bg.tx_1"]:addClickListener(function() diff --git a/lua/app/ui/game_setting/language_ui.lua b/lua/app/ui/game_setting/language_ui.lua new file mode 100644 index 00000000..a7f6e5ce --- /dev/null +++ b/lua/app/ui/game_setting/language_ui.lua @@ -0,0 +1,67 @@ +local LanguageUI = class("LanguageUI", BaseUI) + +local LANGUAGE_CELL = "app/ui/game_setting/cell/language_cell" + +function LanguageUI:isFullScreen() + return false +end + +function LanguageUI:ctor() + self.languageList = I18N:getSupportLanguageList() +end + +function LanguageUI:getPrefabPath() + return "assets/prefabs/ui/setting/language_ui.prefab" +end + +function LanguageUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() + + self:_display() + self:_addListeners() + + self:refreshScrollRect() +end + +function LanguageUI:_display() + local titleTx = self.uiMap["language_ui.bg.title_tx"] + titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.LANGUAGE_DESC)) +end + +function LanguageUI:_addListeners() + local closeBtn = self.uiMap["language_ui.bg.close_btn"] + closeBtn:addClickListener(function() + self:closeUI() + end) +end + +function LanguageUI:refreshScrollRect() + local scroll = self.uiMap["language_ui.bg.scrollrect"] + self.scrollRect = scroll:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRect:addInitCallback(function() + return LANGUAGE_CELL + end) + self.scrollRect:addRefreshCallback(function(index, cell) + local language = self.languageList[index] + cell:refresh(language) + cell:addClickListener(function() + self:closeUI() + local changeStatus = I18N:setLanguage(language) + if changeStatus then + local FontManager = require "app/common/font_manager" + FontManager:changeLanguage(I18N:getCurLanguage() or GConst.LANGUAGE.ENGLISH, function() + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.I18N_CHANGE_LANGUAGE) + UIManager:closeAllUI() + UIManager:hideToastAndMessageBox() + UIManager:clearUIPrefabCache() + UIManager:refreshOnChangeLanguage() + ModuleManager.MaincityManager:showMainCityUI() + end) + end + end) + end) + self.scrollRect:clearCells() + self.scrollRect:refillCells(#self.languageList) +end + +return LanguageUI \ No newline at end of file diff --git a/lua/app/ui/game_setting/language_ui.lua.meta b/lua/app/ui/game_setting/language_ui.lua.meta new file mode 100644 index 00000000..c315cccb --- /dev/null +++ b/lua/app/ui/game_setting/language_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 62a3daa3b0d6b444a8d0d42bb69d8dea +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} From 3c6a53833843fc2a130d8a47213f9286f8e349fd Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 21:10:41 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 20 + lua/app/config/act_gift.lua.meta | 10 + lua/app/config/bounty_level.lua | 3246 +++++++++++++++++ lua/app/config/bounty_level.lua.meta | 10 + lua/app/config/bounty_time.lua | 16 + lua/app/config/bounty_time.lua.meta | 10 + lua/app/config/buff.lua | 151 +- lua/app/config/const.lua | 38 +- lua/app/config/func_open.lua | 5 +- lua/app/config/item.lua | 19 +- .../localization_global_const.lua | 13 + lua/app/config/player_initial.lua | 16 +- lua/app/config/recharge.lua | 24 +- lua/app/config/strings/cn/global.lua | 13 + lua/app/config/strings/cn/item.lua | 6 +- lua/app/config/strings/de/item.lua | 5 +- lua/app/config/strings/en/item.lua | 5 +- lua/app/config/strings/fr/item.lua | 5 +- lua/app/config/strings/id/item.lua | 5 +- lua/app/config/strings/ja/item.lua | 5 +- lua/app/config/strings/ko/item.lua | 5 +- lua/app/config/strings/pt/item.lua | 5 +- lua/app/config/strings/ru/item.lua | 5 +- lua/app/config/strings/th/item.lua | 5 +- lua/app/config/strings/vi/item.lua | 5 +- lua/app/config/strings/zh/item.lua | 5 +- lua/app/config/task.lua | 1324 +++++++ lua/app/config/task.lua.meta | 10 + lua/app/config/task_daily.lua | 712 ++++ lua/app/config/task_daily.lua.meta | 10 + lua/app/ui/game_setting/game_setting_ui.lua | 24 +- lua/app/userdata/player/player_data.lua | 4 + 32 files changed, 5685 insertions(+), 51 deletions(-) create mode 100644 lua/app/config/act_gift.lua create mode 100644 lua/app/config/act_gift.lua.meta create mode 100644 lua/app/config/bounty_level.lua create mode 100644 lua/app/config/bounty_level.lua.meta create mode 100644 lua/app/config/bounty_time.lua create mode 100644 lua/app/config/bounty_time.lua.meta create mode 100644 lua/app/config/task.lua create mode 100644 lua/app/config/task.lua.meta create mode 100644 lua/app/config/task_daily.lua create mode 100644 lua/app/config/task_daily.lua.meta diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua new file mode 100644 index 00000000..9ea84d79 --- /dev/null +++ b/lua/app/config/act_gift.lua @@ -0,0 +1,20 @@ +local act_gift = { + [10002]={ + ["type"]=1, + ["recharge_id"]=11, + ["time_type"]=3, + ["limit"]=1, + ["value"]=3000 + }, + [10102]={ + ["type"]=1, + ["recharge_id"]=12, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + } +} +local config = { +data=act_gift,count=2 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_gift.lua.meta b/lua/app/config/act_gift.lua.meta new file mode 100644 index 00000000..d55d0ae6 --- /dev/null +++ b/lua/app/config/act_gift.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9037b2202013c9046ac4eedf305785f4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua new file mode 100644 index 00000000..aecab977 --- /dev/null +++ b/lua/app/config/bounty_level.lua @@ -0,0 +1,3246 @@ +local bounty_level = { + [101]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [102]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [103]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [104]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [105]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [106]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [107]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [108]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [109]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [110]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [111]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [112]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [113]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [114]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [115]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [116]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [117]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [118]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [119]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [120]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [121]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [122]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [123]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [124]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [125]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [126]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [127]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [128]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [129]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [130]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [131]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [132]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [133]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [134]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [135]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [136]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [137]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [138]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [139]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [140]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [141]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [142]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [143]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [144]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [145]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [146]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [147]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [148]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [149]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [150]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [151]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [152]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [153]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [154]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [155]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [156]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [157]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [158]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [159]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [160]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [161]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [162]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [163]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [164]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [165]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [166]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [167]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [168]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [169]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [170]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [171]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [172]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [173]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [174]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [175]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [176]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [177]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [178]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [179]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [180]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [181]={ + ["season"]=1, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [201]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [202]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [203]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [204]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [205]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [206]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [207]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [208]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [209]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [210]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [211]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [212]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [213]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [214]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [215]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [216]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [217]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [218]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [219]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [220]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [221]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [222]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [223]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [224]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [225]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [226]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [227]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [228]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [229]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [230]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [231]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [232]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [233]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [234]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [235]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [236]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [237]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [238]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [239]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [240]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [241]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [242]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [243]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [244]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [245]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [246]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [247]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [248]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [249]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [250]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [251]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [252]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [253]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [254]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [255]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [256]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [257]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [258]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [259]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [260]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [261]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [262]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [263]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [264]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [265]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [266]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [267]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [268]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [269]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [270]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [271]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [272]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [273]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [274]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [275]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [276]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [277]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [278]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [279]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [280]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [281]={ + ["season"]=2, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } +} +local config = { +data=bounty_level,count=162 +} +return config \ No newline at end of file diff --git a/lua/app/config/bounty_level.lua.meta b/lua/app/config/bounty_level.lua.meta new file mode 100644 index 00000000..ae96ac2f --- /dev/null +++ b/lua/app/config/bounty_level.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 199d01ef77e81dc44abed0f43f5216b4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua new file mode 100644 index 00000000..18e4076d --- /dev/null +++ b/lua/app/config/bounty_time.lua @@ -0,0 +1,16 @@ +local bounty_time = { + [1]={ + ["season"]=1, + ["start_time"]="2023-5-1 00:00:00", + ["end_time"]="2022-6-1 00:00:00" + }, + [2]={ + ["season"]=2, + ["start_time"]="2023-6-1 00:00:00", + ["end_time"]="2022-7-1 00:00:00" + } +} +local config = { +data=bounty_time,count=2 +} +return config \ No newline at end of file diff --git a/lua/app/config/bounty_time.lua.meta b/lua/app/config/bounty_time.lua.meta new file mode 100644 index 00000000..ace98fbf --- /dev/null +++ b/lua/app/config/bounty_time.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2decbbf35f1a242498a1f08a5b279630 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 9445d96d..ec69687d 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -37,139 +37,165 @@ local buff = { [7]={ ["name"]="dec_dmg_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1, ["icon"]="dec_dmg_red_add" }, [8]={ ["name"]="dec_dmg_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2, ["icon"]="dec_dmg_yellow_add" }, [9]={ ["name"]="dec_dmg_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3, ["icon"]="dec_dmg_green_add" }, [10]={ ["name"]="dec_dmg_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4, ["icon"]="dec_dmg_blue_add" }, [11]={ ["name"]="dec_dmg_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5, ["icon"]="dec_dmg_purple_add" }, [12]={ ["name"]="dec_dmg_all_add", ["buff_type"]=1, + ["stack"]=2, ["icon"]="dec_dmg_all_add" }, [13]={ ["name"]="weakness_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1, ["icon"]="weakness_red_add" }, [14]={ ["name"]="weakness_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2, ["icon"]="weakness_yellow_add" }, [15]={ ["name"]="weakness_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3, ["icon"]="weakness_green_add" }, [16]={ ["name"]="weakness_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4, ["icon"]="weakness_blue_add" }, [17]={ ["name"]="weakness_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5, ["icon"]="weakness_purple_add" }, [18]={ ["name"]="weakness_all_add", ["buff_type"]=1, + ["stack"]=2, ["icon"]="weakness_all_add" }, [19]={ ["name"]="dmg_addition_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1 }, [20]={ ["name"]="dmg_addition_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2 }, [21]={ ["name"]="dmg_addition_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3 }, [22]={ ["name"]="dmg_addition_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4 }, [23]={ ["name"]="dmg_addition_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5 }, [24]={ ["name"]="dmg_addition_all_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [25]={ ["name"]="atkp_color_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [26]={ ["name"]="atkp_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1 }, [27]={ ["name"]="atkp_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2 }, [28]={ ["name"]="atkp_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3 }, [29]={ ["name"]="atkp_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4 }, [30]={ ["name"]="atkp_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5 }, [31]={ ["name"]="wavehealp", ["buff_type"]=5, + ["stack"]=2, ["formula"]=2 }, [32]={ ["name"]="heal", ["buff_type"]=5, + ["stack"]=2, ["formula"]=3, ["fx_get"]={ 300025 @@ -178,6 +204,7 @@ local buff = { [33]={ ["name"]="stun", ["buff_type"]=8, + ["stack"]=2, ["icon"]="stun", ["fx_continued"]={ 13 @@ -196,11 +223,13 @@ local buff = { }, [35]={ ["name"]="atkp_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [36]={ ["name"]="normal_attack_dec", ["buff_type"]=1, + ["stack"]=2, ["icon"]="normal_attack_dec", ["fx_continued"]={ 12 @@ -208,39 +237,48 @@ local buff = { }, [37]={ ["name"]="normal_attack_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [38]={ ["name"]="block", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [39]={ ["name"]="hpp_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [40]={ ["name"]="crit_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [41]={ ["name"]="crit_time_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [42]={ ["name"]="exp_time_add", - ["buff_type"]=7 + ["buff_type"]=7, + ["stack"]=2 }, [43]={ ["name"]="cured_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2 }, [44]={ ["name"]="add_skill", - ["buff_type"]=7 + ["buff_type"]=7, + ["stack"]=2 }, [45]={ ["name"]="skill_fire_times", - ["buff_type"]=7 + ["buff_type"]=7, + ["stack"]=2 }, [46]={ ["name"]="shield_rebound_200", @@ -252,6 +290,75 @@ local buff = { ["fx_disappear"]={ 14 } + }, + [47]={ + ["name"]="burn", + ["buff_type"]=4, + ["stack"]=1, + ["formula"]=4 + }, + [48]={ + ["name"]="vulnerable", + ["buff_type"]=1 + }, + [49]={ + ["name"]="frozen", + ["buff_type"]=8 + }, + [50]={ + ["name"]="poison", + ["buff_type"]=4, + ["stack"]=2 + }, + [51]={ + ["name"]="Imprison", + ["buff_type"]=7 + }, + [52]={ + ["name"]="corrupt", + ["buff_type"]=1 + }, + [53]={ + ["name"]="bleed", + ["buff_type"]=7 + }, + [54]={ + ["name"]="weaken", + ["buff_type"]=1 + }, + [55]={ + ["name"]="lethargy", + ["buff_type"]=8, + ["stack"]=1 + }, + [56]={ + ["name"]="curse", + ["buff_type"]=7 + }, + [57]={ + ["name"]="lock", + ["buff_type"]=7 + }, + [58]={ + ["name"]="first_hand", + ["buff_type"]=7 + }, + [59]={ + ["name"]="skill_hurt_add", + ["buff_type"]=1 + }, + [60]={ + ["name"]="undead", + ["buff_type"]=7 + }, + [61]={ + ["name"]="counterattack", + ["buff_type"]=7, + ["stack"]=1 + }, + [62]={ + ["name"]="thorns", + ["buff_type"]=7 } } local keys = { @@ -301,12 +408,28 @@ local keys = { ["cured_add"]=buff[43], ["add_skill"]=buff[44], ["skill_fire_times"]=buff[45], - ["shield_rebound_200"]=buff[46] + ["shield_rebound_200"]=buff[46], + ["burn"]=buff[47], + ["vulnerable"]=buff[48], + ["frozen"]=buff[49], + ["poison"]=buff[50], + ["Imprison"]=buff[51], + ["corrupt"]=buff[52], + ["bleed"]=buff[53], + ["weaken"]=buff[54], + ["lethargy"]=buff[55], + ["curse"]=buff[56], + ["lock"]=buff[57], + ["first_hand"]=buff[58], + ["skill_hurt_add"]=buff[59], + ["undead"]=buff[60], + ["counterattack"]=buff[61], + ["thorns"]=buff[62] } } local config = { data=buff, keys=keys, -count=46 +count=62 } return config \ No newline at end of file diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index a6efdb32..631a68bf 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -41,9 +41,45 @@ local const = { }, ["act_gold_pig_full_cd"]={ ["value"]=12 + }, + ["stamina_diamond_buy"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["stamina_diamond_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["stamina_diamond_times"]={ + ["value"]=3 + }, + ["stamina_ad_buy"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["stamina_ad_times"]={ + ["value"]=5 } } local config = { -data=const,count=12 +data=const,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index f9f386d0..dcb0fa2c 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -2,9 +2,12 @@ local func_open = { ["act_gold_pig"]={ ["stage"]=3, ["pop_ups"]=1 + }, + ["task"]={ + ["stage"]=2 } } local config = { -data=func_open,count=1 +data=func_open,count=2 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 529b8867..d64382f7 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -101,6 +101,23 @@ local item = { } } }, + [7]={ + ["type"]=1, + ["qlt"]=5, + ["icon"]="7" + }, + [8]={ + ["type"]=4 + }, + [9]={ + ["type"]=4 + }, + [10]={ + ["type"]=4 + }, + [11]={ + ["type"]=4 + }, [12001]={ ["type"]=5, ["parameter"]=12001, @@ -151,6 +168,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index cbe85a4d..b7c4e7b3 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -56,6 +56,19 @@ local LocalizationGlobalConst = CLICK_COPY_ACOUNT_DESC = "CLICK_COPY_ACOUNT_DESC", APP = "APP", CHAPTER_DESC_1 = "CHAPTER_DESC_1", + SETTING_DESC = "SETTING_DESC", + SETTING_DESC_MUSIC = "SETTING_DESC_MUSIC", + SETTING_DESC_VOICE = "SETTING_DESC_VOICE", + SETTING_DESC_LANGUAGE = "SETTING_DESC_LANGUAGE", + SERVICE_DESC = "SERVICE_DESC", + PRIVACY_DESC = "PRIVACY_DESC", + CLIENT_VERSION = "CLIENT_VERSION", + BIND_ACCOUNT_DESC = "BIND_ACCOUNT_DESC", + CHANGE_ACCOUNT_DESC = "CHANGE_ACCOUNT_DESC", + DELETE_ACCOUNT_DESC = "DELETE_ACCOUNT_DESC", + SETTING_DESC_1 = "SETTING_DESC_1", + ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC", + LANGUAGE_DESC = "LANGUAGE_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/player_initial.lua b/lua/app/config/player_initial.lua index 4937c5e8..62240c39 100644 --- a/lua/app/config/player_initial.lua +++ b/lua/app/config/player_initial.lua @@ -1,15 +1,5 @@ local player_initial = { [1]={ - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=60, - ["num_for_nothing"]="UAg=" - } - }, - [2]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -19,7 +9,7 @@ local player_initial = { ["num_for_nothing"]="Vw==" } }, - [3]={ + [2]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -29,7 +19,7 @@ local player_initial = { ["num_for_nothing"]="Vw==" } }, - [4]={ + [3]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -41,6 +31,6 @@ local player_initial = { } } local config = { -data=player_initial,count=4 +data=player_initial,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/recharge.lua b/lua/app/config/recharge.lua index 7a83bdc9..6e1a406c 100644 --- a/lua/app/config/recharge.lua +++ b/lua/app/config/recharge.lua @@ -76,10 +76,18 @@ local recharge = { ["price"]=9.99, ["price_cn"]=68, ["same_price"]=10, - ["price_str"]="$9.99", + ["price_str"]="9.99", ["score"]=10 }, [11]={ + ["payId"]="com.idle.ko.io.11.99dollar", + ["price"]=11.99, + ["price_cn"]=78, + ["same_price"]=12, + ["price_str"]="11.99", + ["score"]=12 + }, + [12]={ ["payId"]="com.idle.ko.io.14.99dollar", ["price"]=14.99, ["price_cn"]=98, @@ -87,7 +95,7 @@ local recharge = { ["price_str"]="$14.99", ["score"]=15 }, - [12]={ + [13]={ ["payId"]="com.idle.ko.io.19.99dollar", ["price"]=19.99, ["price_cn"]=128, @@ -95,7 +103,7 @@ local recharge = { ["price_str"]="$19.99", ["score"]=20 }, - [13]={ + [14]={ ["payId"]="com.idle.ko.io.24.99dollar", ["price"]=24.99, ["price_cn"]=168, @@ -103,7 +111,7 @@ local recharge = { ["price_str"]="$24.99", ["score"]=25 }, - [14]={ + [15]={ ["payId"]="com.idle.ko.io.29.99dollar", ["price"]=29.99, ["price_cn"]=198, @@ -111,7 +119,7 @@ local recharge = { ["price_str"]="$29.99", ["score"]=30 }, - [15]={ + [16]={ ["payId"]="com.idle.ko.io.49.99dollar", ["price"]=49.99, ["price_cn"]=328, @@ -119,7 +127,7 @@ local recharge = { ["price_str"]="$49.99", ["score"]=50 }, - [16]={ + [17]={ ["payId"]="com.idle.ko.io.69.99dollar", ["price"]=69.99, ["price_cn"]=448, @@ -127,7 +135,7 @@ local recharge = { ["price_str"]="$69.99", ["score"]=70 }, - [17]={ + [18]={ ["payId"]="com.idle.ko.io.99.99dollar", ["price"]=99.99, ["price_cn"]=648, @@ -137,6 +145,6 @@ local recharge = { } } local config = { -data=recharge,count=17 +data=recharge,count=18 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 4efc14bc..6a090e33 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -56,6 +56,19 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "点击复制用户ID", ["APP"] = "版本号：", ["CHAPTER_DESC_1"] = "最高纪录：{0}", + ["SETTING_DESC"] = "设置", + ["SETTING_DESC_MUSIC"] = "音乐", + ["SETTING_DESC_VOICE"] = "音效", + ["SETTING_DESC_LANGUAGE"] = "语言", + ["SERVICE_DESC"] = "使用条款", + ["PRIVACY_DESC"] = "隐私政策", + ["CLIENT_VERSION"] = "当前版本:{0}", + ["BIND_ACCOUNT_DESC"] = "绑定账号", + ["CHANGE_ACCOUNT_DESC"] = "切换账号", + ["DELETE_ACCOUNT_DESC"] = "删除账号", + ["SETTING_DESC_1"] = "ID:{0}", + ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定", + ["LANGUAGE_DESC"] = "语言", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 693de2dc..418865cf 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -23,6 +23,10 @@ local item = { ["name"]="史诗英雄", ["desc"]="可以获得史诗英雄。" }, + [7]={ + ["name"]="通行证积分", + ["desc"]="累计积分可提升通行证等级。" + }, [12001]={ ["name"]="洛克西英雄碎片", ["desc"]="洛克西英雄碎片,凑齐可解锁或升级。" @@ -57,6 +61,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index bf76d4ba..b0fc1100 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 707063e3..2fa10f58 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -22,6 +22,9 @@ local item = { [6]={ ["name"]="Epic Hero", ["desc"]="Allows you to get an epic hero" + }, + [7]={ + }, [12001]={ ["name"]="Roxy Shard", @@ -57,6 +60,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index 08e1088c..e7fddf46 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index da41fab0..04f2ceab 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index e4c19683..bf3d32f7 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index d6a06409..d51699a7 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 820447e5..68eddb8e 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -18,6 +18,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -45,6 +48,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 8e5b2364..9505cbf1 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -16,6 +16,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -43,6 +46,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 8e5b2364..9505cbf1 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -16,6 +16,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -43,6 +46,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index f646c2c7..4aeba37a 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 00969123..7b9abb78 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -22,6 +22,9 @@ local item = { [6]={ ["name"]="史詩英雄", ["desc"]="可以獲得史詩英雄。" + }, + [7]={ + }, [12001]={ ["name"]="洛克西英雄碎片", @@ -57,6 +60,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua new file mode 100644 index 00000000..81639699 --- /dev/null +++ b/lua/app/config/task.lua @@ -0,0 +1,1324 @@ +local task = { + [1]={ + ["type"]=1, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [2]={ + ["type"]=20, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [3]={ + ["type"]=21, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [4]={ + ["type"]=2, + ["number"]=500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [5]={ + ["type"]=2, + ["number"]=650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [6]={ + ["type"]=2, + ["number"]=800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [7]={ + ["type"]=2, + ["number"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [8]={ + ["type"]=3, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=3 + }, + [9]={ + ["type"]=3, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=3 + }, + [10]={ + ["type"]=3, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=3 + }, + [11]={ + ["type"]=3, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=3 + }, + [12]={ + ["type"]=4, + ["number"]=500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [13]={ + ["type"]=4, + ["number"]=650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [14]={ + ["type"]=4, + ["number"]=800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [15]={ + ["type"]=4, + ["number"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [16]={ + ["type"]=5, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=3 + }, + [17]={ + ["type"]=5, + ["number"]=65, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=3 + }, + [18]={ + ["type"]=5, + ["number"]=80, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=3 + }, + [19]={ + ["type"]=5, + ["number"]=100, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=3 + }, + [20]={ + ["type"]=6, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [21]={ + ["type"]=6, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [22]={ + ["type"]=6, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [23]={ + ["type"]=6, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [24]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=10 + }, + [25]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=10 + }, + [26]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=10 + }, + [27]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=10 + }, + [28]={ + ["type"]=8, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=5 + }, + [29]={ + ["type"]=8, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=5 + }, + [30]={ + ["type"]=8, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=5 + }, + [31]={ + ["type"]=8, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=5 + }, + [32]={ + ["type"]=9, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [33]={ + ["type"]=9, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [34]={ + ["type"]=9, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [35]={ + ["type"]=9, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [36]={ + ["type"]=10, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=4 + }, + [37]={ + ["type"]=10, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=4 + }, + [38]={ + ["type"]=10, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=4 + }, + [39]={ + ["type"]=10, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=4 + }, + [40]={ + ["type"]=11, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=5 + }, + [41]={ + ["type"]=11, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=5 + }, + [42]={ + ["type"]=11, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=5 + }, + [43]={ + ["type"]=11, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=5 + }, + [44]={ + ["type"]=12, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [45]={ + ["type"]=12, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [46]={ + ["type"]=12, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [47]={ + ["type"]=12, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [48]={ + ["type"]=13, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [49]={ + ["type"]=13, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [50]={ + ["type"]=13, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [51]={ + ["type"]=13, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [52]={ + ["type"]=14, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [53]={ + ["type"]=14, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [54]={ + ["type"]=14, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [55]={ + ["type"]=14, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [56]={ + ["type"]=15, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [57]={ + ["type"]=15, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [58]={ + ["type"]=15, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [59]={ + ["type"]=15, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [60]={ + ["type"]=16, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [61]={ + ["type"]=16, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [62]={ + ["type"]=16, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [63]={ + ["type"]=16, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [64]={ + ["type"]=17, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [65]={ + ["type"]=17, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [66]={ + ["type"]=17, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [67]={ + ["type"]=17, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [68]={ + ["type"]=18, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [69]={ + ["type"]=18, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [70]={ + ["type"]=18, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [71]={ + ["type"]=18, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [72]={ + ["type"]=19, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [73]={ + ["type"]=19, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [74]={ + ["type"]=19, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [75]={ + ["type"]=19, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [76]={ + ["type"]=2, + ["number"]=1200, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [77]={ + ["type"]=3, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=3 + }, + [78]={ + ["type"]=5, + ["number"]=120, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=3 + }, + [79]={ + ["type"]=6, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [80]={ + ["type"]=7, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=10 + }, + [81]={ + ["type"]=8, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=5 + }, + [82]={ + ["type"]=9, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [83]={ + ["type"]=10, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=4 + }, + [84]={ + ["type"]=11, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=5 + }, + [85]={ + ["type"]=12, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [86]={ + ["type"]=13, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [87]={ + ["type"]=14, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [88]={ + ["type"]=15, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [89]={ + ["type"]=16, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [90]={ + ["type"]=17, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [91]={ + ["type"]=18, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [92]={ + ["type"]=19, + ["number"]=35, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/task.lua.meta b/lua/app/config/task.lua.meta new file mode 100644 index 00000000..5c5725ad --- /dev/null +++ b/lua/app/config/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5124369656d774c49b1c69aae81c3f9e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua new file mode 100644 index 00000000..67728cc0 --- /dev/null +++ b/lua/app/config/task_daily.lua @@ -0,0 +1,712 @@ +local task_daily = { + [1]={ + ["type"]=1, + ["reset"]=2, + ["task"]={ + { + 1, + 100 + } + } + }, + [2]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 2, + 100 + } + } + }, + [3]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 4, + 100 + }, + { + 5, + 100 + }, + { + 6, + 100 + }, + { + 8, + 100 + }, + { + 9, + 100 + }, + { + 10, + 100 + } + }, + ["ad_task"]={ + { + 7, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [4]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 12, + 100 + }, + { + 13, + 100 + }, + { + 14, + 100 + }, + { + 16, + 100 + }, + { + 17, + 100 + }, + { + 18, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 15, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [5]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 32, + 100 + }, + { + 33, + 100 + }, + { + 34, + 100 + }, + { + 72, + 100 + }, + { + 73, + 100 + }, + { + 74, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 35, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [6]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 56, + 100 + }, + { + 57, + 100 + }, + { + 58, + 100 + }, + { + 60, + 100 + }, + { + 61, + 100 + }, + { + 62, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 59, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [7]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 3, + 100 + } + } + }, + [8]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 68, + 100 + }, + { + 69, + 100 + }, + { + 70, + 100 + }, + { + 52, + 100 + }, + { + 53, + 100 + }, + { + 54, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 71, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1, + ["bounty"]=1 + }, + [9]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 26, + 100 + }, + { + 27, + 100 + }, + { + 76, + 50 + }, + { + 77, + 50 + } + } + }, + [10]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 38, + 100 + }, + { + 39, + 100 + }, + { + 78, + 50 + } + } + }, + [11]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 50, + 100 + }, + { + 51, + 100 + }, + { + 91, + 50 + } + } + }, + [12]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 66, + 100 + }, + { + 67, + 100 + }, + { + 82, + 50 + } + } + }, + [13]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 30, + 100 + }, + { + 31, + 100 + } + } + }, + [14]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 87, + 50 + }, + { + 42, + 100 + }, + { + 43, + 100 + } + } + }, + [15]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 88, + 50 + }, + { + 89, + 50 + }, + { + 46, + 100 + }, + { + 47, + 100 + } + }, + ["bounty"]=1 + }, + [16]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 92, + 100 + }, + { + 22, + 100 + }, + { + 23, + 100 + } + }, + ["bounty"]=1 + } +} +local config = { +data=task_daily,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/task_daily.lua.meta b/lua/app/config/task_daily.lua.meta new file mode 100644 index 00000000..2f5f3abd --- /dev/null +++ b/lua/app/config/task_daily.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3f8b7577440284a40a0c05d699d80292 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/game_setting/game_setting_ui.lua b/lua/app/ui/game_setting/game_setting_ui.lua index 97a15638..8dd0dbc4 100644 --- a/lua/app/ui/game_setting/game_setting_ui.lua +++ b/lua/app/ui/game_setting/game_setting_ui.lua @@ -37,12 +37,34 @@ function GameSettingUI:_display() local language = I18N:getCurLanguage() self.uiMap["game_setting_ui.bg.language_btn.status"]:setSprite(GConst.ATLAS_PATH.UI_SETTING, "language_" .. language) local acountId = DataManager.PlayerData:getAcountId() or GConst.EMPTY_STRING - self.uiMap["game_setting_ui.bg.player_id"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1, acountId)) + self.uiMap["game_setting_ui.bg.player_bg.player_id"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1, acountId)) + self:initLoginBtn() self:refreshMusic() self:refreshVoice() end +function GameSettingUI:initLoginBtn() + self.uiMap["game_setting_ui.bg.google_sign_btn"]:addClickListener(function() + + end) + if DataManager.PlayerData:getIsBinded() then + self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACCOUNT_ALREADY_BINDED_DESC)) + else + self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BIND_ACCOUNT_DESC)) + end + + self.uiMap["game_setting_ui.bg.google_switch_btn"]:addClickListener(function() + + end) + self.uiMap["game_setting_ui.bg.google_switch_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHANGE_ACCOUNT_DESC)) + + local deleteTx = self.uiMap["game_setting_ui.bg.delete_tx"] + deleteTx:setText(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_DESC)) + deleteTx:addClickListener(function() + end) +end + function GameSettingUI:_addListeners() self.uiMap["game_setting_ui.bg.close_btn"]:addClickListener(function() self:closeUI() diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index f5c3aa8e..48758815 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -43,4 +43,8 @@ function PlayerData:getAcountId() return self:getAccountInfo().id or GConst.EMPTY_STRING end +function PlayerData:getIsBinded() + return false +end + return PlayerData \ No newline at end of file From d930b3ded7cd65f3f5fa212b633ecf649be5dcf3 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 8 May 2023 21:45:28 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game_setting/game_setting_manager.lua | 4 +++ lua/app/module/maincity/maincity_const.lua | 1 - .../ui/game_setting/select_other_btn_ui.lua | 28 +++++++++++++++++++ .../select_other_btn_ui.lua.meta} | 2 +- .../main_city/cell/side_bar_setting_cell.lua | 16 ----------- lua/app/ui/main_city/main_city_ui.lua | 1 + 6 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 lua/app/ui/game_setting/select_other_btn_ui.lua rename lua/app/ui/{main_city/cell/side_bar_setting_cell.lua.meta => game_setting/select_other_btn_ui.lua.meta} (86%) delete mode 100644 lua/app/ui/main_city/cell/side_bar_setting_cell.lua diff --git a/lua/app/module/game_setting/game_setting_manager.lua b/lua/app/module/game_setting/game_setting_manager.lua index 1cdb889e..a5960745 100644 --- a/lua/app/module/game_setting/game_setting_manager.lua +++ b/lua/app/module/game_setting/game_setting_manager.lua @@ -1,5 +1,9 @@ local GameSettingManager = class("GameSettingManager", BaseModule) +function GameSettingManager:showSelectOtherBtnUI() + UIManager:showUI("app/ui/game_setting/select_other_btn_ui", {aniType = UIManager.ANI_TYPE.NONE}) +end + function GameSettingManager:showSettingUI() UIManager:showUI("app/ui/game_setting/game_setting_ui") end diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 526909c7..af51a5d4 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -17,7 +17,6 @@ MainCityConst.BOTTOM_MODULE_KEY = { MainCityConst.BOTTOM_COUNT = 2 MainCityConst.LEFT_SIDE_BARS = { - "app/ui/main_city/cell/side_bar_setting_cell", "app/ui/main_city/cell/side_bar_idle_cell", "app/ui/main_city/cell/side_bar_seven_days_cell", -- gm放最后一个 diff --git a/lua/app/ui/game_setting/select_other_btn_ui.lua b/lua/app/ui/game_setting/select_other_btn_ui.lua new file mode 100644 index 00000000..c0a6553f --- /dev/null +++ b/lua/app/ui/game_setting/select_other_btn_ui.lua @@ -0,0 +1,28 @@ +local SelectOtherBtnUI = class("SelectOtherBtnUI", BaseUI) + +function SelectOtherBtnUI:ctor() +end + +function SelectOtherBtnUI:isFullScreen() + return false +end + +function SelectOtherBtnUI:getPrefabPath() + return "assets/prefabs/ui/setting/select_other_btn_ui.prefab" +end + +function SelectOtherBtnUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() + self.uiMap["select_other_btn_ui.bg.mail_btn"]:addClickListener(function() + + end) + self.uiMap["select_other_btn_ui.bg.mail_btn.text"]:setText("临时文本:邮箱") + + self.uiMap["select_other_btn_ui.bg.setting_btn"]:addClickListener(function() + self:closeUI() + ModuleManager.GameSettingManager:showSettingUI() + end) + self.uiMap["select_other_btn_ui.bg.setting_btn.text"]:setText("临时文本:设置") +end + +return SelectOtherBtnUI \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_setting_cell.lua.meta b/lua/app/ui/game_setting/select_other_btn_ui.lua.meta similarity index 86% rename from lua/app/ui/main_city/cell/side_bar_setting_cell.lua.meta rename to lua/app/ui/game_setting/select_other_btn_ui.lua.meta index 89141ca4..18358b8e 100644 --- a/lua/app/ui/main_city/cell/side_bar_setting_cell.lua.meta +++ b/lua/app/ui/game_setting/select_other_btn_ui.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d6207c01bdc5884b8306334809a2a99 +guid: 2fd6ec9adda664c4cbb4741a9bad1e9e ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/main_city/cell/side_bar_setting_cell.lua b/lua/app/ui/main_city/cell/side_bar_setting_cell.lua deleted file mode 100644 index ecdc1090..00000000 --- a/lua/app/ui/main_city/cell/side_bar_setting_cell.lua +++ /dev/null @@ -1,16 +0,0 @@ -local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" -local SideBarSettingCell = class("SideBarMailCell", SideBarBaseCellComp) - -function SideBarSettingCell:getIsOpen() - return true -end - -function SideBarSettingCell:getIconRes() - return "maincity_gm" -end - -function SideBarSettingCell:onClick() - ModuleManager.GameSettingManager:showSettingUI() -end - -return SideBarSettingCell \ No newline at end of file diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index e94a9ad8..e1790e86 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -427,6 +427,7 @@ end function MainCityUI:initSetting() self.settingbtn = self.uiMap["main_ui.top_node.setting_btn"] self.settingbtn:addClickListener(function() + ModuleManager.GameSettingManager:showSelectOtherBtnUI() end) end From de1dcb85d523f2054844070c661a26853765aab2 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 09:43:35 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=B8=BB=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/game_setting/select_other_btn_ui.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/game_setting/select_other_btn_ui.lua b/lua/app/ui/game_setting/select_other_btn_ui.lua index c0a6553f..cd68ed82 100644 --- a/lua/app/ui/game_setting/select_other_btn_ui.lua +++ b/lua/app/ui/game_setting/select_other_btn_ui.lua @@ -13,8 +13,11 @@ end function SelectOtherBtnUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() + self.uiMap["select_other_btn_ui.mask"]:addClickListener(function() + self:closeUI() + end) self.uiMap["select_other_btn_ui.bg.mail_btn"]:addClickListener(function() - + self:closeUI() end) self.uiMap["select_other_btn_ui.bg.mail_btn.text"]:setText("临时文本:邮箱") From 247b595bba8c64035448d2add9d0df37534d79e7 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 11:04:23 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/game_setting/cell/language_cell.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/app/ui/game_setting/cell/language_cell.lua b/lua/app/ui/game_setting/cell/language_cell.lua index fd5f16ef..f964ae28 100644 --- a/lua/app/ui/game_setting/cell/language_cell.lua +++ b/lua/app/ui/game_setting/cell/language_cell.lua @@ -1,9 +1,9 @@ local LanguageCell = class("LanguageCell", BaseCell) -function LanguageCell:refresh(language, selected) +function LanguageCell:refresh(language) local uiMap = self:getUIMap() - if selected then - uiMap["language_cell.bg"]:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_4") + if language == I18N:getCurLanguage() then + uiMap["language_cell.bg"]:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_12") else uiMap["language_cell.bg"]:setSprite(GConst.ATLAS_PATH.COMMON, "common_board_3") end From 4b6ee24312f878dcc32fb27315ba7c0175894685 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 14:52:36 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E4=BD=93=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 5 +- lua/app/common/data_manager.lua | 2 +- lua/app/common/module_manager.lua | 2 + lua/app/global/global_func.lua | 31 ++++- lua/app/module/commerce.meta | 8 ++ lua/app/module/commerce/commerce_manager.lua | 41 +++++++ .../module/commerce/commerce_manager.lua.meta | 10 ++ lua/app/net/net_manager.lua | 43 ++----- lua/app/ui/commerce.meta | 8 ++ lua/app/ui/commerce/buy_vit_ui.lua | 106 ++++++++++++++++++ lua/app/ui/commerce/buy_vit_ui.lua.meta | 10 ++ .../ui/currency_bar/cell/currency_cell.lua | 8 +- lua/app/userdata/player/player_data.lua | 31 ++++- 13 files changed, 256 insertions(+), 49 deletions(-) create mode 100644 lua/app/module/commerce.meta create mode 100644 lua/app/module/commerce/commerce_manager.lua create mode 100644 lua/app/module/commerce/commerce_manager.lua.meta create mode 100644 lua/app/ui/commerce.meta create mode 100644 lua/app/ui/commerce/buy_vit_ui.lua create mode 100644 lua/app/ui/commerce/buy_vit_ui.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 927e70cf..93810646 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -50,10 +50,13 @@ BIReport.ITEM_GET_TYPE = { CHAPTER_BOX = "ChapterBox", CROSS_DAY = "CrossDay", RECOVERY_TIME = "RecoveryTime", + ADS_BUY_VIT = "AdsBuyVit", + GEM_BUY_VIT = "GemBuyVit", } BIReport.ADS_CLICK_TYPE = { - BATTLE_SKILL_REFRESH = "BattleSkillRefresh" + BATTLE_SKILL_REFRESH = "BattleSkillRefresh", + AD_ENERGY = "AdEnergy", } BIReport.FIGHT_OPT_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index eddb0e9c..01a1b570 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -102,7 +102,7 @@ function DataManager:initWithServerData(data) Logger.printTable(data) end self.todayFirstLogin = data.today_first_login - self.PlayerData:init(data.basic_info) + self.PlayerData:init(data) self.ChapterData:init(data.chapter) self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 0ad23c1b..6c08cef8 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -22,6 +22,8 @@ local MODULE_PATHS = { GameSettingManager = "app/module/game_setting/game_setting_manager", -- 活动 ActivityManager = "app/module/activity/activity_manager", + -- 商城,礼包 + CommerceManager = "app/module/commerce/commerce_manager", } -- 这里的key对应func_open里的id diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 49f443c4..1f5b7aac 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -1453,13 +1453,36 @@ function GFunc.getRewardTable(type, id, count) return { type = type, id = id, - count = { - unit = count.unit, - value = count.value, - } + count = count } end +function GFunc.formatRewardsToServerStruct(rewardList) + local rewards = {} + for _, reward in ipairs(rewardList) do + local serverReward = GFunc.getServerRewardTable(reward.type, reward.id, reward.count) + table.insert(rewards, serverReward) + end + return rewards +end + +function GFunc.getServerRewardTable(type, id, count) + if type == GConst.REWARD_TYPE.ITEM then + return GFunc.getServerItemRewardTable(id, count) + end +end + +function GFunc.getServerItemRewardTable(id, count) + local reward = { + type = GConst.REWARD_TYPE.ITEM, + item = { + id = id, + count = count + }, + } + return reward +end + function GFunc.getServerRuneRewardTable(id, level) return { type = GConst.REWARD_TYPE.RUNES, diff --git a/lua/app/module/commerce.meta b/lua/app/module/commerce.meta new file mode 100644 index 00000000..0541e82d --- /dev/null +++ b/lua/app/module/commerce.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d54bbe4cb4f12b40a7468ffd4f3e6c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/commerce/commerce_manager.lua b/lua/app/module/commerce/commerce_manager.lua new file mode 100644 index 00000000..462f9a19 --- /dev/null +++ b/lua/app/module/commerce/commerce_manager.lua @@ -0,0 +1,41 @@ +local CommerceManager = class("CommerceManager", BaseModule) + +function CommerceManager:showBuyVitUI() + UIManager:showUI("app/ui/commerce/buy_vit_ui") +end + +function CommerceManager:onBuyVit(isFree) + local responseData = { + energy_limit = { + diamond_count = 0, + ad_count = 0 + } + } + if isFree then + local reward = ConfigManager:getConfig("const")["stamina_ad_buy"].reward + responseData.rewards = {reward} + self:sendMessage(ProtoMsgType.FromMsgEnum.EnergyByADReq, {}, responseData, self.onBuyBitFinish, BIReport.ITEM_GET_TYPE.ADS_BUY_VIT) + else + local reward = ConfigManager:getConfig("const")["stamina_diamond_buy"].reward + responseData.rewards = {reward} + local cost = ConfigManager:getConfig("const")["stamina_diamond_cost"].reward + responseData.costs = {cost} + self:sendMessage(ProtoMsgType.FromMsgEnum.EnergyByDiamondReq, {}, responseData, self.onBuyBitFinish, BIReport.ITEM_GET_TYPE.GEM_BUY_VIT) + end +end + +function CommerceManager:onBuyBitFinish(data) + if data.status ~= 0 then + return + end + if data.costs then -- 钻石购买 + DataManager.PlayerData:addVitGemBuyCount() + else -- 激励视频 + DataManager.PlayerData:addVitAdBuyCount() + if data.rewards then + GFunc.showRewardBox(data.rewards) + end + end +end + +return CommerceManager \ No newline at end of file diff --git a/lua/app/module/commerce/commerce_manager.lua.meta b/lua/app/module/commerce/commerce_manager.lua.meta new file mode 100644 index 00000000..7addf5de --- /dev/null +++ b/lua/app/module/commerce/commerce_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 34276d361623dd54288d830ef1884b98 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index 8faa6733..032a2682 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -955,44 +955,15 @@ end function NetManager:getNotCheckResponse(msgName) if not EDITOR_MODE then - return false + return true end - -- if msgName == ProtoMsgType.FromMsgEnum.LoginReq or - -- msgName == ProtoMsgType.FromMsgEnum.SyncReq or - -- msgName == ProtoMsgType.FromMsgEnum.ArenaInfoReq or - -- msgName == ProtoMsgType.FromMsgEnum.SummonReq or - -- msgName == ProtoMsgType.FromMsgEnum.MineResearchADReq or - -- msgName == ProtoMsgType.FromMsgEnum.MineResearchResultReq or - -- msgName == ProtoMsgType.FromMsgEnum.IdleRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.IdleExtraRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.GMReq or - -- msgName == ProtoMsgType.FromMsgEnum.MallPayReq or - -- msgName == ProtoMsgType.FromMsgEnum.ChapterPassReq or - -- msgName == ProtoMsgType.FromMsgEnum.MallPaidResultReq or - -- msgName == ProtoMsgType.FromMsgEnum.MineDoReq or - -- msgName == ProtoMsgType.FromMsgEnum.TaskTutorRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.BlessingReq or - -- msgName == ProtoMsgType.FromMsgEnum.MarkGuideReq or - -- msgName == ProtoMsgType.FromMsgEnum.EnterDungeonReq or - -- msgName == ProtoMsgType.FromMsgEnum.FinishedArenaReq or - -- msgName == ProtoMsgType.FromMsgEnum.SettleArenaReq or - -- msgName == ProtoMsgType.FromMsgEnum.SevenDayRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.MonCardRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.ChapterStageRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.BattlePassRewardReq or - -- msgName == ProtoMsgType.FromMsgEnum.ChapterRebornReq or - -- msgName == ProtoMsgType.FromMsgEnum.MineReceiveAwardReq or - -- msgName == ProtoMsgType.FromMsgEnum.MailExtractReq or - -- msgName == ProtoMsgType.FromMsgEnum.MailListReq or - -- msgName == ProtoMsgType.FromMsgEnum.MailDeleteReq or - -- msgName == ProtoMsgType.FromMsgEnum.ExistReq or - -- msgName == ProtoMsgType.FromMsgEnum.BindReq or - -- msgName == ProtoMsgType.FromMsgEnum.DeleteReq - -- then - -- return true - -- end - return true + if msgName == ProtoMsgType.FromMsgEnum.LoginReq or + msgName == ProtoMsgType.FromMsgEnum.SyncReq + then + return true + end + return false end function NetManager:getNotAddCostsRsp(msgName) diff --git a/lua/app/ui/commerce.meta b/lua/app/ui/commerce.meta new file mode 100644 index 00000000..531294aa --- /dev/null +++ b/lua/app/ui/commerce.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be8f452fc0a3e9e498722e397816ec25 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/commerce/buy_vit_ui.lua b/lua/app/ui/commerce/buy_vit_ui.lua new file mode 100644 index 00000000..35f48ac1 --- /dev/null +++ b/lua/app/ui/commerce/buy_vit_ui.lua @@ -0,0 +1,106 @@ +local BuyVitUI = class("BuyVitUI", BaseUI) + +function BuyVitUI:isFullScreen() + return false +end + +function BuyVitUI:showCommonBG() + return false +end + +function BuyVitUI:getPrefabPath() + return "assets/prefabs/ui/commerce/buy_vit_ui.prefab" +end + +function BuyVitUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.root:addClickListener(function() + self:closeUI() + end) + + uiMap["buy_vit_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) + + -- uiMap["buy_vit_ui.bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_1)) + local constCfg = ConfigManager:getConfig("const") + local diamondReward = constCfg["stamina_diamond_buy"].reward + local adReward = constCfg["stamina_ad_buy"].reward + uiMap["buy_vit_ui.bg.cell_1.num_tx"]:setText("x" .. GFunc.getRewardNum(diamondReward)) + uiMap["buy_vit_ui.bg.cell_2.num_tx"]:setText("x" .. GFunc.getRewardNum(adReward)) + + self.descTx1 = uiMap["buy_vit_ui.bg.cell_1.desc_tx"] + self.descTx2 = uiMap["buy_vit_ui.bg.cell_2.desc_tx"] + self.numTx1 = uiMap["buy_vit_ui.bg.cell_1.num_tx_1"] + self.numTx2 = uiMap["buy_vit_ui.bg.cell_2.num_tx_1"] + self.checkImg1 = uiMap["buy_vit_ui.bg.cell_1.check_img"] + self.checkImg2 = uiMap["buy_vit_ui.bg.cell_2.check_img"] + self.iconImg1 = uiMap["buy_vit_ui.bg.cell_1.icon_img_1"] + self.iconImg2 = uiMap["buy_vit_ui.bg.cell_2.icon_img_1"] + + self.buyBtn1 = uiMap["buy_vit_ui.bg.cell_1"] + self.buyBtn2 = uiMap["buy_vit_ui.bg.cell_2"] + self.buyBtn1:addClickListener(function() + local diamondCost = constCfg["stamina_diamond_cost"].reward + if not GFunc.checkCost(GFunc.getRewardId(diamondCost), GFunc.getRewardNum(diamondCost), true, BIReport.ITEM_GET_TYPE.BUY_VIT) then + return + end + ModuleManager.CommerceManager:onBuyVit(false) + end) + self.buyBtn2:addClickListener(function() + BIReport:postAdClick(BIReport.ADS_CLICK_TYPE.AD_ENERGY) + SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.AD_ENERGY, function () + ModuleManager.CommerceManager:onBuyVit(true) + end) + end) + + self:bind(DataManager.PlayerData, "vitGemCount", function() + self:onRefresh() + end) + self:bind(DataManager.PlayerData, "vitADCount", function() + self:onRefresh() + end) +end + +function BuyVitUI:onRefresh() + local gemBuyCount = DataManager.PlayerData:getVitGemBuyCount() + local adBuyCount = DataManager.PlayerData:getVitAdBuyCount() + local maxGemBuy = GFunc.getConstIntValue("stamina_diamond_times") + local maxAdBuy = GFunc.getConstIntValue("stamina_ad_times") + if gemBuyCount < maxGemBuy then + self.buyBtn1:setTouchEnable(true) + self.checkImg1:setVisible(false) + self.iconImg1:setVisible(true) + self.numTx1:setVisible(true) + else + self.buyBtn1:setTouchEnable(false) + self.checkImg1:setVisible(true) + self.iconImg1:setVisible(false) + self.numTx1:setVisible(false) + end + + if adBuyCount < maxAdBuy then + self.buyBtn2:setTouchEnable(true) + self.checkImg2:setVisible(false) + self.iconImg2:setVisible(true) + self.numTx2:setVisible(true) + self.iconImg2:setSprite(GConst.ATLAS_PATH.COMMON, "common_ad", function () + self.iconImg2:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) + else + self.buyBtn2:setTouchEnable(false) + self.checkImg2:setVisible(true) + self.iconImg2:setVisible(false) + self.numTx2:setVisible(false) + end + + self.descTx1:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_2, maxGemBuy - gemBuyCount)) + self.descTx2:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_2, maxAdBuy - adBuyCount)) + + local constCfg = ConfigManager:getConfig("const") + local diamondCost = constCfg["stamina_diamond_cost"].reward + self.numTx1:setText(tostring(GFunc.getRewardNum(diamondCost))) + self.numTx2:setText((maxAdBuy - adBuyCount) .. "/" .. GFunc.getConstIntValue("stamina_ad_times")) +end + +return BuyVitUI \ No newline at end of file diff --git a/lua/app/ui/commerce/buy_vit_ui.lua.meta b/lua/app/ui/commerce/buy_vit_ui.lua.meta new file mode 100644 index 00000000..1462eec8 --- /dev/null +++ b/lua/app/ui/commerce/buy_vit_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ba58a64693303c74195528cd3039f98a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/currency_bar/cell/currency_cell.lua b/lua/app/ui/currency_bar/cell/currency_cell.lua index 4e1cdad1..95e48a3b 100644 --- a/lua/app/ui/currency_bar/cell/currency_cell.lua +++ b/lua/app/ui/currency_bar/cell/currency_cell.lua @@ -31,14 +31,18 @@ function ResourceCell:show(itemId, hideAddImg) self:refreshTextRightNow() end) - self.baseObject:removeClickListener() if itemId == GConst.ItemConst.ITEM_ID_VIT then + self.baseObject:addClickListener(function() + ModuleManager.CommerceManager:showBuyVitUI() + end) + self.addImg:setVisible(true) self.timeTx:setVisible(true) else + self.baseObject:removeClickListener() + self.addImg:setVisible(false) self.timeTx:setVisible(false) end self.itemId = itemId - self.addImg:setVisible(false) -- 没有来源，直接隐藏 end function ResourceCell:updateTime() diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 48758815..48eb48a6 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -1,12 +1,17 @@ local PlayerData = class("PlayerData", BaseData) function PlayerData:init(data) - data = data or {} - self.data.level = data.level or 1 - self.data.exp = data.exp or 0 + local basicInfo = data.basic_info or GConst.EMPTY_TABLE + self.data.level = basicInfo.level or 1 + self.data.exp = basicInfo.exp or 0 self.data.dirty = false - self.data.payAmount = data.pay_amount or 0 - self.lastLoginTime = data.lastLoginTime or Time:getBeginningOfServerToday() + self.data.payAmount = basicInfo.pay_amount or 0 + + local energyLimit = data.energyLimit or GConst.EMPTY_TABLE + self.data.vitGemCount = energyLimit.diamond_count or 0 + self.data.vitADCount = energyLimit.ad_count or 0 + + self.lastLoginTime = basicInfo.lastLoginTime or Time:getBeginningOfServerToday() end function PlayerData:setVit(vit) @@ -47,4 +52,20 @@ function PlayerData:getIsBinded() return false end +function PlayerData:addVitGemBuyCount() + self.data.vitGemCount = self.data.vitGemCount + 1 +end + +function PlayerData:addVitAdBuyCount() + self.data.vitADCount = self.data.vitADCount + 1 +end + +function PlayerData:getVitGemBuyCount() + return self.data.vitGemCount +end + +function PlayerData:getVitAdBuyCount() + return self.data.vitADCount +end + return PlayerData \ No newline at end of file From 8e590c242b4efc76c09d5c1cb8ef9c890b290ab9 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 15:24:20 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/data_manager.lua | 3 +++ lua/app/common/module_manager.lua | 1 + lua/app/ui/main_city/main_city_ui.lua | 10 ++++++++++ lua/app/userdata/task.meta | 8 ++++++++ lua/app/userdata/task/task_data.lua | 10 ++++++++++ lua/app/userdata/task/task_data.lua.meta | 10 ++++++++++ 6 files changed, 42 insertions(+) create mode 100644 lua/app/userdata/task.meta create mode 100644 lua/app/userdata/task/task_data.lua create mode 100644 lua/app/userdata/task/task_data.lua.meta diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 01a1b570..eb47c774 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -15,6 +15,7 @@ function DataManager:init() self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data") self:initManager("ActivityData", "app/userdata/activity/activity_data") self:initManager("GodPigData", "app/userdata/activity/god_pig/god_pig_data") + self:initManager("TaskData", "app/userdata/task/task_data") self:initManager("BountyData", "app/userdata/bounty/bounty_data") -- self:initManager("IdleData", "app/userdata/idle/idle_data") -- self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data") @@ -83,6 +84,7 @@ function DataManager:clear() self.ActivityData:clear() self.GodPigData:clear() self.BountyData:clear() + self.TaskData:clear() -- self.IdleData:clear() -- self.SevenDayData:clear() @@ -111,6 +113,7 @@ function DataManager:initWithServerData(data) self.ActivityData:init() self.GodPigData:init() self.BountyData:init() + self.TaskData:init() -- self.IdleData:clear(data.IdleData) -- self.SevenDayData:init(data.SevenDayData) diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 6c08cef8..626a4cda 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -29,6 +29,7 @@ local MODULE_PATHS = { -- 这里的key对应func_open里的id ModuleManager.MODULE_KEY = { GOLD_PIG = "act_gold_pig", + TASK = "task", } local _moduleMgrs = {} diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index e1790e86..1bbe4a32 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -437,6 +437,7 @@ end function MainCityUI:refreshTopNode() self:refreshBounty() + self:refreshTask() end function MainCityUI:refreshBounty() @@ -450,6 +451,15 @@ function MainCityUI:refreshBounty() self.bountyBanner:setSprite(GConst.ATLAS_PATH.BOUNTY, bannerName) end +function MainCityUI:refreshTask() + local isOpen = DataManager.TaskData:getIsOpen() + if not isOpen then + self.taskBtn:setVisible(false) + return + end + self.taskBtn:setVisible(true) +end + function MainCityUI:switchComp(index) index = index or self.selectedIndex for i, comp in pairs(self.subComps) do diff --git a/lua/app/userdata/task.meta b/lua/app/userdata/task.meta new file mode 100644 index 00000000..58293c1e --- /dev/null +++ b/lua/app/userdata/task.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0598ef97b43c4d344bcb1f11205dd6cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/task/task_data.lua b/lua/app/userdata/task/task_data.lua new file mode 100644 index 00000000..7227b1fa --- /dev/null +++ b/lua/app/userdata/task/task_data.lua @@ -0,0 +1,10 @@ +local TaskData = class("TaskData", BaseData) + +function TaskData:init(data) +end + +function TaskData:getIsOpen() + return ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TASK, true) +end + +return TaskData \ No newline at end of file diff --git a/lua/app/userdata/task/task_data.lua.meta b/lua/app/userdata/task/task_data.lua.meta new file mode 100644 index 00000000..14c7deda --- /dev/null +++ b/lua/app/userdata/task/task_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2a8741d6d926b6848be6dea53c501674 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} From 9531d8438b933dc1fe8462a90dba6c225ead3ad1 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 15:47:37 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/net/net_manager.lua | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index 032a2682..4b516f2c 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -954,16 +954,7 @@ function NetManager:isNotSave(msgName) end function NetManager:getNotCheckResponse(msgName) - if not EDITOR_MODE then - return true - end - - if msgName == ProtoMsgType.FromMsgEnum.LoginReq or - msgName == ProtoMsgType.FromMsgEnum.SyncReq - then - return true - end - return false + return true end function NetManager:getNotAddCostsRsp(msgName) From df3a225ebd80a20f533e01edf7ec07de513a7c09 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 9 May 2023 17:41:27 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/module_manager.lua | 8 ++++++++ lua/app/module/task/task_manager.lua | 4 ++++ lua/app/ui/main_city/main_city_ui.lua | 1 + lua/app/ui/task.meta | 8 ++++++++ lua/app/ui/task/task_main_ui.lua | 21 +++++++++++++++++++++ lua/app/ui/task/task_main_ui.lua.meta | 10 ++++++++++ 6 files changed, 52 insertions(+) create mode 100644 lua/app/ui/task.meta create mode 100644 lua/app/ui/task/task_main_ui.lua create mode 100644 lua/app/ui/task/task_main_ui.lua.meta diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 626a4cda..df1fc7ea 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -1,18 +1,26 @@ local ModuleManager = {} local MODULE_PATHS = { + -- 登录 LoginManager = "app/module/login/login_manager", TipsManager = "app/module/tips/tips_manager", LoadingManager = "app/module/loading/loading_manager", + -- GM DevToolManager = "app/module/gm/dev_tool_manager", + -- 主城 MaincityManager = "app/module/maincity/maincity_manager", -- 引导 TutorialManager = "app/module/tutorial/tutorial_manager", ToastManager = "app/ui/common/toast", + -- 任务 TaskManager = "app/module/task/task_manager", + -- 战斗 BattleManager = "app/module/battle/battle_manager", + -- 战斗阵容 FormationManager = "app/module/formation/formation_manager", + -- 英雄 HeroManager = "app/module/hero/hero_manager", + -- 主线关卡 ChapterManager = "app/module/chapter/chapter_manager", -- 挂机 IdleManager = "app/module/idle/idle_manager", diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 6d1d1b4d..e106bf57 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -1,5 +1,9 @@ local TaskManager = class("TaskManager", BaseModule) +function TaskManager:showTaskMainUI() + UIManager:showUI("app/ui/task/task_main_ui") +end + function TaskManager:registerTask(moduleName, taskType, callback) if not self.registerTaskInfo then self.registerTaskInfo = {} diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 1bbe4a32..88eca47e 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -416,6 +416,7 @@ end function MainCityUI:initTask() self.taskBtn = self.uiMap["main_ui.top_node.task_btn"] self.taskBtn:addClickListener(function() + ModuleManager.TaskManager:showTaskMainUI() end) end diff --git a/lua/app/ui/task.meta b/lua/app/ui/task.meta new file mode 100644 index 00000000..27fe02c4 --- /dev/null +++ b/lua/app/ui/task.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cffadc95327fe2f4aac127d66af1a875 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua new file mode 100644 index 00000000..c6689873 --- /dev/null +++ b/lua/app/ui/task/task_main_ui.lua @@ -0,0 +1,21 @@ +local TaskMainUI = class("TaskMainUI", BaseUI) + +function TaskMainUI:ctor() +end + +function TaskMainUI:isFullScreen() + return false +end + +function TaskMainUI:getPrefabPath() + return "assets/prefabs/ui/task/task_main_ui.prefab" +end + +function TaskMainUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() + self.uiMap["task_main_ui.bg.close_btn"]:addClickListener(function() + self:closeUI() + end) +end + +return TaskMainUI \ No newline at end of file diff --git a/lua/app/ui/task/task_main_ui.lua.meta b/lua/app/ui/task/task_main_ui.lua.meta new file mode 100644 index 00000000..ee816049 --- /dev/null +++ b/lua/app/ui/task/task_main_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5a81ddf78be847a4abd30f5503c7d8c1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}