From 78de92b3d77c24739e0243578b783bda8780ebe3 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Fri, 6 Sep 2024 01:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=81=97=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/SampleScene.unity | 9 +++ .../Assets/Scripts/Card/CardDrag.cs | 72 ++++++++++++------- .../Assets/Scripts/Card/CardOriginalData.cs | 8 +++ .../Scripts/Card/CardOriginalDataList.cs | 1 + .../Assets/Scripts/Card/TurnMaster.cs | 37 ++++++---- .../Assets/Scripts/Enemy/EnemyNode.cs | 19 +++-- .../Legacy/LegacyChild/LegacyNode_BoxLock.cs | 7 ++ .../LegacyChild/LegacyNode_BoxLock.cs.meta | 11 +++ .../LegacyChild/LegacyNode_CharcoalFire.cs | 14 ++++ .../LegacyNode_CharcoalFire.cs.meta | 11 +++ .../LegacyChild/LegacyNode_DamagedBag.cs | 12 ++++ .../LegacyChild/LegacyNode_DamagedBag.cs.meta | 11 +++ .../LegacyChild/LegacyNode_Extractor.cs | 18 +++++ .../LegacyChild/LegacyNode_Extractor.cs.meta | 11 +++ .../LegacyChild/LegacyNode_FireHeart.cs | 17 ----- .../LegacyChild/LegacyNode_FireSpark.cs | 14 ++++ .../LegacyChild/LegacyNode_FireSpark.cs.meta | 11 +++ .../LegacyChild/LegacyNode_GoldVines.cs | 18 +++++ .../LegacyChild/LegacyNode_GoldVines.cs.meta | 11 +++ .../LegacyChild/LegacyNode_LavaHeart.cs | 14 ++++ .../LegacyChild/LegacyNode_LavaHeart.cs.meta | 11 +++ .../LegacyChild/LegacyNode_MagicGloves.cs | 18 +++++ .../LegacyNode_MagicGloves.cs.meta | 11 +++ .../LegacyChild/LegacyNode_MechanicalBoots.cs | 8 +++ .../LegacyNode_MechanicalBoots.cs.meta | 11 +++ .../Legacy/LegacyChild/LegacyNode_Scope.cs | 7 ++ .../LegacyChild/LegacyNode_Scope.cs.meta | 11 +++ .../Scripts/Tool/Data_SO/PlayerState_SO.cs | 4 ++ .../Assets/Scripts/Tool/Name.cs | 30 ++++++++ .../Assets/Scripts/Tool/Name.cs.meta | 11 +++ .../Assets/Scripts/manager/EventManager.cs | 16 +++-- .../Scripts/manager/MapUnitySettleManager.cs | 22 ++++-- .../Assets/data/Relic/Relic.csv | 12 +++- .../Assets/data/card_data_2.csv | 62 ++++++++-------- 34 files changed, 462 insertions(+), 98 deletions(-) create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index afd604d1..5742f256 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -11901,6 +11901,15 @@ MonoBehaviour: relicClassNameList: - LegacyNode_FireHeart - LegacyNode_StrongBody + - LegacyNode_MechanicalBoots + - LegacyNode_Scope + - LegacyNode_BoxLock + - LegacyNode_DamagedBag + - LegacyNode_LavaHeart + - LegacyNode_MagicGloves + - LegacyNode_FireSpark + - LegacyNode_GoldVines + - LegacyNode_Extractor legacyNodesList: [] --- !u!1 &1779627253 GameObject: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index 7af9196c..7d8008ba 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -226,6 +226,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag public void CardUse() { GameManager.Instance.onDrag = false; + //目标释放选择 + if (!cardTargetCheck()) + { + canUse = false; + Debug.Log("目标不符合"); + //resetComponentPosition(); + } if (canUse) { @@ -435,7 +442,12 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //重新调用范围预览 //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); - setCastingRangePreview(cardEntity.cardOriginalData.EffectRange); + int castRange = cardEntity.cardOriginalData.CastingRange; + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_Scope)) + { + castRange++; + } + setCastingRangePreview(castRange); //预览影响范围 if (currentNode.influenced) { @@ -455,34 +467,15 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } - private void setCastingRangePreview(string effectRange) + private void setCastingRangePreview(int castRange) { foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool) { mapUnity.influenced = false; } MapUnityManager.Instance.castPool.Clear(); - if (effectRange == EffectRange.range1) - { - MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, cardEntity.cardOriginalData.CastingRange); - //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); - } - else - { - MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, cardEntity.cardOriginalData.CastingRange); - //GameManager.Instance.player.StepPreviewInfluencedNode(1); - /* MapUnity playerNode = GameManager.Instance.playerOn; - MapUnity currentNode = GameManager.Instance.playerOn; - castingPool.Clear(); - for (int i = 0; i < 6; i++) - { - currentNode = GameManager.Instance.playerOn; - if (currentNode.unitPool[0] != null && currentNode.unitPool[0].TryGetComponent(out _)) - { + MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, castRange); - } - }*/ - } } private void setEffectRangePreview(string effectRange, float euler, MapUnity currentNode) @@ -604,13 +597,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { resetComponentPosition(); } - }//范围类，需要指定被影响的节点才能释放 + } else { //卡牌释放效果 yield return StartCoroutine(cardEntity.settle(0)); - }//无范围类，直接释放 + } yield break; } else @@ -619,6 +612,37 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag } } + private bool cardTargetCheck() + { + bool targetRight=false; + switch (cardEntity.cardOriginalData.CardTarget) + { + case Name.Target.enemy: + foreach (MapUnity mapUnity in cardEntity.influencePreviewPool) + { + if (mapUnity.enemyNode!=null&& mapUnity.enemyNode.enemyType==EnemyNode.EnemyType.enemy) + { + targetRight=true; break; + } + } + break; + case Name.Target.enemyAndBuilding: + foreach (MapUnity mapUnity in cardEntity.influencePreviewPool) + { + if (mapUnity.enemyNode != null ) + { + targetRight = true; break; + } + } + break; + case Name.Target.ally: + targetRight = true; + break; + } + Debug.Log("targetRight是"+ targetRight); + return targetRight; + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData.cs index 7d9e9053..c158e292 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData.cs @@ -35,6 +35,8 @@ public class CardOriginalData : System.Object private int advPierceNum; + private string cardTarget; + public int CardId { get { return cardId; } @@ -125,4 +127,10 @@ public class CardOriginalData : System.Object get { return advPierceNum; } set { advPierceNum = value; } } + + public string CardTarget + { + get { return cardTarget; } + set { cardTarget = value; } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs index f8b13943..4df79918 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs @@ -136,6 +136,7 @@ public class CardOriginalDataList : Singleton cardOriginalData.ImgPath = values[13]; cardOriginalData.PierceNum = int.Parse(values[14]); cardOriginalData.AdvPierceNum = int.Parse(values[15]); + cardOriginalData.CardTarget = values[16]; getDictionaryFromString(values, cardOriginalData); return cardOriginalData; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index f6ca5639..1e005637 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -65,11 +65,12 @@ public class TurnMaster : Singleton Usermanager.Instance.BanActionJudge(); //回合开始结算玩家buff Usermanager.Instance.PlayerTurnBeginSettle(); + //恢复cost + restoreResource(0); //结算地块Buff MapUnitySettleManager.Instance.MapGridsSettle(); //恢复体力 GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange); - restoreResource(0); //显示敌人攻击虚线 EnemyManager.Instance.EnemyLine_Observer(); //回复敌人系数 @@ -186,10 +187,16 @@ public class TurnMaster : Singleton IEnumerator ShuffleWithLosingCards() { int tureDrawCardsNum=commDrawCardsNum; - + if (GameManager.Instance.playerOn.whoColour == MapUnity.WhoColour.playerColour&& LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_MechanicalBoots)) + { + tureDrawCardsNum++; + } + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_MagicGloves)) + { + tureDrawCardsNum++; + } if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.addDrawCard)) { - Debug.Log("追加抽卡数:" + Usermanager.playerAbnormalCondition[AbnormalCondition.addDrawCard].value); tureDrawCardsNum += Usermanager.playerAbnormalCondition[AbnormalCondition.addDrawCard].value; } MathTool.keepNature(tureDrawCardsNum); @@ -201,19 +208,25 @@ public class TurnMaster : Singleton //回合结束销毁卡牌 public void TurnEndDisCard() { - continueTurn = false; - - List cardIndex = new List(); - - foreach (var card in handCard.cardEntityList) + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_BoxLock)) { - cardIndex.Add(card.cardId); + continueTurn = true; } - for (int j = cardIndex.Count - 1; j > -1; j--) + else { - Debug.Log(handCard.cardEntityList.Count); - disCard(j); + continueTurn = false; + List cardIndex = new List(); + foreach (var card in handCard.cardEntityList) + { + cardIndex.Add(card.cardId); + } + for (int j = cardIndex.Count - 1; j > -1; j--) + { + Debug.Log(handCard.cardEntityList.Count); + disCard(j); + } } + } public IEnumerator MoveCards() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index e0f007b0..e3cca66d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -819,6 +819,17 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver private void sufferFireSeed(string condition, int value) { //firseed的特殊处理 + int damage = 15; + int checkVal = 10; + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_CharcoalFire)) + { + damage = 25; + checkVal = 15; + } + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireSpark)) + { + checkVal = 8; + } int nowValue=0; if (EnemyState.abnormalCondition.ContainsKey(condition)) { @@ -826,16 +837,16 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } int trueValue=nowValue+ value; int damamgeLayers=0; - if (trueValue >=10) + if (trueValue >= checkVal) { - damamgeLayers = trueValue / 10; + damamgeLayers = trueValue / checkVal; } - int afterval = trueValue % 10; + int afterval = trueValue % checkVal; Debug.Log("伤害层数是:" + damamgeLayers); Debug.Log("剩余层数是:" + afterval); //TODO 是否应该是n次15点伤害 - sufferDamage(15 * damamgeLayers,false); + sufferDamage(damage * damamgeLayers,false); EnemyState.abnormalCondition.Remove(condition); AddEnemyAbnormalCondition(condition, afterval); //enemyUIBar.RefreshEnemyBuffIcon(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs new file mode 100644 index 00000000..e72b496d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs @@ -0,0 +1,7 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_BoxLock : LegacyNode +{ +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs.meta new file mode 100644 index 00000000..34d6c157 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 20a39651e3380e24a9777566954a5958 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs new file mode 100644 index 00000000..039be45e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_CharcoalFire : LegacyNode +{ + public override void OnGet() + { + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireSpark)) + { + LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_FireSpark); + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs.meta new file mode 100644 index 00000000..e15e291e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5acde18b33cf2044921592a2e35d15c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs new file mode 100644 index 00000000..1e2aa5e7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_DamagedBag : LegacyNode +{ + public override void OnGet() + { + GameManager.Instance.playerState.cardRewardNumToChoose -= 2; + GameManager.Instance.playerState.maxCost ++; + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs.meta new file mode 100644 index 00000000..e11db367 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1019bdc9d79c624cb33d8672253c4d8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs new file mode 100644 index 00000000..055e433c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_Extractor : LegacyNode +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs.meta new file mode 100644 index 00000000..1dc4ee5b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8690fa398a268ea418862d903705882e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireHeart.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireHeart.cs index 1ae08f4b..59e6e227 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireHeart.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireHeart.cs @@ -4,22 +4,5 @@ using UnityEngine; public class LegacyNode_FireHeart : LegacyNode { - private void OnEnable() - { - LegacyManager.Instance.settleInPlayerTurnBegin += EffectInPlayerTurnBegin; - } - private void OnDisable() - { - LegacyManager.Instance.settleInPlayerTurnBegin -= EffectInPlayerTurnBegin; - } - public override void OnGet() - { - - } - public override void EffectInPlayerTurnBegin() - { - Debug.Log("FireHeart-怒火"); - Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition .angerUpperDamage ,1); - } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs new file mode 100644 index 00000000..3b84c1ff --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_FireSpark : LegacyNode +{ + public override void OnGet() + { + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_CharcoalFire)) + { + LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_CharcoalFire); + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs.meta new file mode 100644 index 00000000..9c985ee7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 727ebe1ce6b99574cb5745d894074f05 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs new file mode 100644 index 00000000..3395ceec --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_GoldVines : LegacyNode +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs.meta new file mode 100644 index 00000000..21c72d4f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_GoldVines.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad9ec45da5470c040b7b968c2e4d0b83 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs new file mode 100644 index 00000000..7089b595 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_LavaHeart : LegacyNode +{ + public override void OnGet() + { + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireHeart)) + { + LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_FireHeart); + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs.meta new file mode 100644 index 00000000..744777d0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LavaHeart.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 39ba9d4afa6ed2e46b854d9182d68c4f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs new file mode 100644 index 00000000..2a9a2f0e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_MagicGloves : LegacyNode +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs.meta new file mode 100644 index 00000000..385c7d02 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9e6fa036c94f904a97804f0e4908344 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs new file mode 100644 index 00000000..342bbd4b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_MechanicalBoots : LegacyNode +{ + +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs.meta new file mode 100644 index 00000000..4fceb0ca --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MechanicalBoots.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a958750de533f684f9b26b0785fd313f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs new file mode 100644 index 00000000..0314df8b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs @@ -0,0 +1,7 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LegacyNode_Scope : LegacyNode +{ +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs.meta new file mode 100644 index 00000000..2b44f114 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Scope.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3150b4599bb44634c8c265d49d7b6534 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs index 432f9ec6..3c4a35e5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs @@ -24,6 +24,10 @@ public class PlayerState_SO : ScriptableObject public float currentHP; + public int cardRewardNumToChoose;//提供卡牌奖励的卡牌数量 + + public int cardRewardNumToGget;//实际可以选择卡牌奖励的数量 + [Header("资源系统")] public int money; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs new file mode 100644 index 00000000..61d8afe6 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public static class Name +{ + public static class Target + { + public const string enemyAndBuilding = "3"; + public const string enemy = "2"; + public const string ally = "1"; + } + + public static class Legacy + { + public const string LegacyNode_StrongBody = "LegacyNode_StrongBody"; + public const string LegacyNode_FireHeart = "LegacyNode_FireHeart"; + public const string LegacyNode_MechanicalBoots = "LegacyNode_MechanicalBoots"; + public const string LegacyNode_Scope = "LegacyNode_Scope"; + public const string LegacyNode_BoxLock = "LegacyNode_BoxLock"; + public const string LegacyNode_DamagedBag = "LegacyNode_DamagedBag"; + public const string LegacyNode_LavaHeart = "LegacyNode_LavaHeart"; + public const string LegacyNode_MagicGloves = "LegacyNode_MagicGloves"; + public const string LegacyNode_FireSpark = "LegacyNode_FireSpark"; + public const string LegacyNode_GoldVines = "LegacyNode_GoldVines"; + public const string LegacyNode_CharcoalFire = "LegacyNode_CharcoalFire"; + public const string LegacyNode_Extractor = "LegacyNode_Extractor"; + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs.meta new file mode 100644 index 00000000..80df273e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 231212c3ab4739e4598b47a53a5f6820 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs index bbddde46..a8a4f5e2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs @@ -98,11 +98,7 @@ public class EventManager : Singleton { //加钱 case 1: - playerState.money += amount; - if (playerState.money < 0) - { - playerState.money = 0; - } + gainMoney(amount); break; //加血 case 2: @@ -128,4 +124,14 @@ public class EventManager : Singleton { backButton.SetActive(true); } + + public void gainMoney(int value) + { + playerState.money += value; + MathTool.keepNature(playerState.money); + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_GoldVines)) + { + Usermanager.Instance.recoverHp(2); + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnitySettleManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnitySettleManager.cs index 63bb7764..7a29411f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnitySettleManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnitySettleManager.cs @@ -8,19 +8,33 @@ public class MapUnitySettleManager : Singleton { if(GameManager .Instance .playerOn .whoColour == MapUnity.WhoColour.enemyColour ) { - //Usermanager.Instance.AddPlayerAbnormalCondition_downSpeed(value); + Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.downSpeed, 1); } else if (GameManager.Instance.playerOn.whoColour == MapUnity.WhoColour.playerColour) { - Usermanager.Instance.AddPlayerAbnormalCondition_upperSpeed(value); + Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.upSpeed,1); + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireHeart)) + { + Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, 1); + } + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_Extractor)) + { + GameManager.Instance.playerState.currentCost++; + } + } } - public void EnemyRedGridSettle (EnemyNode enemyNode , int value) + public void EnemyRedGridSettle (EnemyNode enemyNode) { + int value = 3; if (enemyNode.GetMapGrid().whoColour == MapUnity.WhoColour.playerColour) { + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_LavaHeart)) + { + value = 7; + } enemyNode.sufferAbnormalCondition(AbnormalCondition.fireSeed, value); } @@ -52,7 +66,7 @@ public class MapUnitySettleManager : Singleton { if (EnemyManager.Instance.enemySpeedSortingList[i] != null) { - EnemyRedGridSettle(EnemyManager.Instance.enemySpeedSortingList[i], 3); + EnemyRedGridSettle(EnemyManager.Instance.enemySpeedSortingList[i]); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/data/Relic/Relic.csv b/ColorlessWorld-2024-4-2/Assets/data/Relic/Relic.csv index 196d7eac..31732d85 100644 --- a/ColorlessWorld-2024-4-2/Assets/data/Relic/Relic.csv +++ b/ColorlessWorld-2024-4-2/Assets/data/Relic/Relic.csv @@ -1,2 +1,12 @@ -锘10001,LegacyNode_FireHeart,RelicsIcon/LegacyNode_FireHeart,FireHeart +锘1001,LegacyNode_MechanicalBoots,RelicsIcon/LegacyNode_StrongBody, +1002,LegacyNode_Scope,RelicsIcon/LegacyNode_StrongBody, +1003,LegacyNode_FireHeart,RelicsIcon/LegacyNode_FireHeart,FireHeart +1004,LegacyNode_Extractor,RelicsIcon/LegacyNode_StrongBody, +1005,LegacyNode_BoxLock,RelicsIcon/LegacyNode_StrongBody, +1006,LegacyNode_DamagedBag,RelicsIcon/LegacyNode_StrongBody, +1007,LegacyNode_LavaHeart,RelicsIcon/LegacyNode_StrongBody, +1008,LegacyNode_MagicGloves,RelicsIcon/LegacyNode_StrongBody, +1010,LegacyNode_FireSpark,RelicsIcon/LegacyNode_StrongBody, +1011,LegacyNode_GoldVines,RelicsIcon/LegacyNode_StrongBody, +1012,LegacyNode_CharcoalFire,RelicsIcon/LegacyNode_StrongBody, 10002,LegacyNode_StrongBody,RelicsIcon/LegacyNode_StrongBody,StrongBody diff --git a/ColorlessWorld-2024-4-2/Assets/data/card_data_2.csv b/ColorlessWorld-2024-4-2/Assets/data/card_data_2.csv index 3df61239..e0a9618c 100644 --- a/ColorlessWorld-2024-4-2/Assets/data/card_data_2.csv +++ b/ColorlessWorld-2024-4-2/Assets/data/card_data_2.csv @@ -1,31 +1,31 @@ -锘縄D,鍚嶇О,璐圭敤,绋鏈夊害,鍔熻兘,鏁板,鏂芥硶鑼冨洿,浣滅敤鑼冨洿,娑堣,浼樺娍鍔熻兘,鏁板,鍗＄墝绫诲瀷,浼樺娍鎻忚堪,鍥剧墖璺緞,绌块,浼樺娍绌块 -10003,鎷斿垁鏂,1,2,1,7,1,2,0,1;25,7;3,1,,PlayerIcon,0,0 -10004,鐕曡繑,3,2,1;14,13;0,1,4_1,0,1;38;14,13;1;0,1,涓ゆ鏁堟灉,PlayerIcon,0,0 -10007,缁崇細鏈,2,2,26,1,3,7_2,0,26;19,1;1,2,,PlayerIcon,0,0 -10012,姹茬伀鍒,0,2,1;45;25,2;0;3,1,1,0,1;45;25,2;0;4,1,鏂藉姞4灞傜伀绉,PlayerIcon,0,0 -10014,蹇墜,1,2,20,1,0,0,1,20,1,1,,PlayerIcon,0,0 -10006,鐏劙鍥炲,1,3,27,0,8,7_2,1,28,0,2,鍥炲鏍煎瓙鏁*2鐨勮閲,PlayerIcon,0,0 -10010,瑁呭～,0,2,11,1,0,0,1,11;29,1;2,2,鑾峰緱2鐐圭Щ鍔ㄥ姏,PlayerIcon,0,0 -10011,宀╂祮姹插彇,1,1,30,10,0,0,0,30,7,2,,PlayerIcon,0,0 -10013,鐏亖,2,2,2,12,0,0,0,32;2,2;12,2,,PlayerIcon,0,0 -10015,澶哄垉,2,2,7,1,1,1,1,7;33,1;1,2,,PlayerIcon,0,0 -10016,鎰ゆ,1,3,23;16,1;3,0,0,1,23;16,1;3,3,,PlayerIcon,0,0 -10018,韪忔氮,1,1,29,2,0,0,0,29,2,2,,PlayerIcon,0,0 -10019,蹇呮潃鍓懧峰鍒,3,3,29;34,0;0,3,1,0,29;34;33,0;0;1,1,娑堣-1,PlayerIcon,0,0 -10020,缁濇柀,1,1,1;29,13;-2,1,1,0,1;29,13;-2,1,,PlayerIcon,0,0 -10021,椋炵劙,1,1,14,0,2,4_2,0,14,0,2,,PlayerIcon,0,0 -10022,鐩剧珛,1,1,2;12,7;1,0,0,0,2;12,7;1,2,,PlayerIcon,0,0 -10023,鎶戒笣,1,1,1;12,10;1,4,1,0,1;12,10;1,1,,PlayerIcon,0,0 -10025,鏈哄叧浼,3,1,1;2,10;15,0,6_3,0,1;2,10;15,2,,PlayerIcon,0,0 -10026,娈嬪奖,1,1,12;2,2;6,0,0,0,12;2,2;6,2,,PlayerIcon,0,0 -10028,鍑垮嚮,1,1,6,1,0,0,0,1;6,5;1,1,,PlayerIcon,0,0 -10001,绾冲垁,1,3,35,1,0,0,0,35;33,0;1,1,,PlayerIcon,0,0 -10024,鍒鑳屽嚮鎵,1,1,1;36,8;1,1,1,0,1;36,8;1,1,,PlayerIcon,0,0 -10029,鏂吙,0,2,37;11,3;1,1,1,0,37;11,3;1,2,,PlayerIcon,0,0 -10002,韪忓墠鏂,1,1,41,7,1,1,0,41,7,1,,PlayerIcon,0,0 -10008,鐑堢劙鎵嬮噷鍓,2,2,1;14,9;0,5,5_1,0,1;14,9;0,1,,PlayerIcon,1,2 -10027,鍑鍖,1,3,39,0,0,0,0,39;29,0;1,2,,PlayerIcon,0,0 -10017,鍥炴棆椋為晼,2,1,44,5_3,3,1,0,44,5_3,1,,PlayerIcon,0,0 -10009,鐬韩鏈,2,2,42,0,6,1,0,42;33,0;1,2,,PlayerIcon,0,0 -10005,鐏劙閿侀摼,1,2,43;25,0;4,5,5_1,0,43;25;2,0;4;6,2,棰濆鑾峰緱6鐐规姢鐩,PlayerIcon,0,0 -10030,鎻愬彇,1,1,46,0,0,0,0,46,0,2,,PlayerIcon,0,0 +锘縄D,鍚嶇О,璐圭敤,绋鏈夊害,鍔熻兘,鏁板,鏂芥硶鑼冨洿,浣滅敤鑼冨洿,娑堣,浼樺娍鍔熻兘,鏁板,鍗＄墝绫诲瀷,浼樺娍鎻忚堪,鍥剧墖璺緞,绌块,浼樺娍绌块,鍗＄墝閲婃斁鐩爣 +10001,绾冲垁,1,3,35,1,0,0,0,35;33,0;1,1,,PlayerIcon,0,0,1 +10002,韪忓墠鏂,1,1,41,7,1,1,0,41,7,1,,PlayerIcon,0,0,1 +10003,鎷斿垁鏂,1,2,1,7,1,2,0,1;25,7;3,1,,PlayerIcon,0,0,3 +10004,鐕曡繑,3,2,1;14,13;0,1,4_1,0,1;38;14,13;1;0,1,涓ゆ鏁堟灉,PlayerIcon,0,0,3 +10005,鐏劙閿侀摼,1,2,43;25,0;4,5,5_1,0,43;25;2,0;4;6,2,棰濆鑾峰緱6鐐规姢鐩,PlayerIcon,0,0,2 +10006,鐏劙鍥炲,1,3,27,0,8,7_2,1,28,0,2,鍥炲鏍煎瓙鏁*2鐨勮閲,PlayerIcon,0,0,1 +10007,缁崇細鏈,2,2,26,1,3,7_2,0,26;19,1;1,2,,PlayerIcon,0,0,2 +10008,鐑堢劙鎵嬮噷鍓,2,2,1;14,9;0,5,5_1,0,1;14,9;0,1,,PlayerIcon,1,2,3 +10009,鐬韩鏈,2,2,42,0,6,1,0,42;33,0;1,2,,PlayerIcon,0,0,1 +10010,瑁呭～,0,2,11,1,0,0,1,11;29,1;2,2,鑾峰緱2鐐圭Щ鍔ㄥ姏,PlayerIcon,0,0,1 +10011,宀╂祮姹插彇,1,1,30,10,0,0,0,30,7,2,,PlayerIcon,0,0,1 +10012,姹茬伀鍒,0,2,1;45;25,2;0;3,1,1,0,1;45;25,2;0;4,1,鏂藉姞4灞傜伀绉,PlayerIcon,0,0,3 +10013,鐏亖,2,2,2,12,0,0,0,32;2,2;12,2,,PlayerIcon,0,0,1 +10014,蹇墜,1,2,20,1,0,0,1,20,1,1,,PlayerIcon,0,0,1 +10015,澶哄垉,2,2,7,1,1,1,1,7;33,1;1,2,,PlayerIcon,0,0,2 +10016,鎰ゆ,1,3,23;16,1;3,0,0,1,23;16,1;3,3,,PlayerIcon,0,0,1 +10017,鍥炴棆椋為晼,2,1,44,5_3,3,1,0,44,5_3,1,,PlayerIcon,0,0,3 +10018,韪忔氮,1,1,29,2,0,0,0,29,2,2,,PlayerIcon,0,0,1 +10019,蹇呮潃鍓懧峰鍒,3,3,29;34,0;0,3,1,0,29;34;33,0;0;1,1,娑堣-1,PlayerIcon,0,0,3 +10020,缁濇柀,1,1,1;29,13;-2,1,1,0,1;29,13;-2,1,,PlayerIcon,0,0,3 +10021,椋炵劙,1,1,14,0,2,4_2,0,14,0,2,,PlayerIcon,0,0,1 +10022,鐩剧珛,1,1,2;12,7;1,0,0,0,2;12,7;1,2,,PlayerIcon,0,0,1 +10023,鎶戒笣,1,1,1;12,10;1,4,1,0,1;12,10;1,1,,PlayerIcon,0,0,3 +10024,鍒鑳屽嚮鎵,1,1,1;36,8;1,1,1,0,1;36,8;1,1,,PlayerIcon,0,0,3 +10025,鏈哄叧浼,3,1,1;2,10;15,0,6_3,0,1;2,10;15,2,,PlayerIcon,0,0,1 +10026,娈嬪奖,1,1,12;2,2;6,0,0,0,12;2,2;6,2,,PlayerIcon,0,0,1 +10027,鍑鍖,1,3,39,0,0,0,0,39;29,0;1,2,,PlayerIcon,0,0,1 +10028,鍑垮嚮,1,1,6,1,0,0,0,1;6,5;1,1,,PlayerIcon,0,0,2 +10029,鏂吙,0,2,37;11,3;1,1,1,0,37;11,3;1,2,,PlayerIcon,0,0,1 +10030,鎻愬彇,1,1,46,0,0,0,0,46,0,2,,PlayerIcon,0,0,1 -- 2.30.2