From 4518c8c175f4a46e05c08f4c36cc37a5d0757343 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 11:56:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E8=A1=8C=E6=8A=80=E8=83=BDbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Practice/PracticePanel.prefab | 54 +++++++++--------- .../UI/Practice/PracticeSkillInfoPanel.prefab | 55 +++++++++++++++++-- .../~Lua/Modules/Practice/PracticeManager.lua | 6 +- .../Practice/PracticeSkillInfoPanel.lua | 23 ++++++-- 4 files changed, 100 insertions(+), 38 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 56f47472c0..cc207b5e8b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -36099,7 +36099,7 @@ 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: -63.1} + m_AnchoredPosition: {x: 0, y: -59} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4482967724487338822 @@ -36123,7 +36123,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.9333334, b: 0.003921569, a: 1} + m_Color: {r: 0.97654855, g: 0.990566, b: 0.97660744, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -36131,9 +36131,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -36143,7 +36143,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 99 --- !u!1 &5196531749690728303 GameObject: m_ObjectHideFlags: 0 @@ -36954,7 +36954,7 @@ 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: -63.1} + m_AnchoredPosition: {x: 0, y: -59} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2004088883459887790 @@ -36978,7 +36978,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.9333334, b: 0.003921569, a: 1} + m_Color: {r: 0.96724814, g: 0.9811321, b: 0.9673065, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -36986,19 +36986,19 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 0 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 60 --- !u!1 &6352690128292113717 GameObject: m_ObjectHideFlags: 0 @@ -67067,7 +67067,7 @@ 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: -63.1} + m_AnchoredPosition: {x: 0, y: -59} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6218138651294486052 @@ -67091,7 +67091,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.9333334, b: 0.003921569, a: 1} + m_Color: {r: 0.9858491, g: 1, b: 0.9859085, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -67099,9 +67099,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -67111,7 +67111,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 99 --- !u!1 &8199617342560139037 GameObject: m_ObjectHideFlags: 0 @@ -67883,7 +67883,7 @@ 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: -63.1} + m_AnchoredPosition: {x: 0, y: -59} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1633887730655791215 @@ -67907,7 +67907,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.9333334, b: 0.003921569, a: 1} + m_Color: {r: 0.9487807, g: 0.9716981, b: 0.948877, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -67915,11 +67915,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -67927,7 +67927,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 99 --- !u!1 &8988042177267225789 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab index b72863c9e2..5b2cd117aa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab @@ -652,7 +652,7 @@ 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: -60.4} + m_AnchoredPosition: {x: 0, y: -58} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5929159001005513366 @@ -676,7 +676,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.9333334, b: 0.003921569, a: 1} + m_Color: {r: 0.9765041, g: 0.9811321, b: 0.9765236, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -684,9 +684,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -696,7 +696,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 99 --- !u!1 &4482154189229213345 GameObject: m_ObjectHideFlags: 0 @@ -20497,6 +20497,7 @@ GameObject: - component: {fileID: 4046556994563454095} - component: {fileID: 6438122773535378384} - component: {fileID: 3615987540770995332} + - component: {fileID: 4794719050937661115} m_Layer: 5 m_Name: BackMask m_TagString: Untagged @@ -20560,6 +20561,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4794719050937661115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7823522297384688204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3615987540770995332} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &7958738485617101460 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 4bad786176..d69d26120a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -23,7 +23,7 @@ function this.Initialize() this.playerSkillList[value.Id]=0 end end - +--=========================主角技能 function this.GetSkillInfo() return this.playerSkillList end @@ -71,6 +71,10 @@ function this.CheckPlayerSkillRed(redType) local currData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",lv) local nextData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",lv+1) if nextData then + local config=this.GetCurConfigData() + if config and nextData.Level>config.PlayerSkillLvMax then + return false + end local isShow=true for i = 1, #currData.LvupCost do if BagManager.GetItemCountById(currData.LvupCost[i][1])PracticeManager.PracticeLevel then + + local config=PracticeManager.GetCurConfigData() + if nextData.Level>config.PlayerSkillLvMax then self.btn_info.text="升 级" self.hintInfo.gameObject:SetActive(true) self.costImg.gameObject:SetActive(false) Util.SetGray(self.btn_up,true) - self.hintInfo.text="修行到达"..PracticeManager.GetRankNameByLv(nextData.XiuxianId).."后方可升级" + self.hintInfo.text="修行到达"..PracticeManager.GetRankNameByLv(config.RealmId+1).."后方可升级" btnState=2 else self.btn_info.text="升 级" From 25a14f7a79c3f745c799fa97425a6f06449833ad Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 23 Oct 2021 03:01:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=95=86=E5=BA=97=E3=80=91?= =?UTF-8?q?=E5=85=8D=E8=B4=B9=E6=AC=A1=E6=95=B0=E7=9A=84=E5=95=86=E5=BA=97?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E5=88=B7=E6=96=B0=E5=90=8E=E4=BB=8A?= =?UTF-8?q?=E6=97=A5=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E6=BB=A1=E6=AC=A1?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=BB=A1?= =?UTF-8?q?=E6=AC=A1=E5=90=8E=E5=88=B7=E6=96=B0=E7=BA=A2=E7=82=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Shop/ShopManager.lua | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index 9e5972f06c..c971b30cff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -25,6 +25,9 @@ function this.SetSelectIndex(shopType,storeId,b) end function this.Initialize() + -- 是否已经刷新红点标志位 + this.RecoverCountRedFlag = {} + if not this._CountDownTimer then this._CountDownTimer = Timer.New(this.TimeUpdate, 1, -1, true) this._CountDownTimer:Start() @@ -118,7 +121,7 @@ function this.UpdateShopData(msg) local shopInfo = this.GetShopInfo(newdata.id) this.CheckShopRedpot(shopInfo.StoreType) - --Log(string.format("服务器推送商店刷新,商店id = %d", newdata.id)) + -- LogYellow(string.format("服务器推送商店刷新,商店id = %s, 商店类型 = %s", newdata.id, shopInfo.StoreType)) end -- 刷新物品排序 this.SortItemList() @@ -678,9 +681,25 @@ function this.CheckShopRefreshTime() this._IsRefresh = 0 this._RefreshShopList = {} for _, v in ipairs(this.allShopData) do - local leftTime = this.CountShopRefreshLeftTime(v.id) local shopInfo = this.GetShopInfo(v.id) local shopType = shopInfo.StoreType + + -- 判断是否是自动恢复次数的商店,到达最大次数刷新红点显示 + local IsAutoRecoverCount, Count = this.IsAutoRecoverCount(shopType) + if IsAutoRecoverCount then + local MaxCount = shopInfo.IfManualRefresh[1] + if Count >= MaxCount then + if not this.RecoverCountRedFlag[shopType] then + this.RecoverCountRedFlag[shopType] = true + this.CheckShopRedpot(shopType) + end + else + this.RecoverCountRedFlag[shopType] = false + end + end + + -- 判断是否是自动刷新的商店 + local leftTime = this.CountShopRefreshLeftTime(v.id) this._RefreshShopList[shopType] = leftTime -- 判断是否需要刷新商店 if leftTime == 0 then @@ -994,7 +1013,7 @@ end --- 商店的查看时间 local _ShopCheckTime = {} --- 商店刷新按钮的点击状态 -local _RefreshBtnIsClick = {} +-- local _RefreshBtnIsClick = {} -- 检测红点数据,shopType 为空时检测所有商店 function this.ShopCheckRPIsShow(shopType) @@ -1024,9 +1043,9 @@ end -- 检测商店刷新次数是否存在 function this.ShopRefreshRPIsShow(shopType) -- 判断今天商店的刷新按钮是否被点击过 - if _RefreshBtnIsClick[shopType] then - return false - end + -- if _RefreshBtnIsClick[shopType] then + -- return false + -- end -- 没有商店数据 local shopData = this.GetShopDataByType(shopType) if not shopData then @@ -1106,7 +1125,7 @@ function this.LoadRedpotDataFromLocal() -- 检测所有商店 for _, type in pairs(SHOP_TYPE) do _ShopCheckTime[type] = PlayerPrefs.GetInt(PlayerManager.uid.."_ShopRedPot_"..type) - _RefreshBtnIsClick[type] = PlayerPrefs.GetInt(PlayerManager.uid.."_ShopBtnStatus_"..type) == 1 + -- _RefreshBtnIsClick[type] = PlayerPrefs.GetInt(PlayerManager.uid.."_ShopBtnStatus_"..type) == 1 end end @@ -1124,8 +1143,8 @@ end -- 设置商店刷新按钮是否被点击过 function this.SetShopRefreshBtnClickStatus(shopType, status) - PlayerPrefs.SetInt(PlayerManager.uid.."_ShopBtnStatus_"..shopType, status and 1 or 0) - _RefreshBtnIsClick[shopType] = status + -- PlayerPrefs.SetInt(PlayerManager.uid.."_ShopBtnStatus_"..shopType, status and 1 or 0) + -- _RefreshBtnIsClick[shopType] = status this.CheckShopRedpot(shopType) end From 73361ef6c9e5d815a90af924ff9d1ab96710d9c2 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 12:09:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=8E=89=E8=99=9A=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/WorldArena/WorldArenaUpRewardPanel.prefab | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaUpRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaUpRewardPanel.prefab index b50302097e..db8ac1718c 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaUpRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaUpRewardPanel.prefab @@ -36,8 +36,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.00000095367, y: -390.6} - m_SizeDelta: {x: 847.3, y: 205} + m_AnchoredPosition: {x: -0.00000095367, y: -377} + m_SizeDelta: {x: 847.3, y: 177.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7368018991282595720 CanvasRenderer: @@ -125,8 +125,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: 1.885, y: -44.3} - m_SizeDelta: {x: 1080, y: 872} + m_AnchoredPosition: {x: 1.885, y: -59.422} + m_SizeDelta: {x: 1080, y: 902.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1351930385094129617 CanvasRenderer: @@ -757,7 +757,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000030517578} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5343069358979546458 @@ -1110,7 +1110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.3511042} m_AnchorMax: {x: 0.5, y: 0.3511042} - m_AnchoredPosition: {x: 1.9999084, y: -345} + m_AnchoredPosition: {x: 1.9999084, y: -357} m_SizeDelta: {x: 1079, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4386427765453369220 From d93e0a9c4eaa6756cc633f08c6a4a43e2c9e8987 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 13:15:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E5=8A=A8?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Practice/PracticeSkillInfoPanel.prefab | 20 +++++++++++++++++++ .../Practice/PracticeSkillInfoPanel.lua | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab index 5b2cd117aa..76f862a417 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab @@ -15501,6 +15501,7 @@ GameObject: - component: {fileID: 1237362095978058062} - component: {fileID: 6362846184292683999} - component: {fileID: 693504749957046385} + - component: {fileID: 2058181766165023756} m_Layer: 5 m_Name: btn m_TagString: Untagged @@ -15608,6 +15609,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &2058181766165023756 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6646320100333446170} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6705744100673175851 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua index 8a5ddea423..15452f68f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua @@ -107,7 +107,7 @@ function PracticeSkillInfoPanel:RefreshShow(id,lv) Util.SetGray(self.btn_up,true) btnState=2 --未解锁技能 else - + self.lockObj.gameObject:SetActive(false) local config=PracticeManager.GetCurConfigData() if nextData.Level>config.PlayerSkillLvMax then self.btn_info.text="升 级"