diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua index 7704289291..01f8c65cb0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua @@ -5,7 +5,7 @@ GMShuaChongTeQuan = Inherit(BasePanel) self=GMShuaChongTeQuan local sortingOrder = 0 local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷冲GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 }, +local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷充GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 }, [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级GM" ,img = "gm_shuachong_cjGM_01_zh",id=2202,scale=6,all=30 }, [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级GM" ,img = "gm_shuachong_sjGM_01_zh",id=2203,scale=5,all=176 }, [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上GM",img = "gm_shuachong_wsGM_01_zh",id=2204,scale=2,all=1640 }, diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index f3873a89e3..f75bb939fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -314,6 +314,7 @@ function CreateNamePopup:OnOpen(...) view:ResetNameColor(Vector4.New(0.298,0.133,0.10,1)) view:ResetBtnInteractable(false) end + this.rewardGrid:SetActive(false) end function CreateNamePopup:OnShow()