diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_01_zh.png index 43860b0583..4021fb2d89 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_zh.png index 1b3cf62d7a..7fce3bec2a 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yijingbaoku_anniu_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab index b06a623d35..99e168db53 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab @@ -1988,6 +1988,7 @@ GameObject: m_Component: - component: {fileID: 912230736054379625} - component: {fileID: 5346591748100081601} + - component: {fileID: 827396995488172849} m_Layer: 5 m_Name: page9 m_TagString: Untagged @@ -2030,6 +2031,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955189468578492862} m_CullTransparentMesh: 0 +--- !u!114 &827396995488172849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955189468578492862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1985000619848911351 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 942f6439a4..ef566ca2ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -231,8 +231,10 @@ function this.GetBaoKuData() data.rewardId = v.missionId-1000 data.progress = v.progress -- LogYellow("rewardId:"..data.rewardId.." data.progress:"..data.progress) - data.configId = RewardAllConfig[data.rewardId].Id - table.insert(allData,data) + if RewardAllConfig[data.rewardId] then + data.configId = RewardAllConfig[data.rewardId].Id + table.insert(allData,data) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 33a6ebf079..376a19f4e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -92,7 +92,7 @@ function this:SetSingleData(index,item,data) local view = SubUIManager.Open(SubUIConfig.ItemView, icon.transform) itemIconList[item] = view end - itemIconList[item]:OnOpen(false,data.Reward,0.9,false) + itemIconList[item]:OnOpen(false,data.Reward,0.9,false,false,false,sortingOrder) name.text = SubString2(GetLanguageStrById(itemConfig[data.Reward[1]].Name),10) --判断是否选了该物品 if curId == data.Id then