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

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

Browse Source 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
This commit is contained in:
lishuo committed 2021-07-26 14:11:10 +08:00
2 parents 1f3485846f 929fb0a1a7
commit 7d0128d912
15 files changed
+1095 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+14 -14
View File
@@ -81,20 +81,20 @@ public class HomeController : PFUIPanel
//GetSummary();
dict = new Dictionary<string, Sprite[]>
{
{
"BtnMatch",new Sprite[]
{
Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon"),
Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon_hover"),
}
},
{
"BtnTraining",new Sprite[]
{
Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon"),
Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon_hover"),
}
},
//{
// "BtnMatch",new Sprite[]
// {
// Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon"),
// Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon_hover"),
// }
//},
//{
// "BtnTraining",new Sprite[]
// {
// Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon"),
// Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon_hover"),
// }
//},
};
}
private void GoRide(BaseEventData e)