diff --git a/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png b/ColorlessWorld-2024-4-2/Assets/Image/enemyMark.png new file mode 100644 index 0000000000000000000000000000000000000000..7117e8bd1c58896eb4cec894b65de6690ff5092b GIT binary patch literal 11340 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.blocksRaycasts = false; @@ -331,6 +333,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag public void OnEndDrag(PointerEventData eventData) { + GameManager.Instance.onDrag = false; + StartCoroutine(OnDragIEnumerator(eventData)); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index 3e16fb3c..a3175107 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -13,6 +13,7 @@ public class TurnMaster : Singleton public Text cardDeckNumberText; public Text usedCardNumberText; + public Text deleteCardNumberText; public int currentCost; public int totalCost; @@ -83,6 +84,7 @@ public class TurnMaster : Singleton //同步UI cardDeckNumberText.text = cardDeck.cardList.Count.ToString(); usedCardNumberText.text = usedCard.usedCardList.Count.ToString(); + deleteCardNumberText.text = usedCard.deleteCardList.Count.ToString(); } IEnumerator EndPlayerTurnBegin() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs index e7a50223..4c0098cc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/UsedCard.cs @@ -5,5 +5,8 @@ using UnityEngine; public class UsedCard : MonoBehaviour { public GameObject cardPrefab; + [Header("墓地")] public List usedCardList; + [Header("销毁")] + public List deleteCardList; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index 64fc4285..9355a65b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -153,9 +154,8 @@ public class EnemyManager : Singleton } public void AttackRangePreviewInfluencedNode(MapUnity enemyNode, int step,List influencePreviewPool)//可移动格子预览 - { - - influencePreviewPool .Clear(); + { + influencePreviewPool .Clear(); //GameManager.Instance.playerOn.InfluencePool = GameManager.Instance.playerOn.unitPool; MapUnity playerNode = enemyNode; MapUnity currentNode = enemyNode; @@ -519,11 +519,14 @@ public class EnemyManager : Singleton } } + + List disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList(); + //遍历影响池变色 - for (int i = 0; i < influencePreviewPool.Count; i++) + foreach ( var i in disInfluencePreviewPool) { - influencePreviewPool[i].influenced = true; - influencePreviewPool[i].choossedMark.GetComponent().material = influencePreviewPool[i].red; + i.markInfluenced = true; + i.hightLigtMark.GetComponent().material = i.enemyMark; } } @@ -896,5 +899,30 @@ public class EnemyManager : Singleton } } + List disInfluencePreviewPool = influencePreviewPool.Distinct(new MapUnityCompare()).ToList (); + influencePreviewPool.Clear(); + foreach (var i in disInfluencePreviewPool ) + { + influencePreviewPool.Add(i); + } + } + + + //比较类 + class MapUnityCompare : IEqualityComparer + { + public bool Equals(MapUnity x, MapUnity y) + { + if((x.locationX == y.locationX)&&(x.locationY == y.locationY)) + { + return true; + } + return false; + } + + public int GetHashCode(MapUnity obj) + { + return obj.locationX.GetHashCode() ^ obj.locationY.GetHashCode(); + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 1b6b00d8..813fecad 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -16,6 +16,9 @@ public class GameManager : Singleton public PlayerState_SO templatePlayerState;//角色数据ScriptableObject模板 public PlayerState_SO playerState;//在游戏中实际使用的数据 + [Header("角色动作状态")] + public bool onDrag;//正在拖动卡牌 + [Header("角色状态数据UI")] public Text textMaxCost; public Text textCurrentCost; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs index d8ad3988..e242505c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs @@ -12,10 +12,14 @@ public class MapUnity : MonoBehaviour [Header("UI效果范围控件")] public bool influenced;//被选中 + public bool markInfluenced;//需要被高亮显示 + public GameObject choossedMark;//被选中激活 - // public List InfluencePool;//影响池 + public GameObject hightLigtMark;//被选中高亮 + public Material red; public Material yellow; + public Material enemyMark; [Header("涂色控件")] public Material plyerColour;//玩家颜色 @@ -77,9 +81,17 @@ public class MapUnity : MonoBehaviour { choossedMark.SetActive(false); } + if (markInfluenced) + { + hightLigtMark.SetActive(true); + } + else + { + hightLigtMark.SetActive(false); + } - //根据涂色角色改变颜色 - if(whoColour == WhoColour.playerColour ) + //根据涂色角色改变颜色 + if (whoColour == WhoColour.playerColour ) { colourGameObject.GetComponent().material = plyerColour; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs index 4f78b75e..4a28a7fc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs @@ -14,7 +14,7 @@ public class EnemyPlanActionUI : MonoBehaviour private void OnMouseEnter() { - if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn) + if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn &&GameManager .Instance .onDrag ==false ) { MapUnity currentMapUnity = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY]; @@ -134,21 +134,21 @@ public class EnemyPlanActionUI : MonoBehaviour { for (int i = 0; i < step + 1; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } else if (enemyNode.pasth.Count - 1 == step) { for (int i = 0; i < step; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } else { for (int i = 0; i < enemyNode.pasth.Count; i++) { - enemyNode.pasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.pasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } } @@ -160,7 +160,7 @@ public class EnemyPlanActionUI : MonoBehaviour { for (int i = 0; i < enemyNode.oppositePasth.Count; i++) { - enemyNode.oppositePasth[i].choossedMark.GetComponent().material = enemyNode.pasth[i].yellow; + enemyNode.oppositePasth[i].hightLigtMark.GetComponent().material = enemyNode.pasth[i].yellow; } } break; @@ -185,9 +185,9 @@ public class EnemyPlanActionUI : MonoBehaviour //遍历影响池变色 for (int i = 0; i < enemyNode.rangePool.Count; i++) { - enemyNode.rangePool[i].influenced = false; + enemyNode.rangePool[i].markInfluenced = false; } - enemyNode.rangePool.Clear(); + //enemyNode.rangePool.Clear(); } } diff --git a/ColorlessWorld-2024-4-2/Assets/data/card_data.csv b/ColorlessWorld-2024-4-2/Assets/data/card_data.csv index 40083150..19a03ec1 100644 --- a/ColorlessWorld-2024-4-2/Assets/data/card_data.csv +++ b/ColorlessWorld-2024-4-2/Assets/data/card_data.csv @@ -3,7 +3,7 @@ 10002,鎶ょ浘,1,1,2,5,0,0,0,2,5,1,,PlayerIcon 10003,姣掕嵂,1,1,4,6,3,1,0,4,10,1,鏂藉姞4灞備腑姣,PlayerIcon 10004,鏋彾鐐稿脊,2,2,9,2,2,7_2,0,9;4,2;4,1,鏂藉姞4灞備腑姣,PlayerIcon -10005,鑺辩矇,0,2,8,1,4,1,0,8,2,1,鏂藉姞1灞傛矇鐫,PlayerIcon +10005,鑺辩矇,0,2,8,2,4,1,0,8,2,1,鏂藉姞1灞傛矇鐫,PlayerIcon 10006,鑷存畫,2,1,7,2,2,1,0,7;9,2;2,1,鏂藉姞2灞傛祦琛,PlayerIcon 10007,婊嬪吇,1,2,12;13,3;1,0,0,0,12,3,1,鏃犻渶涓㈠純,PlayerIcon 10008,鑽夊北鍘嬮《,3,3,1;6,10;1,2,1,0,1;6,13;1,1,閫犳垚3鐐逛激瀹,PlayerIcon 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 1b7264cd3be2ecbe5de4028d303e4c3c5611d720..85ee6b3da33ffb021ae91865b61fa669f82bb390 100644 GIT binary patch delta 1102 zcmYjQeN2sU6z&}Q)!Tjb;iFWPH4_^tVTJ78YK*JYh%(!|Hj_yAti{Y^ zVoRFVYp69FQ)}caU#Tl9-EMV@2}}9?-nTA)zQ1$M^PJ~7&s$Y5Rn<$m$DtCvg4wTZ zDYdki;-1463Jt|*N?VF9R2_`%to=&IZeD76F;>c1jxI|492^f!u4*&!THY(jrbZ(s z(zaJHlX6}|5rxKLGG#P@C%b>Fo;N88bFmhfN85mym?7aTa|ow6^cJGE(a;c_M1k)h zUyR1kgZVgx&;bB!`O@*|g*t2UExV zsDByy(TxsmY#r&Bp(}Yr;Y${7P^}F3IyTE~?qrEZ6o_F1FirG2(^)Gps_Xi1e)O%V z4<=HU6*7goShE2qvkxm9#8DHvAw^gmOFi9iQk2)3C2mDaG`dr(4I~zExmU>TwZTE{ z78VI*t^TYBNQ~@ZsUO_F^$R1F@>O^pnDM5SqbQq=_!!vWsXhU@bx^ZO zJ#7;U$?Oy@7vu3Tu#Y7+@e!DS*MQYLa^gtlAvhp5SWnZ3z?)i!z$_?}seC<7pg1E+ z@{p^TQm-_dDr~&VGRz&#Gh#65$AcSLgD{HndmvaVn0|nc>W1NjwmVOgcVP~?X<@3+ ze-~R;kHB7q(;9%~H>)pcz)5)|qo`pc4~$PqgXpuO_8LQLQ?Qw3zxg5rgl)njz_g50 zw=<4L@eIQPjdR`>oXYNARWoV^U5CGj%Td!$Tj6?7oiN$hjtc>Dsf6W& z`m6BjSnti|M5O9?hj?hwJU~`eWXk6C*!+<^vO5pYa(E-OgH+=aB+>}2pU5ux9LDr6 z_9HYz4Zh6XoI_|Irh1vlLr)3oVA;cZn1ke0b3C=2gvWaYX4(i{#QZU?l;IKvKhtT| zR=kfxaE#I!nJvWZe*S{kajKTt@cJWYo1jLSt$^hq$05PY?_m74RwC5+iU;56T(m?3 z_aw!lbB>bXoTST=i_M$M8&Eh!HF9AaW~S(t{12;wVJjODoThfA#)yvN)!*wGf-Gyq zt66~%R=O)dTJ+2*gga_cQ$DAoZ9d8~U-B&A32YBViRH5f84IGVX_B_U5($ORQgJ^E zNdE#klq#iFD%9iQB3+dwN5hX=J<-0$~=@VRz66`;f4q^QR==(({BX*RD3C+K$ zSnW4hv;2ozlqu;el!D+2d1bX7Pbztxf*Soxm(<#x3O2%AEY9ZT zKf0-=3V&1XyM*P!-bB1u6=xxQ$|W=shk2OMcU%}c#wyH%SZoM&F>7H*tYB%-aD-(^ zj0n4`IRWDujvR<6xu?)}o)8RLv>Z9O%sB3l32C7_YTTnJvkZ*sxk>I YWoW}(JuhODfgP$XF@cjYZ{REc0pLtWl>h($ diff --git a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 7ad618084aeee58bfae1c566e9361b2f1d6e96b7..6ecd1ee9a14995a6691abdbebd168e126d720502 100644 GIT binary patch delta 706 zcmY+CUr3Wt7{+^)&UBs{LAqTC&7fAGgGea4(Gk?epa`ssz$gzL%vM%xv42UFVkVIhg`M}SkLdC_{CJ-8yziUSOgYWeF^qOU z=l61++t*S>0IG${k7^nABLw!KE2iFMTL2MoOK#bK9HL?X4(SP^8?3wc7eR%CXaTz# z`AEWh7stTjD}~KUEDqs3SouN;iOvyR2HQ~kov?C=Velr`s$pys!4Pc1mxn{xpP^o~ z-p4ZgHXd$Nbn__AfxS3fOg;qbb!_hUy=c=e)mE4}d0NBqW9ZJ7M9DK0$tC6;u zAgg>nORMNf(YtJTLnE~IYa}vnNwmFwPoh4lMrf=rn?etG=myo$=UFOtq){qVpriL- zO|j5MP$zb!VG&!>nCF2@86#D{6T2@1liZtu02@8Aq=#imY+E}-Tkz&_@xMY_>ALK` bIj}#6uxf=_98IW@nklRo_8_>(%%STyZR;na delta 706 zcmZXS%WD&16vaJOzSR2F+4K=aFcCBeX{bK9CYRcD2HB}PSc9K3)+iDVL(vVe)i2s1joivKL{C%7`ckVfN&2X(5uE7Mt zap{j_(i`DIJ%A265=V!68^;7ha&gvvS2sp64H?eI|iS+sN)Vq-Bf`^buVxQ zVpwA*6?%#D5UHMJhVQR%8=^j8G7OF5Aw=N%D#LDt1muavvJK93H|Y~_Q>+Xhd1eu$ zYm@jXirvpyed#rBL9DbF8MaQLAENvq%P{Z;QHY2!$Iz5S81ix7R~sBtFO_m=p}}|9 zp_0=Wg4i-S%F5&K@d&cg&YwBT04<~tQ0^4sklPNIYVTeSrG@mg?eHUwn-CjKi|jD) z0Z$;$1@nKE&Ma-lR-XEV5eUn0LdehH8Dw{KzNYlk%M+_WR1e`-D;nrb&K}a4!A|n% JkYrUb{2M>{IO+fZ