From b63845938a34440f729c848f702e20c8aaf01d13 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Mar 2021 13:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../n_niuqichongchong_icon_niuqizhi_zh.png | Bin 0 -> 29191 bytes ..._niuqichongchong_icon_niuqizhi_zh.png.meta | 88 ++++++++++++++++++ .../~Lua/Common/GlobalDefine.lua | 3 +- .../NiuQiChongTian/NiuQiChongTianManager.lua | 9 +- .../NiuQiChongTian/NiuQiChongTianPanel.lua | 39 ++++++-- 5 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png create mode 100644 Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png.meta diff --git a/Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png b/Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..e750c2031544dd044fd7eaa1314b29450a217f51 GIT binary patch literal 29191 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%0AoXG6(|u%^x@!WE8& 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 FV1mdCEfD|! literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png.meta b/Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png.meta new file mode 100644 index 0000000000..96990b5b16 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/n_niuqichongchong_icon_niuqizhi_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7b4a035ab46672645be2bbb89bad32b8 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3c624733b1dc1d14f96fb3f54ed7ca8a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5dd00f66da..7cdc3db510 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -474,7 +474,7 @@ PanelType = { HongMengTower = {100,16,14,3},-- 鸿蒙碑 XinJiangLaiXi = {14,16,1210},--新将来袭 XiangYaoDuoBao = {14,16,1220},--降妖夺宝 - NiuQiChongTian = {14,16,1006},--牛气冲天 + NiuQiChongTian = {14,16,1300},--牛气冲天 } @@ -1144,6 +1144,7 @@ TaskTypeDef = { FindTreasure = 8, -- 迷宫寻宝任务 Achievement = 9, -- 所有成就任务 DynamicActTask = 10, --主题活动任务 + NiuQiChongTian = 11,--牛气冲天任务 } --商品类型 diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index b0edf1549b..7f4948e2e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -24,7 +24,7 @@ function this.GetProgressData() data.missionId = value.missionId data.reward = v.Reward data.value = v.Values - if curScore >= data.value then + if curScore >= data.value[2][1] then if value.state == 0 then data.state = 1--可领的 else @@ -64,6 +64,10 @@ end --需要显示的任务数据 function this.GetNeedRewardData() + local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian) + -- for k,v in ipairs(temp) do + -- LogGreen("missionId:"..tostring(v.missionId).." state:"..tostring(v.state)) + -- end local allData = this.GetAllRewardData() local needData = {} for i = 1, 3 do @@ -72,9 +76,10 @@ function this.GetNeedRewardData() for k = 1, 2 do if allData[i][j][k] then local data = {} + data.Id = allData[i][j][k].Id data.Text = allData[i][j][k].Text data.Reward = allData[i][j][k].Reward - data.state = 1 + data.state = temp[data.Id].state table.insert(needData[i],data) end end diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index b7643176af..884c9405bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -9,6 +9,7 @@ local progressData = {} local rewardData = {} local curScore = 0 local itemsGrid = {}--item重复利用 +local curPage = 1 local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "诸神" }, @@ -18,6 +19,12 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} local curIndex = 1 +local BtnState ={ + [0] = {ImgName = "s_slbz_1anniuhuangse",Text = Language[10556]}, + [1] = {ImgName = "s_slbz_1anniuongse",Text = Language[11948]}, + [2] = {ImgName = "s_slbz_1anniuhuise",Text = Language[10101]}, +} + --初始化组件(用于子类重写) function NiuQiChongTian:InitComponent() self.backBtn = Util.GetGameObject(self.gameObject,"backBtn") @@ -87,21 +94,22 @@ end --切换 function this.SwitchView(index) + curPage = index progressData = NiuQiChongTianManager.GetProgressData() curScore = NiuQiChongTianManager.GetScore() rewardData = NiuQiChongTianManager.GetNeedRewardData() - -- NiuQiChongTian:SetProgress() + NiuQiChongTian:SetProgress() NiuQiChongTian:SetReward(index) end function NiuQiChongTian:SetProgress() - self.progress.fillAmount = curScore/progressData[#progressData].Values[1][2] + self.progress.fillAmount = curScore/progressData[#progressData].value[2][1] for i = 1, self.reward.transform.childCount do local item = self.reward.transform:GetChild(i-1) - Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = progressData[i].Reward[1][2] - Util.GetGameObject(item, "Text"):GetComponent("Text").text = progressData[i].Values[1][2] - Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = Util.LoadSprite(artConfig[itemConfig[progressData[i].Reward[1][1]].Icon].Name) + Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = progressData[i].reward[1][2] + Util.GetGameObject(item, "Text"):GetComponent("Text").text = progressData[i].value[2][1] + Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = Util.LoadSprite(artConfig[itemConfig[progressData[i].reward[1][1]].ResourceID].Name) Util.GetGameObject(item, "red"):SetActive(progressData[i].state == 1) local btn = Util.GetGameObject(item, "icon") Util.AddOnceClick(btn,function () @@ -112,7 +120,7 @@ function NiuQiChongTian:SetProgress() end) end) else - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,progressData[i].Reward[1][1],nil) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,progressData[i].reward[1][1],nil) end end) end @@ -128,16 +136,20 @@ end function NiuQiChongTian:SingleDataShow(go, index,data) local title = Util.GetGameObject(go, "title/titleText"):GetComponent("Text") - local btn = Util.GetGameObject(go, "btn") + local btn = Util.GetGameObject(go, "btn"):GetComponent("Button") + local btnImg = Util.GetGameObject(go, "btn"):GetComponent("Image") local btnText = Util.GetGameObject(go, "btn/Text"):GetComponent("Text") local redPoint = Util.GetGameObject(go, "btn/redPoint") local rewardList = Util.GetGameObject(go, "rewardList") local grid = Util.GetGameObject(go, "rewardList") local shadow = Util.GetGameObject(go, "shadow") - title.text = data.Text local shows = data.Reward + title.text = data.Text redPoint:SetActive(data.state == 1) + btn.interactable = data.state ~= 2 + btnImg.sprite = Util.LoadSprite(BtnState[data.state].ImgName) + btnText.text = BtnState[data.state].Text --滚动条复用重设itemview if itemsGrid[go] then for i = 1, 4 do @@ -166,6 +178,17 @@ function NiuQiChongTian:SingleDataShow(go, index,data) end end + Util.AddOnceClick(btn.gameObject,function () + if data.state == 0 then + UIManager.OpenPanel(UIName.RecruitPanel) + elseif data.state == 1 then + NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian,data.Id,function (msg) + UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () + this.SwitchView(curPage) + end) + end) + end + end) end --界面关闭时调用(用于子类重写)