lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source 
# Conflicts:
#	Assets/Scripts/UI/Prefab/MapList/MapItem.cs
This commit is contained in:
Caiyanpeng committed 2021-12-16 16:55:14 +08:00
2 parents 1cb555c13d b9d14a590c
commit 12e0d8d295
11 files changed
+1261 -1207
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+1 -1
View File
@@ -227,7 +227,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
map.IsFavorite = !map.IsFavorite;
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
UIManager.Instance.collectDict[map.IsFavorite];
if (model != null)
if (this.model != null)
{
this.model.IsFavorite = map.IsFavorite;
}