diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 75ce8bfc15..0a168871c9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -13478,7 +13478,7 @@ Animator: m_Controller: {fileID: 9100000, guid: cd489364b363c7e488d5f7feb9175aba, type: 2} m_CullingMode: 0 m_UpdateMode: 0 - m_ApplyRootMotion: 0 + m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_WarningMessage: m_HasTransformHierarchy: 1 @@ -20027,7 +20027,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.2999878, y: -18.98} + m_AnchoredPosition: {x: -13, y: -18.98} m_SizeDelta: {x: 171.95, y: 30.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1661540442898954606 @@ -34733,8 +34733,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 179, y: 164} + m_AnchoredPosition: {x: -7.845, y: -3} + m_SizeDelta: {x: 159, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5475369139453199335 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index a4a6915a01..241ec7adef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -195,6 +195,9 @@ function Gem:UpdatePanelData(_type) end local nextNum=0 --LogError("progress==============="..progresss) + if isCan==false then + -- self.boxIcon.gameObject:GetComponent("Animator").Play("Entry") + end self.boxIcon.gameObject:GetComponent("Animator").enabled = isCan local curBoxConfig=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.GemLotteryConfig,"Library",_type) if curBoxConfig then @@ -364,7 +367,7 @@ end function Gem:OnOpen() self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Gem }) --self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice }) - self.TabCtrl:Init(self.tab, _TabData,2) + self.TabCtrl:Init(self.tab, _TabData,1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua index af9161406d..1d4289c0d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua @@ -179,7 +179,7 @@ function RewardGemSingleShowPopup:OnShow() this.jumpViewList = {} this.equipQuaText.gameObject:SetActive(true) - this.equipQuaText.text = GetStringByEquipQua(itemData.config.Quality, GetQuaStringByEquipQua(itemData.config.Quality)) + this.equipQuaText.text = GetQuaStringByEquipQua(itemData.config.Quality) this.armorInfo.gameObject:SetActive(true) this.armorTitle.gameObject:SetActive(false) this.armorDesc.gameObject:SetActive(false)