From a1ffa565cf7d45c1e038f39c902097e4227d0f75 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Thu, 24 Oct 2024 20:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=97=E7=89=A9=E8=B4=AD=E4=B9=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Audio/游戏音效/24-移动.wav | Bin 0 -> 27744 bytes .../Audio/游戏音效/24-移动.wav.meta | 23 + .../Assets/Prefab/Shop/RelicSaleNode.prefab | 615 ++++++++++++++++++ .../Prefab/Shop/RelicSaleNode.prefab.meta | 7 + .../Assets/Scenes/SampleScene.unity | 2 + .../Assets/Scenes/Shop.unity | 12 +- .../Assets/Scenes/StartMainScence.unity | 2 + .../Assets/Scripts/Audio/AudioManager.cs | 12 + .../Assets/Scripts/Enemy/BlackSheep.cs | 9 + .../Assets/Scripts/Enemy/DarkCloud.cs | 10 +- .../Assets/Scripts/Enemy/Grinfiend.cs | 10 +- .../Assets/Scripts/Enemy/Mushroom.cs | 10 +- .../Assets/Scripts/Enemy/Polymaw.cs | 11 +- .../Scripts/FightReward/RewardManager.cs | 3 +- .../Assets/Scripts/Legacy/LegacyManager.cs | 11 + .../Assets/Scripts/Legacy/LegacyNode.cs | 14 + .../Assets/Scripts/Player.cs | 8 + .../Assets/Scripts/Shop/RelicSaleNode.cs | 24 + .../Assets/Scripts/Shop/RelicSaleNode.cs.meta | 11 + .../Assets/Scripts/Shop/ShopManager.cs | 32 +- .../Scripts/manager/HideUIBarManager.cs | 2 - 21 files changed, 814 insertions(+), 14 deletions(-) create mode 100644 ColorlessWorld-2024-4-2/Assets/Audio/游戏音效/24-移动.wav create mode 100644 ColorlessWorld-2024-4-2/Assets/Audio/游戏音效/24-移动.wav.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Audio/游戏音效/24-移动.wav b/ColorlessWorld-2024-4-2/Assets/Audio/游戏音效/24-移动.wav new file mode 100644 index 0000000000000000000000000000000000000000..f4980daaf27b7837fdec1867b545df8d50515a34 GIT binary patch literal 27744 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 public AudioClip[] AttackClips; public AudioClip upShieldClip; public AudioClip downShieldClip; + public AudioClip playerMoveClip; [Header("սƵ")] public AudioClip enemyHurtClip; + public AudioClip enemyMoveClip; [Header("鱾Ƶ")] public AudioClip onePageClip; public AudioClip amountPageClip; @@ -206,11 +208,21 @@ public class AudioManager : Singleton } ActionSource.Play(); } + public void PlayerMoveVoicePlayer() + { + ActionSource.clip = playerMoveClip; + ActionSource.Play(); + } public void EnemyHurtVoicePlayer() { enemyActionSource.clip = enemyHurtClip; enemyActionSource.Play(); } + public void EnemyMoveVoicePlayer() + { + enemyActionSource.clip = enemyMoveClip; + enemyActionSource.Play(); + } public IEnumerator WaitShieldVoicePlayer(int value , float time) { yield return new WaitForSeconds(time); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs index abb77ba3..218529e8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlackSheep.cs @@ -186,6 +186,8 @@ public class BlackSheep : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -198,6 +200,8 @@ public class BlackSheep : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -226,6 +230,7 @@ public class BlackSheep : MonoBehaviour enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; transform.SetParent(disNode.CylinderFloor.transform); + yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -259,6 +264,7 @@ public class BlackSheep : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { time = 0; @@ -282,6 +288,9 @@ public class BlackSheep : MonoBehaviour } } + transform.localPosition = new Vector3(0, 0, -0.1468f); + // + AudioManager.Instance.EnemyMoveVoicePlayer(); //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs index b21966c8..f3e7bf63 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs @@ -193,6 +193,8 @@ public class DarkCloud : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -205,6 +207,8 @@ public class DarkCloud : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -233,6 +237,7 @@ public class DarkCloud : MonoBehaviour enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; transform.SetParent(disNode.CylinderFloor.transform); + yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -268,6 +273,7 @@ public class DarkCloud : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { time = 0; @@ -308,7 +314,9 @@ public class DarkCloud : MonoBehaviour yield return 0; }*/ - + transform.localPosition = new Vector3(0, 0, -0.1468f); + // + AudioManager.Instance.EnemyMoveVoicePlayer(); //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs index 44beb26c..4d354f72 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs @@ -214,6 +214,8 @@ public class Grinfiend : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -226,6 +228,8 @@ public class Grinfiend : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -254,6 +258,7 @@ public class Grinfiend : MonoBehaviour enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; transform.SetParent(disNode.CylinderFloor.transform); + yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -287,6 +292,7 @@ public class Grinfiend : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { time = 0; @@ -310,7 +316,9 @@ public class Grinfiend : MonoBehaviour } } - + transform.localPosition = new Vector3(0, 0, -0.1468f); + // + AudioManager.Instance.EnemyMoveVoicePlayer(); //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs index 7b2118c3..d5b21ece 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Mushroom.cs @@ -265,6 +265,8 @@ public class Mushroom : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -277,6 +279,8 @@ public class Mushroom : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -305,6 +309,7 @@ public class Mushroom : MonoBehaviour enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; transform.SetParent(disNode.CylinderFloor.transform); + yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -338,6 +343,7 @@ public class Mushroom : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { time = 0; @@ -361,7 +367,9 @@ public class Mushroom : MonoBehaviour } } - + transform.localPosition = new Vector3(0, 0, -0.1468f); + // + AudioManager.Instance.EnemyMoveVoicePlayer(); //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs index 1a50d00a..222c18ae 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs @@ -89,7 +89,8 @@ public class Polymaw : MonoBehaviour { if (enemyNode.pasth.Count > 1) { - Debug.Log("ʣಽ"+ enemyNode.pasth.Count); + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -102,6 +103,8 @@ public class Polymaw : MonoBehaviour { if (enemyNode.pasth.Count > 1) { + // + // AudioManager.Instance.EnemyMoveVoicePlayer(); yield return StartCoroutine(moveOneStep(enemyNode.pasth[i])); } } @@ -130,6 +133,7 @@ public class Polymaw : MonoBehaviour enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; transform.SetParent(disNode.CylinderFloor.transform); + yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } @@ -275,6 +279,7 @@ public class Polymaw : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0; posIndex < linePath.Count; posIndex++) { time = 0; @@ -298,7 +303,9 @@ public class Polymaw : MonoBehaviour } } - + transform.localPosition = new Vector3(0, 0, -0.1468f); + // + AudioManager.Instance.EnemyMoveVoicePlayer(); //жϸʴ enemyNode.CorrodeRealize(endMapUnity); //жѪ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs index faf55dec..4edbfb92 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs @@ -57,7 +57,8 @@ public class RewardManager : Singleton if (EnemyManager.Instance.enemySpeedSortingList.Count <= 1) { rewardPanle.SetActive(true); - + //رսUI + HideUIBarManager.Instance.HideUIBar(); //ֿ PlayerStatsManager.Instance.DeleteHandCard(); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs index eeefae97..1e78ee13 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs @@ -63,6 +63,17 @@ public class LegacyManager : Singleton } + + public GameObject ShowRelicAsSale(GameObject relicSalePrefab , string className,Transform relicFather) + { + var lefacyObject = Instantiate(relicSalePrefab, relicFather.transform); + Type t = Type.GetType(className); + MonoBehaviour legacyClass = lefacyObject.AddComponent(t) as MonoBehaviour; + object[] parameters = new object[] { className, false }; + MethodInfo method = t.GetMethod("CreateSaledRelic"); + method.Invoke(legacyClass, parameters); + return lefacyObject; + } public void ReadRelicExcel(string fileName) { string filePath = Path.Combine(Application.streamingAssetsPath, fileName); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs index 84774a16..7cbd9910 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs @@ -25,6 +25,20 @@ public class LegacyNode : MonoBehaviour OnGet(); } + } + public virtual void CreateSaledRelic(string className, bool isOnGet) + { + LegacyManager.Instance.legacyNodesList.Add(this); + List relicData = LegacyManager.Instance.relicsDictionary[className]; + name = relicData[3]; + className = relicData[1]; + image = ToolDontDestory.Instance.LoadImage(relicData[2]); + transform.GetChild(0).GetComponent().sprite = image; + if (isOnGet) + { + OnGet(); + } + } //õһЧ public virtual void OnGet() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs index b75c1fc5..9653eafd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs @@ -116,6 +116,8 @@ public class Player : MonoBehaviour FlipLocalScale(raycastHit.point); //ı䶯 anim.SetBool("move", true); + // + // AudioManager.Instance.PlayerMoveVoicePlayer(); if (GameManager.Instance.playerOn != null ) { @@ -144,6 +146,7 @@ public class Player : MonoBehaviour bool move = true; float time = 0; Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0;posIndex < linePath .Count;posIndex++) { time = 0; @@ -166,6 +169,11 @@ public class Player : MonoBehaviour yield return null; } + if(posIndex ==5) + { + // + AudioManager.Instance.PlayerMoveVoicePlayer(); + } } //жϼѪǷЧ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs new file mode 100644 index 00000000..48c9fa9c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class RelicSaleNode : MonoBehaviour +{ + public int price = 100; + public Text priceText; + public GameObject saledMark; + public string relicName; + public void BuyRelic() + { + if (ShopManager.Instance.playerState.money >= price) + { + + ShopManager.Instance.playerState.money -= price; + saledMark.SetActive(true); + } + + // + AudioManager.Instance.BuyVoicePlayer(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs.meta new file mode 100644 index 00000000..39a8266b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 226ba98ca75a45042a07d66800dd0774 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs index c42cb9b3..b893fa52 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.Playables; using UnityEngine.UI; @@ -33,7 +34,10 @@ public class ShopManager : Singleton public GameObject saleCardNode; [Header("ɫۿ")] public Transform cardNoneColorFather; - + [Header("۽")] + public GameObject relicSaleNodePrefab; + public Transform relicSaleFather; + public List relicSaleNodesList = new List(); [Header("ɫ״̬ݲ")] public List cardDeck = new List(); public PlayerState_SO playerState; @@ -44,7 +48,7 @@ public class ShopManager : Singleton cardDeck = PlayerStatsManager.Instance.cardDeck.cardDeckList; SaleCardSetUP(); - + SaleRelicSetUP(GetSaledRelicClassName(4)); } private void Update() { @@ -140,4 +144,28 @@ public class ShopManager : Singleton noneColorCard.transform.SetAsFirstSibling(); noneColorCardNode.GetComponent().cardID = noneColorCardId.ToString(); } + + //װб + public List GetSaledRelicClassName(int relicCount) + { + List relicClassName = new List(); + List relicsDictionary = LegacyManager.Instance.relicsDictionary.Keys.ToList(); + for (int i = 0; i relicClassName ) + { + relicSaleNodesList.Clear(); + for (int i = 0; i < relicClassName.Count; i++) + { + var relic = LegacyManager.Instance.ShowRelicAsSale(relicSaleNodePrefab, relicClassName[i],relicSaleFather); + RelicSaleNode relicSaleNode = relic.GetComponent(); + relicSaleNodesList.Add(relicSaleNode); + } + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs index d434b433..dd52a9ee 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs @@ -8,10 +8,8 @@ public class HideUIBarManager : Singleton public List uiList = new List(); public void HideUIBar() { - Debug.Log("ʼ"); foreach (GameObject uiBar in roleUIBarList ) { - Debug.Log("ʼ"+uiBar .name ); uiBar.SetActive(false); } }