From 808dcddc626deed495c6c260419acfc8ea51eb8b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 19 Nov 2021 11:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5=E7=95=8C?= =?UTF-8?q?=E9=9D=A21=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TagAtlas/ArtFont/r_zjm_shenhun.png.meta | 6 +-- .../Prefabs/UI/Practice/PracticePanel.prefab | 6 +-- .../~Lua/Common/GlobalDefine.lua | 6 +-- .../Modules/TailsManSoul/TailsManSouPanel.lua | 50 ++++++++++++++----- .../TailsManSoul/TailsManSoulManager.lua | 2 +- 5 files changed, 47 insertions(+), 23 deletions(-) diff --git a/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_zjm_shenhun.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_zjm_shenhun.png.meta index 4310802216..6c74bbeeeb 100644 --- a/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_zjm_shenhun.png.meta +++ b/Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_zjm_shenhun.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -85,7 +85,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -123,7 +123,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: TagAtlas pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index ef08a959fa..0cf331cf11 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -37182,9 +37182,9 @@ RectTransform: m_Father: {fileID: 3759887136319108211} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 908.5, y: 635} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -171.5, y: 635} m_SizeDelta: {x: 129.5, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1358751446755459863 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 196e551b47..50150e8187 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3043,7 +3043,7 @@ GetTailsmanDiImage = { } GetTailsmanSoulDiImage = { - [5] = "r_tongyong_duiwudi", - [6] = "r_tongyong_duiwudihong", - [7] = "r_tongyong_duiwudizhuanshi", + [5] = {bg = "f_fabaojuling_zhujiemianjin",tip = "f_fabaojuling_gongmingjin",mask = "f_fabaojuling_huawenjin"}, + [6] = {bg = "f_fabaojuling_zhujiemianhong",tip = "f_fabaojuling_gongminghong",mask = "f_fabaojuling_huawenhong"}, + [7] = {bg = "f_fabaojuling_zhujiemianbaijin",tip = "f_fabaojuling_gongmingbaijin",mask = "f_fabaojuling_huawenbaijin"}, } diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua index 5ca328f1e6..e8dcd4c127 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua @@ -7,11 +7,11 @@ local TabBox = require("Modules/Common/TabBox") local tabs = { [1] = { --金色 default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "金色", - rpType = RedPointType.tailsmanSoul_gold,bg = "t_tianshumijuan_shengjiangditu",quality = 5 + rpType = RedPointType.tailsmanSoul_gold,quality = 5 }, [2] = { --红色 default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "红色", - rpType = RedPointType.tailsmanSoul_red,bg = "t_tianshumijuan_hunyinditu",quality = 6 + rpType = RedPointType.tailsmanSoul_red,quality = 6 }, -- [3] = { --白金 -- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "白金", @@ -25,20 +25,25 @@ local curPage = 1 function TailsManSouPanel:InitComponent() this.spLoader = SpriteLoader.New() self.itemPreList = {} - self.bg = Util.GetGameObject(self.gameObject,"bg/Bg"):GetComponent("Image") + self.bg = Util.GetGameObject(self.gameObject,"bg"):GetComponent("Image") self.tabbox = Util.GetGameObject(self.gameObject,"bg/tabbox") self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack") self.fetterItem = Util.GetGameObject(self.gameObject,"fetterItem") local grid = Util.GetGameObject(self.gameObject,"bg/fetterGrid") local v21 = grid.transform.rect self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,25)) + self.scroll.moveTween.MomentumAmount = 1 + self.scroll.moveTween.Strength = 2 self.empty = Util.GetGameObject(self.gameObject,"bg/NoneImage") self.addBtn = Util.GetGameObject(self.gameObject,"bg/add") + + self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) end --绑定事件(用于子类重写) function TailsManSouPanel:BindEvent() Util.AddClick(self.btnBack, function() + curPage = 1 self:ClosePanel() end) Util.AddClick(self.addBtn, function() @@ -95,12 +100,12 @@ end function TailsManSouPanel:OnOpen(...) local args = {...} curPage = args[1] or 1 - self.tabBox:Init(self.tabbox.gameObject, tabs, curPage) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function TailsManSouPanel:OnShow() - self.bg.sprite = this.spLoader:LoadSprite(tabs[curPage].bg) + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) + self.tabBox:Init(self.tabbox.gameObject, tabs, curPage) curData = TailsManSoulManager.GetTailsmanSoulDatas(tabs[curPage].quality) self:RefreshData() end @@ -132,13 +137,20 @@ function TailsManSouPanel:SetSingleData(go,data,index) if not self.itemPreList[go] then self.itemPreList[go] = {} self.itemPreList[go].obj = Util.GetGameObject(go,"go") - self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image") - self.itemPreList[go].nameText = Util.GetGameObject(self.itemPreList[go].obj,"bg/nameDi/nameText"):GetComponent("Text") + self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin + self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/tip"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin + self.itemPreList[go].mask1 = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/mask1"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin + self.itemPreList[go].mask2 = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/mask2"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin + self.itemPreList[go].nameText = Util.GetGameObject(self.itemPreList[go].obj,"bg/nameDi"):GetComponent("Image") --名字图片 根据表读取 self.itemPreList[go].slider = Util.GetGameObject(self.itemPreList[go].obj,"bg/slider"):GetComponent("Slider") - self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].slider.transform,"tip"):GetComponent("Text") self.itemPreList[go].progress = Util.GetGameObject(self.itemPreList[go].slider.transform,"progress"):GetComponent("Text") self.itemPreList[go].red = Util.GetGameObject(self.itemPreList[go].bg.transform,"red") - self.itemPreList[go].icon = Util.GetGameObject(self.itemPreList[go].bg.transform,"icon"):GetComponent("Image") + self.itemPreList[go].iconList = {} + for i = 1,4 do + self.itemPreList[go].iconList[i] = {} + self.itemPreList[go].iconList[i].go = Util.GetGameObject(self.itemPreList[go].bg.transform,"compGrid/iconDi"..i) + self.itemPreList[go].iconList[i].icon = Util.GetGameObject(self.itemPreList[go].iconList[i].go.transform,"icon"):GetComponent("Image") + end end self.itemPreList[go].data = data if not data then @@ -146,12 +158,22 @@ function TailsManSouPanel:SetSingleData(go,data,index) return end go.gameObject:SetActive(true) - self.itemPreList[go].bg.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality]) - self.itemPreList[go].nameText.text = self.itemPreList[go].data.name + self.itemPreList[go].bg.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality].bg) + self.itemPreList[go].tip.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality].tip) + self.itemPreList[go].mask1.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality].mask) + self.itemPreList[go].mask2.sprite = this.spLoader:LoadSprite(GetTailsmanSoulDiImage[self.itemPreList[go].data.quality].mask) + self.itemPreList[go].nameText.sprite = this.spLoader:LoadSprite(GetResourcePath(self.itemPreList[go].data.icon)) self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList)) - self.itemPreList[go].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(self.itemPreList[go].data.icon)) + for i = 1,math.max(#data.trumpList,#self.itemPreList[go].iconList) do + if not data.trumpList[i] then + self.itemPreList[go].iconList[i].go.gameObject:SetActive(false) + else + self.itemPreList[go].iconList[i].go.gameObject:SetActive(true) + self.itemPreList[go].iconList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(data.trumpList[i].config.Icon)) + end + end Util.AddOnceClick(go,function() UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id) end) @@ -175,7 +197,7 @@ end --界面关闭时调用(用于子类重写) function TailsManSouPanel:OnClose() - curPage = 1 + end --界面销毁时调用(用于子类重写) @@ -187,6 +209,8 @@ function TailsManSouPanel:OnDestroy() SubUIManager.Close(self.scroll) self.itemPreList = {} redPointList = {} + SubUIManager.Close(self.UpView) + curPage = 1 end return TailsManSouPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua index 63c88d697c..2cbb3375a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua @@ -3,7 +3,7 @@ local this = TailsManSoulManager local trumpBook = ConfigManager.GetConfig(ConfigName.TrumpBook) local Trump = ConfigManager.GetConfig(ConfigName.Trump) local TrumpLevelupPool = ConfigManager.GetConfig(ConfigName.TrumpLevelupPool) -local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig) +local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig) this.TailsmanList = {} function this.Initialize() end