Browse Source

流程完善0515

pull/117/head
45 9 months ago
parent
commit
5011ab2685
  1. 3
      ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset
  2. 27
      ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
  3. 2
      ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity
  4. 4
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs
  5. 4
      ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs
  6. 22
      ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs
  7. 5
      ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs
  8. 3
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/EnemyPlanUIManager.cs

3
ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset

@ -12,5 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4220f07a4a8a6784ebec6e8f07eb81ef, type: 3}
m_Name: PotionList
m_EditorClassIdentifier:
potionList:
- 1
potionList: []

27
ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@ -13,19 +13,14 @@ MonoBehaviour:
m_Name: cardDeckList
m_EditorClassIdentifier:
cardDeckList:
- 1010
- 1005
- 1010
- 1010
- 2040
- 2041
- 2042
- 2043
- 2044
- 2045
- 2046
- 2047
- 1010
- 1010
- 1005
- 1005
- 1001
- 1001
- 1001
- 1002
- 1002
- 1002
- 1003
- 1003
- 2032
- 2001
- 2019

2
ColorlessWorld-2024-4-2/Assets/Scenes/CampPoint.unity

@ -7888,7 +7888,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7fdb8517729ce2b42b8193e7b887c770, type: 3}
m_Name:
m_EditorClassIdentifier:
gameObjectUI: {fileID: 0}
gameObjectUI: {fileID: 1463029924}
--- !u!114 &570399559
MonoBehaviour:
m_ObjectHideFlags: 0

4
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs

@ -49,8 +49,8 @@ public class Thief : Enemy
{
if (aliveCount >= 3)
{
enemyNode.currentActionScript = EnemyPlanUIManager.enemyPlanUIIconDictionary[EnemyPlanUIFunction.nothing].NewAction();
enemyAction = EnemyPlanUIManager.enemyPlanUIIconDictionary[EnemyPlanUIFunction.nothing].NewAction();
enemyNode.currentActionScript = EnemyPlanUIManager.Instance.enemyPlanUIIconDictionary[EnemyPlanUIFunction.nothing].NewAction();
enemyAction = EnemyPlanUIManager.Instance.enemyPlanUIIconDictionary[EnemyPlanUIFunction.nothing].NewAction();
enemyNode.enemyUIBar.SwitchIntention(enemyAction);
enemyNode.enemyUIBar.outAttackRange.SetActive(false);
}

4
ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs

@ -758,12 +758,12 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
}
//判断能否进入
int line = LevelDevelopManager.Instance.levelDevelopData.levelStep;
/* int line = LevelDevelopManager.Instance.levelDevelopData.levelStep;
for (int j = 0; j < LevelDevelopManager.Instance.levelMap[line].levelColumn.Count; j++)
{
LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[line].levelColumn[j];
currentLevelNode.JudgeRoadCanEnter();
}
}*/
}
//设置房间怪物组和地图

22
ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs

@ -120,9 +120,27 @@ public class LevelNode : MonoBehaviour
}
else
{
canEnter = true;
roomIcon.color = new Color(1, 1, 1, 1f);
bool isNextNode = false;
List<Vector2> nextNodes = PlayerStatsManager.Instance.levelDevelopData.levelSaveMap[(int)PlayerStatsManager.Instance.levelDevelopData.currentPoint.x].levelDataList[(int)PlayerStatsManager.Instance.levelDevelopData.currentPoint.y].nextLevelNodes;
foreach (var node in nextNodes)
{
if((int)node.x == line &&(int)node .y ==column)
{
isNextNode = true;
break;
}
}
if(isNextNode)
{
canEnter = true;
roomIcon.color = new Color(1, 1, 1, 1f);
}
else
{
canEnter = false;
roomIcon.color = new Color(1, 1, 1, 0.5f);
}
}
hightLightAnimator.SetBool("canEnter", canEnter);
}

5
ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs

@ -27,7 +27,10 @@ public class LegacyNode : MonoBehaviour
relicClassName = relicData[1];
infor = relicData[4];
image = ToolDontDestory.Instance.LoadImage(relicData[2]);
LegacyManager.Instance.legacyNodesList.Add(relicName,this);
if (LegacyManager.Instance.legacyNodesList.ContainsKey (className)==false )
{
LegacyManager.Instance.legacyNodesList.Add(className, this);
}
GetComponent<Image>().sprite = image;
if (isOnGet )
{

3
ColorlessWorld-2024-4-2/Assets/Scripts/manager/EnemyPlanUIManager.cs

@ -5,7 +5,7 @@ using UnityEngine.UI;
public class EnemyPlanUIManager : Singleton<EnemyPlanUIManager>
{
public static Dictionary<string, EnemyAction> enemyPlanUIIconDictionary = new Dictionary<string, EnemyAction>();
public Dictionary<string, EnemyAction> enemyPlanUIIconDictionary = new Dictionary<string, EnemyAction>();
[Header("Òâͼͼ±ê")]
public Sprite attackIcon;
@ -52,6 +52,7 @@ public class EnemyPlanUIManager : Singleton<EnemyPlanUIManager>
public void AddEnemyPlanUIIcon(string enemyPlanUIFunction,EnemyAction enemyAction ,Sprite icon)
{
Debug.Log("¹ÖÎïui" + enemyPlanUIIconDictionary.Count);
enemyAction.sprite = icon;
enemyPlanUIIconDictionary.Add(enemyPlanUIFunction, enemyAction);
}

Loading…
Cancel
Save