地图修缮0725

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -1,27 +0,0 @@
-fileFormatVersion: 2
-guid: a94cf6fef2879da4c91e5ef768aadf4e
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -22767,7 +22767,7 @@ GameObject:
   - component: {fileID: 457398707}
   - component: {fileID: 457398706}
   - component: {fileID: 457398708}
-  - component: {fileID: 457398709}
+  - component: {fileID: 457398705}
   m_Layer: 5
   m_Name: WeaponNode
   m_TagString: WeaponDragPanel
@@ -22891,37 +22891,6 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!114 &457398709
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 457398703}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d6302809f06dc36468787c81c4c492aa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  score: 0
-  scoreMul: 0
-  condition: red>5
-  result: addScore
-  conditionValue: 
-  resultValue: 5
-  nodesMark: []
-  nodesColor: []
-  extraRedNodeCount: 0
-  extraBlueNodeCount: 0
-  extraYellowNodeCount: 0
-  extraMostNodeCount: 0
-  extraLeastNodeCount: 0
-  extraAllNodeCount: 0
-  isIgnoreCondition: 0
-  isDoubleSettle: 0
-  resultDescription: 
-  conditionDescription: 
-  gemImage: {fileID: 0}
 --- !u!1 &458000797
 GameObject:
   m_ObjectHideFlags: 0
@@ -53709,7 +53678,7 @@ Light:
   m_Type: 0
   m_Shape: 0
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 70
+  m_Intensity: 50
   m_Range: 50
   m_SpotAngle: 113.643364
   m_InnerSpotAngle: 66.70945
@@ -83258,7 +83227,9 @@ MonoBehaviour:
   enemyScore: 0
   enemyHp: 60
   straightHit: 0
-  hitTypeText: {fileID: 0}
+  attackPattern: {fileID: 2135474817}
+  defenseIcon: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3}
+  attackIcon: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3}
   scorResults: 0
   playerScoreBar: {fileID: 93681350}
   playerScoreText: {fileID: 1259852126}

ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs

@@ -21,7 +21,8 @@ public class RegisteJumpInScenceCamera : MonoBehaviour
         AttackScorManager.Instance.SwitchMode(isScorSettle);
         //设置是否进行武器结算
         WeaponManager.Instance.SwitchMode(isWeaponSettle);
-
+        //刷新地图节点
+       // InFightMap.Instance.RefreshInfightMap();
         /* if(JumpInScenceManager .Instance != null )
          {
              JumpInScenceManager.Instance.cameraTrans = this.gameObject.transform;

ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs

@@ -26,7 +26,35 @@ public class InFightMap : Singleton <InFightMap>
 
         GeneratorLevelMapFormSave();
     }
+    //刷新地图
+    public void RefreshInfightMap()
+    {
+        int currentLine = (int)levelDevelopData.currentPoint.x;
+        for (int i = 0; i < levelDevelopData.levelSaveMap[currentLine].levelDataList.Count; i++)
+        {
+            LevelDevelopData_SO.levelData currentLevelData = levelDevelopData.levelSaveMap[currentLine].levelDataList[i];
+            LevelNode currentLevelNode = levelMap[currentLine].levelColumn[i];
+
+            if (currentLevelNode.isUse == false)
+            {
+                Debug.Log("隐藏");
+                currentLevelNode.gameObject.SetActive(false);
+            }
+            else
+            {
+                //设置已经走过路的差别
+                currentLevelNode.canEnter = false;
+                currentLevelNode.roomIcon.color = new Color(1, 1, 1, 0.5f);
+                //设置进度标识
+                if (currentLevelNode.isPassBy == true)
+                {
+                    currentLevelNode.passByMark.SetActive(true);
+                }
+            } 
+        }
+
 
+    }
     //生成一个节点
     public LevelNode GenerateLevelNode(int line, int column, Vector3 pos)
     {
@@ -43,7 +71,7 @@ public class InFightMap : Singleton <InFightMap>
     //生成网格
     public void GenerateGridMap(int generatorLine, int generatorColumn)
     {
-
+        generatorPoint.transform.localPosition = originalPoint;
         for (int i = 0; i < generatorLine; i++)
         {
             if (i == generatorLine - 1)

ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs

@@ -45,11 +45,15 @@ public class WeaponManager : Singleton<WeaponManager>
 
             stopwatch.Stop();
 
-
+            if(stopwatch.ElapsedMilliseconds>10)
+            {
                 Debug.LogWarning($"性能警告！耗时 {stopwatch.ElapsedMilliseconds}ms");
             }
 
             
+        }
+        
+        
         //SettleWeaponNode();
         //SettleEnemyWeaponNode();
     }

ColorlessWorld-2024-4-2/Assets/TextMesh Pro/Resources/Fonts & Materials/colorMapForText.asset

@@ -75,8 +75,8 @@ MonoBehaviour:
     m_Metrics:
       m_Width: 96
       m_Height: 111
-      m_HorizontalBearingX: -10
-      m_HorizontalBearingY: 100
+      m_HorizontalBearingX: -0.72
+      m_HorizontalBearingY: 86.8
       m_HorizontalAdvance: 100
     m_GlyphRect:
       m_X: 113
@@ -91,8 +91,8 @@ MonoBehaviour:
     m_Metrics:
       m_Width: 96
       m_Height: 111
-      m_HorizontalBearingX: -10
-      m_HorizontalBearingY: 100
+      m_HorizontalBearingX: -0.72
+      m_HorizontalBearingY: 86.8
       m_HorizontalAdvance: 100
     m_GlyphRect:
       m_X: 224
@@ -107,8 +107,8 @@ MonoBehaviour:
     m_Metrics:
       m_Width: 97
       m_Height: 112
-      m_HorizontalBearingX: -10
-      m_HorizontalBearingY: 100
+      m_HorizontalBearingX: -0.72
+      m_HorizontalBearingY: 86.8
       m_HorizontalAdvance: 100
     m_GlyphRect:
       m_X: 0
@@ -123,8 +123,8 @@ MonoBehaviour:
     m_Metrics:
       m_Width: 95
       m_Height: 111
-      m_HorizontalBearingX: -10
-      m_HorizontalBearingY: 100
+      m_HorizontalBearingX: -0.72
+      m_HorizontalBearingY: 86.8
       m_HorizontalAdvance: 100
     m_GlyphRect:
       m_X: 2
@@ -139,8 +139,8 @@ MonoBehaviour:
     m_Metrics:
       m_Width: 97
       m_Height: 112
-      m_HorizontalBearingX: -10
-      m_HorizontalBearingY: 100
+      m_HorizontalBearingX: -0.72
+      m_HorizontalBearingY: 86.8
       m_HorizontalAdvance: 100
     m_GlyphRect:
       m_X: 112