mbunch_kascope преди 1 година
родител
ревизия
535be74613
променени са 3 файла, в които са добавени 43 реда и са изтрити 6 реда
  1. 35 1
      Assets/Scenes/ContinuousControllerScene.unity
  2. 7 4
      Assets/Scripts/CheckCardPanel.cs
  3. 1 1
      ProjectSettings/ProjectSettings.asset

+ 35 - 1
Assets/Scenes/ContinuousControllerScene.unity

@@ -4324,6 +4324,10 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3329c5b9d405f464ebca9d3be4491f24, type: 2}
   - {fileID: 11400000, guid: ba19e86a642716648a7c7e4a52580cfc, type: 2}
   - {fileID: 11400000, guid: 8d6f2508edcc1614a90cc3838114e6fc, type: 2}
+  - {fileID: 11400000, guid: 223e4a1470ac3dd458f86d58648c5345, type: 2}
+  - {fileID: 11400000, guid: 274c9606e9efff84ab1b1d202cac564b, type: 2}
+  - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
+  - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
@@ -4408,6 +4412,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 08bffc393060c28459d64bea8e6e4979, type: 2}
   - {fileID: 11400000, guid: fa218108d5366e2448103b258fb9c890, type: 2}
   - {fileID: 11400000, guid: 1fc84f81a0a0d844e8aa1b091bb634fe, type: 2}
+  - {fileID: 11400000, guid: b5fdbbb0b62596b4895b8df21869a232, type: 2}
+  - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
   - {fileID: 11400000, guid: 99de8b57fc534a740a455255aad17046, type: 2}
   - {fileID: 11400000, guid: dcbf45052e02194418adbe47efa87dee, type: 2}
   - {fileID: 11400000, guid: b6e5c316902d4f14c86a57636a0b145f, type: 2}
@@ -4476,6 +4482,12 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0cdaea2c5d842684b93f26fade928dcf, type: 2}
   - {fileID: 11400000, guid: 3bacafe6e7140364c9113f751eed26f8, type: 2}
   - {fileID: 11400000, guid: 362a8a85a8106244a8b331c2f22cdc08, type: 2}
+  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
+  - {fileID: 11400000, guid: 517d9954b4d9cb64783dab620df7b585, type: 2}
+  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
+  - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
+  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
+  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
   - {fileID: 11400000, guid: 825356da447018b479ff316363a9a555, type: 2}
@@ -4509,6 +4521,11 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 1d6f529e270f06348ac07f573cc30f9c, type: 2}
   - {fileID: 11400000, guid: 0cd79dfaea820654299a03a40b44a7dd, type: 2}
   - {fileID: 11400000, guid: 9cc34051767c68b47a0d9c58bcceba89, type: 2}
+  - {fileID: 11400000, guid: a794a294e74e6b2459890f4aaef50fd7, type: 2}
+  - {fileID: 11400000, guid: 744f3bf871455bb43bb10fe678cdffbf, type: 2}
+  - {fileID: 11400000, guid: 0011de4a49b3d5747874a483b1213dc5, type: 2}
+  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
+  - {fileID: 11400000, guid: fd8ef57a1463e34429218795883ae573, type: 2}
   SortedCardList:
   - {fileID: 11400000, guid: a2d5d459eb08e8e4e9efe55c803b7b73, type: 2}
   - {fileID: 11400000, guid: a0fc0332535f72b4ebf0377a7e5141eb, type: 2}
@@ -8573,15 +8590,32 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 76097ab9becc6d54b84c3dbcd86f6eb2, type: 2}
   - {fileID: 11400000, guid: 7fee62d9f5d86c145bd333f395c1ae46, type: 2}
   - {fileID: 11400000, guid: 84703a7d013036746b25ed635189a16f, type: 2}
+  - {fileID: 11400000, guid: 016e1b63ade136049a3796b9b277ae89, type: 2}
   - {fileID: 11400000, guid: 0429dd15b623d6647b6c691ab320b6a9, type: 2}
   - {fileID: 11400000, guid: 7d6fc4fb6b251a741990fcb5b1a9123d, type: 2}
-  - {fileID: 11400000, guid: 016e1b63ade136049a3796b9b277ae89, type: 2}
   - {fileID: 11400000, guid: ba8383dfb38602d468629f031f61b886, type: 2}
   - {fileID: 11400000, guid: 4fda9c333ac277948b8b5c3fefbd9dbb, type: 2}
   - {fileID: 11400000, guid: b9fa5ed51be46124a8f729d7a085fd11, type: 2}
   - {fileID: 11400000, guid: 84cac9987896e8541a1a8b97f4e94867, type: 2}
   - {fileID: 11400000, guid: a141a1a92b40a3d44b9265260c7537d4, type: 2}
   - {fileID: 11400000, guid: f88b396a2dccf854c9039538225c89e1, type: 2}
+  - {fileID: 11400000, guid: 223e4a1470ac3dd458f86d58648c5345, type: 2}
+  - {fileID: 11400000, guid: 274c9606e9efff84ab1b1d202cac564b, type: 2}
+  - {fileID: 11400000, guid: b5fdbbb0b62596b4895b8df21869a232, type: 2}
+  - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
+  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
+  - {fileID: 11400000, guid: 517d9954b4d9cb64783dab620df7b585, type: 2}
+  - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
+  - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
+  - {fileID: 11400000, guid: a794a294e74e6b2459890f4aaef50fd7, type: 2}
+  - {fileID: 11400000, guid: 744f3bf871455bb43bb10fe678cdffbf, type: 2}
+  - {fileID: 11400000, guid: 0011de4a49b3d5747874a483b1213dc5, type: 2}
+  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
+  - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
+  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
+  - {fileID: 11400000, guid: fd8ef57a1463e34429218795883ae573, type: 2}
+  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
+  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
   ReverseCard: {fileID: 21300000, guid: ff90b0f41defc6e4d8331cae90f2edfa, type: 3}
   ReverseCard_Digitama: {fileID: 21300000, guid: 542271417046c25458d624e43223c985, type: 3}
   soundObject: {fileID: 2099658912993173812, guid: bd165147db2f1de478fbb125a5222199, type: 3}

+ 7 - 4
Assets/Scripts/CheckCardPanel.cs

@@ -282,13 +282,16 @@ public class CheckCardPanel : MonoBehaviour
 
         yield return new WaitForSeconds(Time.deltaTime * 0.2f);
 
-        foreach(HandCard handCard in handCards)
+        if (GManager.instance.turnStateMachine.gameContext.TurnPlayer.isYou)
         {
-            if (handCard.cardSource.CanDeclareSkill)
+            foreach (HandCard handCard in handCards)
             {
-                handCard.SetOrangeOutline();
+                if (handCard.cardSource.CanDeclareSkill)
+                {
+                    handCard.SetOrangeOutline();
 
-                handCard.AddClickTarget(OnClickHandCard);
+                    handCard.AddClickTarget(OnClickHandCard);
+                }
             }
         }
     }

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd580a8534ae6c1cf5237cf6ba5a4c0a46bac19393c900459954ed68a0ade74a
+oid sha256:390ad7f2b1ad54c43fa07f35098639b8e917129dc385873f8285d0e8692d58dd
 size 20166