From 04fac7f2169a66ee76b5511b044dc28ccb9fae44 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 7 Nov 2020 15:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AD=82=E5=8D=B0=EF=BC=8C=E6=B3=95=E5=AE=9D?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E9=98=B6=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=AE=E8=82=A4=E7=AB=8B=E7=BB=98=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=AE=E8=82=A4=E6=B4=BB=E5=8A=A8=E7=95=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=81=87=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/ShengYiTianJiang.lua | 17 ++++++++++++++--- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 10 +++------- .../Modules/RoleInfo/RoleTalismanPanelV2.lua | 2 +- .../Modules/RoleInfo/RoleUpStarSuccessPanel.lua | 2 +- .../~Lua/Modules/SoulPrint/SoulPrintPanel.lua | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index e4e402ee2b..01704b0eac 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -6,6 +6,7 @@ local parent = {} local properTypeConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local rechargeConfigId = 0 local rechargeData = {} +local fakeId = 0 function ShengYiTianJiang:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -32,7 +33,16 @@ function ShengYiTianJiang:BindEvent() PayManager.Pay(rechargeConfigId, function(id) this.RechargeSuccessFunc(id) end) end) - Util.AddClick(this.reviewBtn,function() end) + Util.AddClick(this.reviewBtn,function() + local fdata, fseed = BattleManager.GetFakeBattleData(fakeId) + local testFightData = { + fightData = fdata, + fightSeed = fseed, + fightType = 0, + maxRound = 20 + } + UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test) + end) end function this.RechargeSuccessFunc(id) FirstRechargeManager.RefreshAccumRechargeValue(id) @@ -77,8 +87,9 @@ function ShengYiTianJiang:OnShowData() itemsGrid[k].gameObject:SetActive(true) itemsGrid[k]:OnOpen(false, {v[1],v[2]}, 1,false,false,false,sortingOrder) end - - local skinId = tonumber(activityConfig.ExpertDec) + local strs = string.split(activityConfig.ExpertDec,'#') + local skinId = tonumber(strs[1]) + fakeId = tonumber(strs[2]) local skinConfig = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId) local heroSkinSingleProVal = {} for _,v in ipairs(skinConfig.MonomerProperty) do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 4b8884af4a..9bb93abe3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -239,21 +239,17 @@ function RoleInfoPanel:OnShow() teamHero = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL) this:UpdateLiveList()--加载当前 和 左右数据 if this.leftLiveObj and leftHeroData then - LogError(Language[11833]) - poolManager:UnLoadLive(leftHeroData.live, this.leftLiveObj) + poolManager:UnLoadLive(this.leftLiveObj.name, this.leftLiveObj) this.leftLiveObj = nil end if this.rightLiveObj and rightHeroData then - LogError(Language[11834]) - poolManager:UnLoadLive(rightHeroData.live, this.rightLiveObj) + poolManager:UnLoadLive(this.rightLiveObj.name, this.rightLiveObj) this.rightLiveObj = nil end if this.curLiveObj and curHeroData then - LogError(Language[11835]) - poolManager:UnLoadLive(curHeroData.live, this.curLiveObj) + poolManager:UnLoadLive(this.curLiveObj.name, this.curLiveObj) this.curLiveObj = nil end - Util.ClearChild(this.curObj.transform) Util.ClearChild(this.leftObj.transform) Util.ClearChild(this.rightObj.transform) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index a9189da18a..8b78b2a931 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -167,7 +167,7 @@ function this.OnShowHeroAndTalisman() Util.GetGameObject(this.advanceBtn,"Text"):GetComponent("Text").text=Language[11845] end - this.heroIcon.sprite = Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon))--英雄头像 + this.heroIcon.sprite = Util.LoadSprite(curHeroData.icon)--英雄头像 this.heroIcon.gameObject:GetComponent("RectTransform").localScale=Vector3.one*0.72 this.force.text = TalismanManager.CalculateWarForceBase(curTalismanConFig,0)--法宝战力 this.talismanIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[data[2]].ResourceID)) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua index 0a3db532fe..31c17b61fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua @@ -102,7 +102,7 @@ function RoleUpStarSuccessPanel:OnOpen(...) this.UI_Effect_choukaSSR:SetActive(curHeroData.heroConfig.Quality == 5) this.UI_Effect_choukaSR:SetActive(curHeroData.heroConfig.Quality == 4) this.UI_Effect_choukaR:SetActive(curHeroData.heroConfig.Quality == 3) - this.LiveName = GetResourcePath(curHeroData.heroConfig.Live) + this.LiveName = curHeroData.live this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform, Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0)) SetHeroStars(this.starGrid, curHeroData.star+1,1,Vector2.New(60,60),-11,Vector2.New(0.5,0.5)) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index 6bf861c274..7cc975f531 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -307,7 +307,7 @@ end --设置英雄 function this.SetHero() - this.heroIcon.sprite=Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon)) + this.heroIcon.sprite=Util.LoadSprite(curHeroData.icon) -- local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) local allAddProVal --计算面板属性