diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 6491dbca..51b37dc0 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: - - 1026 - - 1036 - - 1029 - - 1021 - - 1033 - - 1034 - - 1029 - - 1034 - - 1022 + - 1018 + - 1018 + - 1018 + - 1018 + - 1018 + - 1027 + - 1027 + - 1027 + - 1027 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab index de08238d..79d959ab 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab @@ -485,7 +485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: "\u4E3A\u5468\u56F4\u989C\u8272\u6700\u591A\u7684\u5730\u5757\u63D0\u4F9B+6\u8BA1\u6570" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2} m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b, diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index b4587590..b91f3603 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -2,12 +2,13 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Threading; using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.Playables; using UnityEngine.UI; - +using Cysharp.Threading.Tasks; public class MapUnity : MonoBehaviour { public List unitPool;//临接对象池 @@ -330,8 +331,8 @@ public class MapUnity : MonoBehaviour if (whoColour != 6 && whoColour != 10) { whoColour = newColor; - BombAct(newColor); RefreshWhoColor(); + BombAct(newColor).Forget(); } } @@ -450,8 +451,8 @@ public class MapUnity : MonoBehaviour if (whoColour != 6 && whoColour != 10) { whoColour = newColor; - BombAct(newColor); RefreshWhoColor(); + BombAct(newColor).Forget(); } } @@ -495,8 +496,8 @@ public class MapUnity : MonoBehaviour continue; } whoColour = newColor; - BombAct(newColor); RefreshWhoColor(); + BombAct(newColor).Forget(); } } IEnumerator SettleWeaponNode() @@ -527,13 +528,16 @@ public class MapUnity : MonoBehaviour } } - public void BombAct(int newColor) + public async UniTaskVoid BombAct(int newColor) { if(blockNode!=null&&blockNode is Bomb) { HashSet nodeRange = new HashSet(); nodeRange.Add(this); getNodeTools.getCircleNodeExceptSelf(nodeRange, 1); + Debug.Log("getCircleNodeExceptSelf大小是" + nodeRange.Count); + await UniTask.Delay(100, ignoreTimeScale: true); + await UniTask.SwitchToMainThread(); foreach (MapUnity node in nodeRange) { node.switchColor(Name.intColorTostring(newColor)); diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv index 03129502..df41bbcf 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv @@ -14,7 +14,7 @@ 1016,1,1,1,3_1,none,53,2&3,0_0;1_0;2_0;0_1;0_-1;1_2;1_-2,red;red;red;red;red;red;red,CardIcon/1021,鏁ｅ皠,1 1017,1,1,1,3_1,none,17,1,0_0;1_0;2_0;3_0;2_1;2_-1;2_2;2_-2,blue;blue;blue;blue;blue;blue;blue;blue,CardIcon/1021,鍗曞悜绠ご,2 1007,1,2,1,3_1,none,1,20,0_0;1_0;0_1;0_-1;1_1;1_-1;1_2;1_-2,black;black;black;black;black;black;black;black,CardIcon/1021,榛戠伀鑽,3 -1018,1,0,1,,none,none,none,0_0;1_0;-1_0,red;red_Hippo;red,CardIcon/1021,Test18,1 +1018,1,0,1,,none,none,none,0_0;1_0;-1_0,red;red_Bomb;blue,CardIcon/1021,Test18,1 1019,1,0,1,,none,none,none,0_0;1_0;-1_0,blue;blue;blue,CardIcon/1021,Test19,1 1020,1,0,1,,none,none,none,0_0;1_0;-1_0,yellow;yellow;yellow,CardIcon/1021,Test20,1 1021,1,0,1,,none,none,none,0_0;0_1;0_-1;1_0,red;blue;yellow;red,CardIcon/1021,Test21,1 diff --git a/ColorlessWorld-2024-4-2/Packages/manifest.json b/ColorlessWorld-2024-4-2/Packages/manifest.json index 146bfaff..5a2d82c8 100644 --- a/ColorlessWorld-2024-4-2/Packages/manifest.json +++ b/ColorlessWorld-2024-4-2/Packages/manifest.json @@ -47,6 +47,7 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.xr": "1.0.0", + "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask" } } diff --git a/ColorlessWorld-2024-4-2/Packages/packages-lock.json b/ColorlessWorld-2024-4-2/Packages/packages-lock.json index 0463d7a4..4ba1d78c 100644 --- a/ColorlessWorld-2024-4-2/Packages/packages-lock.json +++ b/ColorlessWorld-2024-4-2/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.cysharp.unitask": { + "version": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "ec9204d381eb406a8f6e68fd67429a96ca6c5322" + }, "com.unity.2d.animation": { "version": "9.0.4", "depth": 0, diff --git a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index bfb79f17..5fec2853 100644 Binary files a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ