Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

zhengchen 1 жил өмнө
parent
commit
b18deda9a1

+ 9 - 0
.gitignore

@@ -1,3 +1,12 @@
 /.idea/.idea.cockClient2/.idea/
 /Assembly-CSharp*
 /ProjectSettings/
+.DS_Store
+Assembly-CSharp-Editor.csproj
+Assembly-CSharp.csproj
+ProjectSettings/ProjectSettings.asset
+ProjectSettings/ProjectVersion.txt
+Assembly-CSharp-Editor.csproj
+Assembly-CSharp.csproj
+ProjectSettings/ProjectSettings.asset
+ProjectSettings/ProjectVersion.txt

+ 7 - 0
Assets/Scripts/UI/Hall/CockUIItemComp.cs

@@ -22,6 +22,9 @@ public class CockUIItemComp : MonoBehaviour
     public StarComp Start2;
     public StarComp Start3;
 
+    public Text nameText;
+
+
     public Text timesText;
 
     public Text diamondText;
@@ -137,6 +140,10 @@ public class CockUIItemComp : MonoBehaviour
     private void DisplayStars(int cookId)
     {
         var cockType = ConfigManager.Instance.cockTypesMap[cookId];
+
+        Debug.Log("cockId" + cookId + "hp" + cockType.hpStar + "atk" + cockType.atkStar);
+
+
         Start1.setStar(cockType.atkStar);
         Start2.setStar(cockType.hpStar);
         Start3.setStar(cockType.intervalStar);

+ 2 - 2
ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.13f1c1
-m_EditorVersionWithRevision: 2021.3.13f1c1 (07291ec823bf)
+m_EditorVersion: 2021.3.19f1c1
+m_EditorVersionWithRevision: 2021.3.19f1c1 (b8e3cea1e9d3)