diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/ComponudHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab similarity index 99% rename from Assets/ManagedResources/Prefabs/UI/CompoundHero/ComponudHeroPanel.prefab rename to Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index 4e8d4543a4..49debdff87 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/ComponudHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -4555,7 +4555,7 @@ RectTransform: m_GameObject: {fileID: 1961921459115299796} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.00375, y: 0.00375, z: 0.00375} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1053210000696434690} m_Father: {fileID: 4492008349822918777} @@ -4961,7 +4961,7 @@ GameObject: - component: {fileID: 1067434188467956598} - component: {fileID: 5317740808849015281} m_Layer: 5 - m_Name: ComponudHeroPanel + m_Name: CompoundHeroPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/ComponudHeroPanel.prefab.meta b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab.meta similarity index 100% rename from Assets/ManagedResources/Prefabs/UI/CompoundHero/ComponudHeroPanel.prefab.meta rename to Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab.meta diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 210c7c85f3..da27bb2a98 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -33376,7 +33376,7 @@ MonoBehaviour: extension: .prefab resPathIndex: 168 resAbNameIndex: 1561 - - resName: ComponudHeroPanel + - resName: CompoundHeroPanel extension: .prefab resPathIndex: 169 resAbNameIndex: 1561 diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index d781ecd8ba..2bea50c9ee 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -325,7 +325,7 @@ UIName = { TopMatchPlayBattleAinSelectPopup = 324,--巅峰战淘汰赛赛程记录回放 ArenaTopMatchGuessTipViewPopup = 325,--巅峰赛竞猜结果弹窗 DynamicActivityPanel = 326,--轮转活动通用窗口 - CompounHeroPanel = 327,--神将置换、合成界面 + CompoundHeroPanel = 327,--神将置换、合成界面 } diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua similarity index 85% rename from Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua rename to Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua index c8f754e2c6..2d375c3c17 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua @@ -3,18 +3,18 @@ CompoundHeroPanel = Inherit(BasePanel) local this = CompoundHeroPanel local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将置换" }, - -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将合成" }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将合成" }, } 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 this.contents = { - [1] = {view = require("Modules/CompoundHero/view/CompoundPanel_Replace"), panelName = "CompoundPanel_Replace"}, - -- [2] = {view = require("Modules/CompoundHero/view/CompoundPanel_Compound"), panelName = "CompoundPanel_Compound"}, + [1] = {view = require("Modules/CompoundHero/view/CompoundHero_Replace"), panelName = "CompoundHero_Replace"}, + [2] = {view = require("Modules/CompoundHero/view/CompoundHero_Compound"), panelName = "CompoundHero_Compound"}, } --初始化组件(用于子类重写) -function CompoundPanel:InitComponent() +function CompoundHeroPanel:InitComponent() this.HelpBtn = Util.GetGameObject(self.gameObject,"helpBtn") this.helpPosition=this.HelpBtn:GetComponent("RectTransform").localPosition @@ -32,7 +32,7 @@ function CompoundPanel:InitComponent() end --绑定事件(用于子类重写) -function CompoundPanel:BindEvent() +function CompoundHeroPanel:BindEvent() Util.AddClick(this.btnBack, function() self:ClosePanel() end) @@ -41,7 +41,7 @@ function CompoundPanel:BindEvent() end end -function CompoundPanel.RefreshHelpBtn() +function CompoundHeroPanel.RefreshHelpBtn() if curIndex==1 then this.HelpBtn:SetActive(true) Util.AddOnceClick(this.HelpBtn, function() @@ -63,32 +63,32 @@ function CompoundPanel.RefreshHelpBtn() end --添加事件监听(用于子类重写) -function CompoundPanel:AddListener() +function CompoundHeroPanel:AddListener() for i = 1, #this.contents do this.contents[i].view:AddListener() end end --移除事件监听(用于子类重写) -function CompoundPanel:RemoveListener() +function CompoundHeroPanel:RemoveListener() for i = 1, #this.contents do this.contents[i].view:RemoveListener() end end --界面打开时调用(用于子类重写) -function CompoundPanel:OnOpen(_curIndex) +function CompoundHeroPanel:OnOpen(_curIndex) curIndex = _curIndex and _curIndex or 1 end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function CompoundPanel:OnShow() +function CompoundHeroPanel:OnShow() this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.SwitchView) this.TabCtrl:Init(this.tabBox, _TabData, curIndex) end -function CompoundPanel:OnSortingOrderChange() +function CompoundHeroPanel:OnSortingOrderChange() this.sortingOrder = self.sortingOrder for i = 1, #this.contents do this.contents[i].view:OnSortingOrderChange(self.sortingOrder) @@ -132,18 +132,18 @@ function this.UpdateCompoundPanel_SoulPrint(equipSign,index) end --界面关闭时调用(用于子类重写) -function CompoundPanel:OnClose() +function CompoundHeroPanel:OnClose() for i = 1, #this.contents do this.contents[i].view:OnClose() end end --界面销毁时调用(用于子类重写) -function CompoundPanel:OnDestroy() +function CompoundHeroPanel:OnDestroy() SubUIManager.Close(this.upView) for i = 1, #this.contents do this.contents[i].view:OnDestroy() end end -return CompoundPanel \ No newline at end of file +return CompoundHeroPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua.meta similarity index 74% rename from Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua.meta rename to Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua.meta index ff239731b7..8402a8f6f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/ComponundHeroPanel.lua.meta +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11b077b4b791771468639d6a639ef33c +guid: 545609cd2a45adf46bbd9a0b590f7a4f DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index e69de29bb2..28c2951eb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -0,0 +1,33 @@ +----- 神将合成 ----- +local this = {} +local sortingOrder=0 + +function this:InitComponent(gameObject) + +end + +function this:BindEvent() + +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnSortingOrderChange(_sortingOrder) + sortingOrder = _sortingOrder +end + +function this:OnShow(...) + +end + +function this:OnClose() +end + +function this:OnDestroy() +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index e69de29bb2..d882255556 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -0,0 +1,33 @@ +----- 神将置换 ----- +local this = {} +local sortingOrder=0 + +function this:InitComponent(gameObject) + +end + +function this:BindEvent() + +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnSortingOrderChange(_sortingOrder) + sortingOrder = _sortingOrder +end + +function this:OnShow(...) + +end + +function this:OnClose() +end + +function this:OnDestroy() +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 07284c7a95..fe5f6c64a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -219,7 +219,7 @@ function this:InitComponent() this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi") this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld") this.btnWaiDi:SetActive(false) - this.btnCompounHero = Util.GetGameObject(this.gameObject, "scene/layer4/btnCompounHero") + this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer4/btnCompoundHero") this.operateIcon = { [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), @@ -238,7 +238,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.TALENT_TREE] = this:AddFuncItem(this.btnTianFu, -1179), -- [FUNCTION_OPEN_TYPE.DIFFER_DEMONS] = this:AddFuncItem(this.btnYiYao, 0), -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:AddFuncItem(this.btnWaiDi, 0), - [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompounHero, 0),--神将合成、置换 + [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换 } this.operateNewText = { @@ -258,7 +258,7 @@ function this:InitComponent() -- [FUNCTION_OPEN_TYPE.TALENT_TREE] = this:InsertNewText(this.btnTianFu), -- [FUNCTION_OPEN_TYPE.DIFFER_DEMONS] = this:InsertNewText(this.btnYiYao), -- [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this:InsertNewText(this.btnWaiDi), - [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompounHero),--神将合成、置换 + [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换 } -- 红点 @@ -282,7 +282,7 @@ function this:InitComponent() --this.rpGuanxing = Util.GetGameObject(this.btnGuanxing, "redPoint") this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint") this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint") - this.rpCompoundHero = Util.GetGameObject(this.btnCompounHero, "redPoint")--神将合成、置换 + this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换 @@ -788,14 +788,14 @@ function this:BindEvent() end) --神将合成、神将置换 - Util.AddClick(this.btnCompounHero, function() + Util.AddClick(this.btnCompoundHero, function() -- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then -- JumpManager.GoJump(74) -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.COMPOUND_HERO) -- else -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND_HERO)) -- end - UIManager.OpenPanel(UIName.CompounHeroPanel)--开发用,之后删除 释放上面 + UIManager.OpenPanel(UIName.CompoundHeroPanel)--开发用,之后删除 释放上面 end) this.BindRedPoint() diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx index e9dcf007d3..0b1c54f050 100644 Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ diff --git a/data_execl/base_data/UIConfig.xlsx b/data_execl/base_data/UIConfig.xlsx index 3918f7788c..728f6009a7 100644 Binary files a/data_execl/base_data/UIConfig.xlsx and b/data_execl/base_data/UIConfig.xlsx differ