预涂色修复0513 #115

Merged
45 merged 2 commits from dev45-0507 into dev-1217 11 months ago
  1. 16
      ColorlessWorld-2024-4-2/Assets/ArtAssets/0506_UI/底板/奖励&设置_底板.png.meta
  2. 4
      ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab
  3. 3
      ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab
  4. 4
      ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat
  5. 14
      ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab
  6. 13
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab
  7. 9
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgPointReward.prefab
  8. 11
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab
  9. 9
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/PotionReward.prefab
  10. 8
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab
  11. 3169
      ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
  12. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
  13. 9
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
  14. 1
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs
  15. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
  16. 8
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
  17. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs
  18. 4
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs
  19. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs
  20. 6
      ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs
  21. 1
      ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs
  22. 97
      ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
  23. 8
      ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc.meta
  24. 23
      ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs
  25. 11
      ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs.meta
  26. 1
      ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs
  27. 30
      ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
  28. 3
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AStar/AStarManager.cs
  29. 1
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs
  30. 5
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs
  31. 10
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs
  32. 7
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs
  33. 116
      ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
  34. 267
      ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/OutLint_msyhbd SDF.asset

16
ColorlessWorld-2024-4-2/Assets/ArtAssets/0506_UI/底板/奖励&设置_底板.png.meta

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@ -112,7 +112,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:

4
ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab

@ -507,8 +507,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.9479719, y: 1.7393427, z: 0.425397}
m_Center: {x: -0.019413665, y: 0.68924534, z: -0.46267682}
m_Size: {x: 0.44223845, y: 1.0822048, z: 0.14761224}
m_Center: {x: 0.006125081, y: 0.6182961, z: -0.32376713}
--- !u!114 &2423811669981212207
MonoBehaviour:
m_ObjectHideFlags: 0

3
ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab

@ -329,6 +329,8 @@ MonoBehaviour:
colorMaterial: {fileID: 2100000, guid: 1fba631bf7fad7d498e712c1eaaea21f, type: 2}
animColorMaterial: {fileID: 2100000, guid: 4524c65c202c4294d9f7f73c6777908d, type: 2}
currentTexture: {fileID: 0}
yellowColour:
- {fileID: 2800000, guid: 7cd16476866ba9a4393144f8f6cab18a, type: 3}
greenColour:
- {fileID: 2800000, guid: 7cd16476866ba9a4393144f8f6cab18a, type: 3}
redColour:
@ -362,6 +364,7 @@ MonoBehaviour:
bluePre: {fileID: 2100000, guid: 32e8efb5b9333064a9cb9bff03ccf536, type: 2}
whitePre: {fileID: 2100000, guid: 93c7db93411fa374b8c5d1799b69e58c, type: 2}
blackPre: {fileID: 2100000, guid: 81001e79f776fc64cab816ecbdf1c685, type: 2}
yellowPre: {fileID: 2100000, guid: cf59497cd92e036419cf5cfa2d1e4c79, type: 2}
whoColourPlane: {fileID: 7818877686521749494}
colourBrokenParticle: {fileID: 0}
CylinderFloor: {fileID: 8109433587480074365}

4
ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/PlayerStepMark.mat

@ -117,8 +117,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.08627453, g: 0.77254903, b: 0.70487916, a: 0.7490196}
- _Color: {r: 0.0862745, g: 0.77254903, b: 0.70487916, a: 0.7490196}
- _BaseColor: {r: 0.08627448, g: 0.77254903, b: 0.70487916, a: 0.19607843}
- _Color: {r: 0.08627445, g: 0.77254903, b: 0.70487916, a: 0.19607843}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

14
ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab

@ -291,16 +291,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1266964917407651981}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1454171937961643577}
m_Father: {fileID: 31766568536724871}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -1.19, y: -66.5}
m_AnchoredPosition: {x: -1.19, y: -171.98999}
m_SizeDelta: {x: 121.95, y: 65.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3105836307912680244
@ -700,6 +700,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3069609386611643272}
- {fileID: 4305441959204932613}
m_Father: {fileID: 4897243317619258337}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -777,8 +778,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0.000006437509}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4305441959204932613}
m_Children: []
m_Father: {fileID: 4897243317619258337}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -906,6 +906,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
lightGround: {fileID: 1861768780742537568}
lightPartical: {fileID: 0}
cantInteractive: 0
--- !u!1 &8666239901427763783
GameObject:
m_ObjectHideFlags: 0

13
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab

@ -38,8 +38,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 450, y: 100}
m_AnchoredPosition: {x: 0, y: 18.0771}
m_SizeDelta: {x: 450, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5082381512918421411
CanvasRenderer:
@ -69,7 +69,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b1975934dfc1a74eb4729dd3f86d8fa, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -78,7 +78,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &5398903183126753790
MonoBehaviour:
m_ObjectHideFlags: 0
@ -150,8 +150,9 @@ MonoBehaviour:
rewardType: 0
tipIcon: {fileID: 6436768908014461002}
tipText: {fileID: 0}
moneyCount: 0
count:
cardChoosePanle: {fileID: 0}
relicDescription: {fileID: 0}
--- !u!1 &4818641680202011626
GameObject:
m_ObjectHideFlags: 0
@ -265,7 +266,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 31.4, y: -1.1458}
m_AnchoredPosition: {x: 36.1, y: -1.1458}
m_SizeDelta: {x: 63.4508, y: 82.2915}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2733445211847259160

9
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgPointReward.prefab

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 26.4, y: 0}
m_AnchoredPosition: {x: 32.9, y: 0}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6432755592450523591
@ -193,7 +193,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 450, y: 100}
m_SizeDelta: {x: 450, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534610038301911794
CanvasRenderer:
@ -223,7 +223,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b1975934dfc1a74eb4729dd3f86d8fa, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -232,7 +232,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &5350052881258363760
MonoBehaviour:
m_ObjectHideFlags: 0
@ -306,3 +306,4 @@ MonoBehaviour:
tipText: {fileID: 949095511756987273}
count: 0
cardChoosePanle: {fileID: 0}
relicDescription: {fileID: 0}

11
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 26.4, y: 0}
m_AnchoredPosition: {x: 34.3, y: 0}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6432755592450523591
@ -193,7 +193,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 450, y: 100}
m_SizeDelta: {x: 450, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534610038301911794
CanvasRenderer:
@ -223,7 +223,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b1975934dfc1a74eb4729dd3f86d8fa, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -232,7 +232,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &5350052881258363760
MonoBehaviour:
m_ObjectHideFlags: 0
@ -304,5 +304,6 @@ MonoBehaviour:
rewardType: 0
tipIcon: {fileID: 4417952436473866504}
tipText: {fileID: 949095511756987273}
moneyCount: 0
count:
cardChoosePanle: {fileID: 0}
relicDescription: {fileID: 0}

9
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/PotionReward.prefab

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 26.4, y: 0}
m_AnchoredPosition: {x: 33.2, y: 0}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6432755592450523591
@ -193,7 +193,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 450, y: 100}
m_SizeDelta: {x: 450, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534610038301911794
CanvasRenderer:
@ -223,7 +223,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b1975934dfc1a74eb4729dd3f86d8fa, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -232,7 +232,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &5350052881258363760
MonoBehaviour:
m_ObjectHideFlags: 0
@ -306,3 +306,4 @@ MonoBehaviour:
tipText: {fileID: 949095511756987273}
count: 1
cardChoosePanle: {fileID: 0}
relicDescription: {fileID: 0}

8
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 26.4, y: 0}
m_AnchoredPosition: {x: 32.5, y: 0}
m_SizeDelta: {x: 80, y: 80}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6432755592450523591
@ -350,7 +350,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 450, y: 100}
m_SizeDelta: {x: 450, y: 136}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534610038301911794
CanvasRenderer:
@ -380,7 +380,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
m_Sprite: {fileID: 21300000, guid: 8b1975934dfc1a74eb4729dd3f86d8fa, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -389,7 +389,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3
--- !u!114 &5350052881258363760
MonoBehaviour:
m_ObjectHideFlags: 0

3169
ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

File diff suppressed because it is too large

2
ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs

@ -637,7 +637,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
//更新效果作用范围内怪物虚血
EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool);
//更新涂色材质和地块数量统计预览
//SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, GameManager .Instance .playerOn );
SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, GameManager .Instance .playerOn );
}
public void OnDrag(PointerEventData eventData)

9
ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@ -1306,8 +1306,9 @@ public class CardEntity : MonoBehaviour
{
costIocn.gameObject.SetActive(true);
bloodIcon.gameObject.SetActive(false);
/*stepIcon.gameObject.SetActive(false);
nodeIcon .gameObject.SetActive(false);*/
// stepIcon.gameObject.SetActive(false);
// nodeIcon .gameObject.SetActive(false);
}
break;
case Name.CostType.step:
@ -1324,8 +1325,8 @@ public class CardEntity : MonoBehaviour
{
costIocn.gameObject.SetActive(false);
bloodIcon.gameObject.SetActive(true);
/*stepIcon.gameObject.SetActive(false);
nodeIcon.gameObject.SetActive(false);*/
// stepIcon.gameObject.SetActive(false);
// nodeIcon.gameObject.SetActive(false);
}
break;
case Name.CostType.node:

1
ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs

@ -5,7 +5,6 @@ using UnityEngine;
using System.IO;
using System.Linq;
using SQLite4Unity3d;
using static UnityEditor.GenericMenu;
public class CardOriginalDataList : Singleton<CardOriginalDataList>

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

@ -144,7 +144,7 @@ public class EnemyManager : Singleton<EnemyManager>
}
public void EnemySortIconGnerate()
{
enemySortIconPanle.GetComponent<RectTransform>().sizeDelta = new Vector2(enemySpeedSortingList.Count * 100 + 50, 100);
// enemySortIconPanle.GetComponent<RectTransform>().sizeDelta = new Vector2(enemySpeedSortingList.Count * 100 + 50, 100);
for (int i = 0; i < enemySpeedSortingList.Count; i++)
{

8
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@ -2,15 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
using UnityEditor.MemoryProfiler;
using UnityEngine;
using UnityEngine.Assertions;
using UnityEngine.UI;
using static Name;
using static UnityEditor.FilePathAttribute;
using static UnityEditor.Progress;
using static UnityEngine.Rendering.DebugUI;
public class EnemyNode : MonoBehaviour,IEnemyObserver
{

2
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy/EnemyUIBar.cs

@ -69,7 +69,7 @@ public class EnemyUIBar : MonoBehaviour
private void OnMouseEnter()
{
if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false)
if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false && (TurnMaster.Instance.playerAction == TurnMaster.PlayerAction.none|| TurnMaster.Instance.playerAction == TurnMaster.PlayerAction.banAction))
{
//ÒâͼÏÔʾ
ShowPlanInfor();

4
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs

@ -1,11 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Unity.VisualScripting;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UIElements;
public class Boom : BlockNode
{

2
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs

@ -1,6 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using Unity.PlasticSCM.Editor.WebApi;
using UnityEngine;
using UnityEngine.UI;

6
ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs

@ -146,11 +146,13 @@ public class RewardManager : Singleton<RewardManager>
Destroy(gameObject);
if (rewardsList.Count <= 0)
{
ScenceLoadManager.Instance.LoadTargetLevel(1);
//ScenceLoadManager.Instance.LoadTargetLevel(1);
//¾ÖÄÚÌø×ª
}
}
public void GeneratorRewardCard(Transform cardFather ,GameObject cardTip ,int cardCount)
{
List <string> cardAllList = CardOriginalDataList .Instance .cardOriginalDataList .Keys .ToList();

1
ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/EffectForgCaseNode.cs

@ -1,7 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Text;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
using UnityEngine.UI;

97
ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@ -47,20 +47,22 @@ public class GameManager : Singleton<GameManager>
[Header("场地颜色分度盘")]
public Image Red;
public Image Green;
public Image Yellow;
public Image Bule;
public Image Black;
public Image White;
public Image Metal;
[Header("场地颜色分度盘文字")]
public Text redText;
public Text greenText;
public Text blueText;
public Text blackText;
public Text whiteText;
public Text metalText;
public Text sumPlayerText;
public Text sumMiddleText;
public Text sumRightText;
public TMP_Text redText;
public TMP_Text greenText;
public TMP_Text yellowText;
public TMP_Text blueText;
public TMP_Text blackText;
public TMP_Text whiteText;
public TMP_Text metalText;
// public TMP_Text sumPlayerText;
// public TMP_Text sumMiddleText;
// public TMP_Text sumRightText;
[Header("场地颜色优势框")]
public Image sunImage;
public RectTransform barBox;//总框体大小
@ -76,19 +78,21 @@ public class GameManager : Singleton<GameManager>
float redNodeCountLatest;
float blueNodeCountLatest;
float greenNodeCountLatest;
float yellowNodeCountLatest;
float whiteNodeCountLatest;
float metalNodeCountLatest;
float blackNodeCountLatest;
[Header("场地颜色分度盘文字预览")]
public Text redTextPre;
public Text greenTextPre;
public Text blueTextPre;
public Text blackTextPre;
public Text whiteTextPre;
public Text metalTextPre;
public Text sumPlayerTextPre;
public Text sumMiddleTextPre;
public Text sumRightTextPre;
public TMP_Text redTextPre;
public TMP_Text greenTextPre;
public TMP_Text yellowTextPre;
public TMP_Text blueTextPre;
public TMP_Text blackTextPre;
public TMP_Text whiteTextPre;
public TMP_Text metalTextPre;
//public TMP_Text sumPlayerTextPre;
// public TMP_Text sumMiddleTextPre;
// public TMP_Text sumRightTextPre;
[Header("太阳动画")]
public Animator sunAnim;
@ -258,6 +262,7 @@ public class GameManager : Singleton<GameManager>
float redNodeCount = MapUnityManager.Instance.redNodeCount;
float blueNodeCount = MapUnityManager.Instance.blueNodeCount;
float greenNodeCount = MapUnityManager.Instance.greenNodeCount;
float yellowNodeCount = MapUnityManager.Instance.yellowNodeCount;
float whiteNodeCount = MapUnityManager.Instance.whiteNodeCount;
float blackNodeCount = MapUnityManager.Instance.blackNodeCount;
float metalNodeCount = MapUnityManager.Instance.metalNodeCount;
@ -265,6 +270,7 @@ public class GameManager : Singleton<GameManager>
redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount, Time.deltaTime * sunSpeed);
blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount, Time.deltaTime * sunSpeed);
greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount, Time.deltaTime * sunSpeed);
yellowNodeCountLatest = Mathf.Lerp(yellowNodeCountLatest, yellowNodeCount, Time.deltaTime * sunSpeed);
// float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed);
whiteNodeCountLatest = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed);
metalNodeCountLatest = Mathf.Lerp(metalNodeCountLatest, metalNodeCount, Time.deltaTime * sunSpeed);
@ -276,6 +282,9 @@ public class GameManager : Singleton<GameManager>
greenText.text = greenNodeCount.ToString();
if (greenNodeCount == 0)
greenText.text = " ";
yellowText .text = yellowNodeCount.ToString();
if(yellowNodeCount == 0)
yellowText .text = " ";
blueText.text = blueNodeCount.ToString();
if (blueNodeCount == 0)
blueText.text = " ";
@ -288,27 +297,29 @@ public class GameManager : Singleton<GameManager>
metalText.text = metalNodeCount.ToString();
if (metalNodeCount == 0)
metalText.text = " ";
sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString();
sumMiddleText.text = (whiteNodeCount+metalNodeCount ).ToString();
sumRightText.text = blackNodeCount.ToString();
float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blackNodeCount;
// sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString();
// sumMiddleText.text = (whiteNodeCount+metalNodeCount ).ToString();
// sumRightText.text = blackNodeCount.ToString();
float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + yellowNodeCount + whiteNodeCount + blackNodeCount;
//文字位置
float length = barBox.sizeDelta.x;
redText.transform.localPosition = new Vector3((length * (Red.fillAmount - 1)) * 0.5f, 0, 0);
greenText.transform.localPosition = new Vector3(length * 0.5f * (Green.fillAmount + Red.fillAmount - 1), 0, 0);
blueText.transform.localPosition = new Vector3(length * 0.5f * (Bule.fillAmount + Green.fillAmount - 1), 0, 0);
metalText.transform.localPosition = new Vector3(length * 0.5f * (Metal.fillAmount + Bule.fillAmount - 1), 0, 0);
yellowText.transform.localPosition = new Vector3(length * 0.5f * (Yellow.fillAmount + Bule.fillAmount - 1), 0, 0);
metalText.transform.localPosition = new Vector3(length * 0.5f * (Metal.fillAmount + Yellow.fillAmount - 1), 0, 0);
whiteText.transform.localPosition = new Vector3(length * 0.5f * (White.fillAmount + Metal.fillAmount - 1), 0, 0);
blackText.transform.localPosition = new Vector3(length * 0.5f * White.fillAmount, 0, 0);
sumPlayerText.transform.localPosition = new Vector3(length * (Bule.fillAmount - 1) * 0.5f, 150, 0);
sumMiddleText.transform.localPosition = new Vector3((whiteText.transform.localPosition.x+ metalText.transform.localPosition.x)*0.5f, 150, 0);
sumRightText.transform.localPosition = new Vector3(blackText.transform.localPosition.x, 150, 0);
//sumPlayerText.transform.localPosition = new Vector3(length * (Bule.fillAmount - 1) * 0.5f, 150, 0);
// sumMiddleText.transform.localPosition = new Vector3((whiteText.transform.localPosition.x+ metalText.transform.localPosition.x)*0.5f, 150, 0);
// sumRightText.transform.localPosition = new Vector3(blackText.transform.localPosition.x, 150, 0);
//颜色
Red.fillAmount = redNodeCountLatest / totoalNode;
Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode;
Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode;
Metal.fillAmount= Bule.fillAmount+ metalNodeCountLatest / totoalNode;
Yellow .fillAmount = Bule .fillAmount + yellowNodeCountLatest / totoalNode;
Metal.fillAmount= Yellow.fillAmount+ metalNodeCountLatest / totoalNode;
White.fillAmount = Metal.fillAmount + whiteNodeCountLatest / totoalNode;
// Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode;
//预览涂色
@ -317,7 +328,7 @@ public class GameManager : Singleton<GameManager>
{
if(currentCardEntity.cardOriginalData.CastingRange != 0)
{
if( currentMapNode != null && currentMapNode.effectInfluenced == true)
if( currentMapNode != null && currentMapNode.castRangeInf == true)
{
}
@ -420,10 +431,25 @@ public class GameManager : Singleton<GameManager>
}
metalTextPre.transform.localPosition = new Vector3(metalText.transform.localPosition.x,metalText.transform.localPosition.y - 75f, 0);
break;
case 7:
yellowNodeCountLatest = yellowNodeCount + ints[i];
yellowText .text = (yellowNodeCount + ints[i]).ToString();
yellowTextPre.gameObject.SetActive(true);
if (ints[i] > 0)
{
yellowTextPre.text = "(" + "+" + ints[i].ToString() + ")";
}
else
{
yellowTextPre.text = "(" + ints[i].ToString() + ")";
}
yellowTextPre.transform.localPosition = new Vector3(yellowText.transform.localPosition.x,yellowText.transform.localPosition.y - 75f, 0);
break;
}
}
sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount + ints[1] + ints[3] + ints[4]).ToString();
/* sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount + ints[1] + ints[3] + ints[4]).ToString();
sumPlayerTextPre .gameObject .SetActive(true);
sumPlayerTextPre.transform.localPosition = new Vector3(sumPlayerText.transform.localPosition.x + 150f, sumPlayerText.transform.localPosition.y , 0);
if (ints[1] + ints[3] + ints[4]>0)
@ -455,7 +481,7 @@ public class GameManager : Singleton<GameManager>
else
{
sumRightTextPre.text = "(" + ints[5].ToString() + ")";
}
}*/
}
else
{
@ -463,15 +489,16 @@ public class GameManager : Singleton<GameManager>
whiteTextPre.gameObject.SetActive(false);
blueTextPre.gameObject.SetActive(false);
greenTextPre.gameObject.SetActive(false);
yellowTextPre .gameObject.SetActive(false);
blackTextPre.gameObject.SetActive(false);
metalTextPre.gameObject.SetActive(false);
sumPlayerTextPre.gameObject .SetActive(false);
sumMiddleTextPre.gameObject.SetActive(false);
sumRightTextPre.gameObject.SetActive(false);
// sumPlayerTextPre.gameObject .SetActive(false);
// sumMiddleTextPre.gameObject.SetActive(false);
// sumRightTextPre.gameObject.SetActive(false);
}
//太阳
string advColor = MapUnityManager.Instance.getAdvNode();
/* string advColor = MapUnityManager.Instance.getAdvNode();
if(lastSunColor != advColor )
{
sunAnim.SetTrigger("Change");
@ -503,7 +530,7 @@ public class GameManager : Singleton<GameManager>
sunImage.color = Color.gray;
break;
}
}
} */
}
//统计场地颜色

8
ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f0e1fe2a7369d804bbc62e581039eb43
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

23
ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs

@ -0,0 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class JumpInScence : MonoBehaviour
{
public Transform desIconFather;
[Header("·¿¼äͼ±ê")]
public Sprite monsterIcon;
public Sprite eliteMonsterIcon;
public Sprite eliteAndMonsterIcon;
public Sprite bossIcon;
public Sprite shopIcon;
public Sprite campfireIcon;
public Sprite incidentIcon;
public Sprite treasureIcon;
public Sprite forgingIcon;
public Sprite deleteCardIcon;
public Sprite addCardIcon;
public Sprite resourceIcon;
public Sprite potionIcon;
public Sprite startIcon;
}

11
ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/JumpInSceneManager.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8bfdec5ed77d820469d77443cfb386a8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@ -220,6 +220,7 @@ public class LevelNode : MonoBehaviour
levelData.isUse = isUse;
// levelData.passBy = isPassBy;
levelData.roomType = roomType;
levelData.roomSprite = roomIcon.sprite;
levelData.nodePos = this.transform.position;
levelData.column = column;
levelData.line = line;

30
ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs

@ -49,6 +49,7 @@ public class MapUnity : MonoBehaviour
public Material colorMaterial;
public Material animColorMaterial;
public Texture currentTexture;//随机到将要更换的纹理
public List<Texture> yellowColour = new List<Texture>();
public List<Texture> greenColour = new List<Texture>();
public List<Texture> redColour = new List<Texture>();
public List<Texture> blueColour = new List<Texture>();
@ -76,6 +77,8 @@ public class MapUnity : MonoBehaviour
public Material bluePre;
public Material whitePre;
public Material blackPre;
public Material yellowPre;
[Header("材质平面")]
public GameObject whoColourPlane;//材质平面
public ParticleSystem colourBrokenParticle;
@ -317,6 +320,10 @@ public class MapUnity : MonoBehaviour
effectMark.material = blackPre;
colorUnderAttack = newColor;
break;
case 7:
effectMark.material = yellowPre;
colorUnderAttack = newColor;
break;
}
}
public void RegisterUnit()
@ -435,6 +442,18 @@ public class MapUnity : MonoBehaviour
// floodPanel .gameObject .SetActive (false);
// planeBorder.gameObject .SetActive (true);
}
else if (whoColour == Name.NodeColor.Yellow)
{
if (currentTexture != null)
{
colourGameObject.GetComponent<Renderer>().material.SetTexture("_Texture2D", currentTexture);
}
else
{
colourGameObject.GetComponent<Renderer>().material.SetTexture("_Texture2D", yellowColour[UnityEngine.Random.Range(0, yellowColour.Count)]);
}
floodPanel.sprite = greenFlood;
}
else if (whoColour == Name.NodeColor.Metal)
{
if (currentTexture != null)
@ -475,6 +494,11 @@ public class MapUnity : MonoBehaviour
currentTexture = whiteColour[UnityEngine.Random.Range(0, whiteColour.Count)];
colourAnimGameObject.GetComponent<Renderer>().material.SetTexture("_Texture2D",currentTexture);
}
else if (whoColour == Name.NodeColor.Yellow)
{
currentTexture = yellowColour[UnityEngine.Random.Range(0, yellowColour.Count)];
colourAnimGameObject.GetComponent<Renderer>().material.SetTexture("_Texture2D", currentTexture);
}
else if (whoColour == Name.NodeColor.Metal)
{
currentTexture = metalColour[UnityEngine.Random.Range(0, metalColour.Count)];
@ -516,6 +540,12 @@ public class MapUnity : MonoBehaviour
// mapGameObject.SetActive(false);
// whoColourPlane.SetActive(true);
break;
case Name.NodeColor.Yellow:
var yellowPartical = Instantiate(ParticalManager.Instance.greenParticleEffect, planePoint.position, ParticalManager.Instance.greenParticleEffect.transform.rotation);
yellowPartical.transform.SetParent(transform);
// mapGameObject.SetActive(false);
// whoColourPlane.SetActive(true);
break;
}
}

3
ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AStar/AStarManager.cs

@ -1,7 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
public class AStarManager : Singleton<AStarManager>

1
ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs

@ -20,6 +20,7 @@ public class LevelDevelopData_SO : ScriptableObject
public class levelData
{
public LevelDevelopManager .RoomType roomType ;
public Sprite roomSprite;//ͼ±ê
public bool isUse;
public bool passBy;
public Vector3 nodePos;

5
ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs

@ -4,11 +4,6 @@ using System.Collections.Generic;
using System.Linq;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UIElements;
using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray;
using static Unity.Collections.AllocatorManager;
using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters;
using static UnityEditor.FilePathAttribute;
public class getNodeTools
{

10
ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs

@ -1,20 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using TMPro;
using Unity.VisualScripting;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
using UnityEngine.Rendering;
using static GameManager;
using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray;
using static UnityEngine.EventSystems.EventTrigger;
using static UnityEngine.Rendering.DebugUI;
public class CardManager : Singleton<CardManager>
{

7
ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs

@ -1,14 +1,9 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Unity.VisualScripting;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
using static Name;
using static UnityEditor.PlayerSettings;
using static UnityEngine.EventSystems.EventTrigger;
public class SettlementManager : Singleton<SettlementManager>
@ -152,7 +147,7 @@ public class SettlementManager : Singleton<SettlementManager>
try
{
string[] marks = cardOriginalData.nodesMark[i].Split("_");
Debug.Log("AxialToCube的X是" + int.Parse(marks[0]) + "AxialToCube的Y是" + int.Parse(marks[1]));
// Debug.Log("AxialToCube的X是" + int.Parse(marks[0]) + "AxialToCube的Y是" + int.Parse(marks[1]));
(int q, int s, int y) = MathTool.AxialToCube(int.Parse(marks[0]), int.Parse(marks[1]));
cubeList.Add((q, s, y));
}

116
ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

File diff suppressed because one or more lines are too long

267
ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/OutLint_msyhbd SDF.asset

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save