bug修理0528

ColorlessWorld-2024-4-2/Assets/Anim/LoadScreen/FirstToMap/Null.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Null
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

ColorlessWorld-2024-4-2/Assets/Anim/LoadScreen/FirstToMap/Null.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d35fc1f2f98bad64f8a2ca6323d4b672
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Anim/LoadScreen/FirstToMap/ScollRectAnim.cs

@@ -7,6 +7,17 @@ public class ScollRectAnim : MonoBehaviour
 {
     public ScrollRect scrollRect;
     public GameObject mask;
+    public Animator animatior;
+    private void Start()
+    {
+        animatior .enabled = false;
+        mask .SetActive (false); 
+        if (PlayerStatsManager .Instance .levelDevelopData .levelStep==0)
+        {
+            animatior.enabled = true;
+            mask.SetActive(true);
+        }     
+    }
     
     public void FirstToMapScrollRectAnim()
     {

ColorlessWorld-2024-4-2/Assets/Anim/LoadScreen/FirstToMap/Scrollbar Horizontal.controller

@@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-9080433385847608499
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: start
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2850522388003590487}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-2850522388003590487
 AnimatorState:
   serializedVersion: 6
@@ -34,7 +59,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: Scrollbar Horizontal
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: start
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -48,6 +79,33 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &1695306927825488634
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Null
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -9080433385847608499}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: d35fc1f2f98bad64f8a2ca6323d4b672, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &3907945835112966536
 AnimatorStateMachine:
   serializedVersion: 6
@@ -59,7 +117,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -2850522388003590487}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 30, y: 340, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1695306927825488634}
+    m_Position: {x: 240, y: 220, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset

@@ -12,9 +12,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3}
   m_Name: LevelState_1
   m_EditorClassIdentifier: 
-  levelStep: 9
+  levelStep: 1
   mapLevel: 1
-  currentPoint: {x: 8, y: 1}
+  currentPoint: {x: 1, y: 1}
   levelSaveMap:
   - levelDataList:
     - roomType: 13
@@ -79,8 +79,8 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
-      - Gravitus
       - RatWarrior
+      - Pharmacist
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
@@ -119,21 +119,21 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
+      - Gravitus
       - RatWarrior
-      - Pharmacist
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
   - levelDataList:
-    - roomType: 4
+    - roomType: 8
-      roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3}
+      roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: -4.5791492, y: 0.059732437, z: -8.949108}
       line: 2
       column: 0
-      roomDestinationIndex: 4
+      roomDestinationIndex: 9
       fatherLevelNodes:
       - {x: 1, y: 1}
       nextLevelNodes:
@@ -144,14 +144,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 11
+    - roomType: 4
-      roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3}
+      roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3}
       isUse: 1
       passBy: 1
       nodePos: {x: -4.579153, y: 0.059732437, z: -6.4491076}
       line: 2
       column: 1
-      roomDestinationIndex: 13
+      roomDestinationIndex: 4
       fatherLevelNodes:
       - {x: 1, y: 1}
       nextLevelNodes:
@@ -162,14 +162,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 6
+    - roomType: 10
-      roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3}
+      roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: -4.579157, y: 0.059734344, z: -3.9491096}
       line: 2
       column: 2
-      roomDestinationIndex: 3
+      roomDestinationIndex: 11
       fatherLevelNodes:
       - {x: 1, y: 1}
       nextLevelNodes:
@@ -194,8 +194,8 @@ MonoBehaviour:
       - {x: 4, y: 0}
       fightEenemyPool: weak
       enemyList:
-      - LivingArmor
+      - Gravitus
-      - FailedSample
+      - RatWarrior
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
@@ -239,14 +239,14 @@ MonoBehaviour:
       extraMapIndex: 
       isExtra: 0
   - levelDataList:
-    - roomType: 12
+    - roomType: 6
-      roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3}
+      roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: -0.57917356, y: 0.059755325, z: -8.949106}
       line: 4
       column: 0
-      roomDestinationIndex: 15
+      roomDestinationIndex: 3
       fatherLevelNodes:
       - {x: 3, y: 0}
       nextLevelNodes:
@@ -257,14 +257,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 9
+    - roomType: 10
-      roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3}
+      roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3}
       isUse: 1
       passBy: 1
       nodePos: {x: -0.57917595, y: 0.059755325, z: -6.4491076}
       line: 4
       column: 1
-      roomDestinationIndex: 12
+      roomDestinationIndex: 11
       fatherLevelNodes:
       - {x: 3, y: 1}
       nextLevelNodes:
@@ -275,14 +275,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 11
+    - roomType: 9
-      roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3}
+      roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: -0.57917786, y: 0.059757233, z: -3.9491086}
       line: 4
       column: 2
-      roomDestinationIndex: 13
+      roomDestinationIndex: 12
       fatherLevelNodes:
       - {x: 3, y: 2}
       nextLevelNodes:
@@ -359,15 +359,14 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: strong
       enemyList:
-      - RatWarrior
+      - Thief
-      - FailedSample
+      - PrismReflector
-      - Pharmacist
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
-    - roomType: 0
+    - roomType: 2
-      roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
+      roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3}
       isUse: 1
       passBy: 1
       nodePos: {x: 3.4208128, y: 0.059778214, z: -6.4491067}
@@ -380,15 +379,18 @@ MonoBehaviour:
       - {x: 7, y: 1}
       - {x: 7, y: 0}
       - {x: 7, y: 2}
-      fightEenemyPool: strong
+      fightEenemyPool: eliteAndMonster
       enemyList:
-      - Twinbee
+      - Gravitus
-      - ReconnaissanceBee
+      - PollutionSpreader
-      - PrismReflector
+      - PollutionSpreader
-      extraEnemyList: []
+      extraEnemyList:
+      - RatWarrior
+      - FailedSample
+      - Pharmacist
       mapIndex: 100001
-      extraMapIndex: 
+      extraMapIndex: 100001
-      isExtra: 0
+      isExtra: 1
     - roomType: 0
       roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
       isUse: 0
@@ -401,21 +403,22 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: strong
       enemyList:
-      - PollutionSpreader
+      - RatWarrior
-      - Gravitus
+      - FailedSample
+      - Pharmacist
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
   - levelDataList:
-    - roomType: 8
+    - roomType: 12
-      roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3}
+      roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: 5.420813, y: 0.059789658, z: -8.949108}
       line: 7
       column: 0
-      roomDestinationIndex: 9
+      roomDestinationIndex: 15
       fatherLevelNodes:
       - {x: 6, y: 1}
       nextLevelNodes:
@@ -426,14 +429,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 10
+    - roomType: 11
-      roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3}
+      roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3}
       isUse: 1
       passBy: 1
       nodePos: {x: 5.420813, y: 0.059789658, z: -6.4491086}
       line: 7
       column: 1
-      roomDestinationIndex: 11
+      roomDestinationIndex: 13
       fatherLevelNodes:
       - {x: 6, y: 1}
       nextLevelNodes:
@@ -444,14 +447,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 4
+    - roomType: 9
-      roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3}
+      roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: 5.420813, y: 0.059791565, z: -3.9491115}
       line: 7
       column: 2
-      roomDestinationIndex: 4
+      roomDestinationIndex: 12
       fatherLevelNodes:
       - {x: 6, y: 1}
       nextLevelNodes:
@@ -477,14 +480,14 @@ MonoBehaviour:
       fightEenemyPool: strong
       enemyList:
       - RatWarrior
-      - FailedSample
+      - RatWarrior
-      - Pharmacist
+      - LivingArmor
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
-    - roomType: 0
+    - roomType: 1
-      roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
+      roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3}
       isUse: 1
       passBy: 1
       nodePos: {x: 7.4208164, y: 0.0598011, z: -6.4491076}
@@ -494,17 +497,17 @@ MonoBehaviour:
       fatherLevelNodes: []
       nextLevelNodes:
       - {x: 9, y: 1}
-      fightEenemyPool: strong
+      fightEenemyPool: elite
       enemyList:
-      - Twinbee
+      - Climavista
-      - ReconnaissanceBee
+      - AcidRainCloud
-      - PrismReflector
+      - AcidRainCloud
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
-    - roomType: 1
+    - roomType: 0
-      roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3}
+      roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: 7.4208174, y: 0.05980301, z: -3.9491105}
@@ -514,24 +517,24 @@ MonoBehaviour:
       fatherLevelNodes: []
       nextLevelNodes:
       - {x: 9, y: 2}
-      fightEenemyPool: elite
+      fightEenemyPool: strong
       enemyList:
-      - Pollutinel
+      - RatWarrior
-      - Pollutinel
+      - FailedSample
-      - ContaminatusImmortalis
+      - Pharmacist
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
   - levelDataList:
-    - roomType: 6
+    - roomType: 11
-      roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3}
+      roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: 9.420822, y: 0.059812546, z: -8.949106}
       line: 9
       column: 0
-      roomDestinationIndex: 3
+      roomDestinationIndex: 13
       fatherLevelNodes:
       - {x: 8, y: 0}
       nextLevelNodes:
@@ -542,14 +545,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 9
+    - roomType: 6
-      roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3}
+      roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3}
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: 9.420824, y: 0.059812546, z: -6.4491076}
       line: 9
       column: 1
-      roomDestinationIndex: 12
+      roomDestinationIndex: 3
       fatherLevelNodes:
       - {x: 8, y: 1}
       nextLevelNodes:
@@ -560,14 +563,14 @@ MonoBehaviour:
       mapIndex: 
       extraMapIndex: 
       isExtra: 0
-    - roomType: 8
+    - roomType: 4
-      roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3}
+      roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3}
       isUse: 1
       passBy: 0
       nodePos: {x: 9.420826, y: 0.059814453, z: -3.9491086}
       line: 9
       column: 2
-      roomDestinationIndex: 9
+      roomDestinationIndex: 4
       fatherLevelNodes:
       - {x: 8, y: 2}
       nextLevelNodes:
@@ -601,7 +604,7 @@ MonoBehaviour:
     - roomType: 0
       roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: 11.420842, y: 0.05982399, z: -6.4491076}
       line: 10
       column: 1
@@ -614,14 +617,15 @@ MonoBehaviour:
       - {x: 11, y: 1}
       fightEenemyPool: strong
       enemyList:
-      - PollutionSpreader
+      - RatWarrior
-      - Gravitus
+      - RatWarrior
+      - LivingArmor
       extraEnemyList: []
       mapIndex: 100001
       extraMapIndex: 
       isExtra: 0
-    - roomType: 2
+    - roomType: 0
-      roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3}
+      roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3}
       isUse: 0
       passBy: 0
       nodePos: {x: 11.420845, y: 0.059825897, z: -3.9491096}
@@ -630,17 +634,14 @@ MonoBehaviour:
       roomDestinationIndex: 2
       fatherLevelNodes: []
       nextLevelNodes: []
-      fightEenemyPool: eliteAndMonster
+      fightEenemyPool: strong
       enemyList:
-      - Gravitus
-      - PollutionSpreader
-      - PollutionSpreader
-      extraEnemyList:
       - RatWarrior
       - RatWarrior
       - LivingArmor
+      extraEnemyList: []
       mapIndex: 100001
-      extraMapIndex: 100001
+      extraMapIndex: 
       isExtra: 0
   - levelDataList:
     - roomType: 8
@@ -662,7 +663,7 @@ MonoBehaviour:
     - roomType: 8
       roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3}
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: 13.420856, y: 0.059835434, z: -6.4491067}
       line: 11
       column: 1
@@ -713,7 +714,7 @@ MonoBehaviour:
     - roomType: 5
       roomSprite: {fileID: 21300000, guid: 4b752f8ca710d6f4c837a1396184e644, type: 3}
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: 15.420868, y: 0.059846878, z: -6.4491076}
       line: 12
       column: 1

ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5b07afdbcf13e43438545d591cfd2e4b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1572,8 +1572,8 @@ RectTransform:
   m_GameObject: {fileID: 105543572}
   m_LocalRotation: {x: 0.00015917419, y: -0.0001851022, z: 0.76227057, w: -0.64725846}
   m_LocalPosition: {x: 0, y: 0, z: -0.000019073486}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.76, y: 0.76, z: 0.76}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 840939160}
   - {fileID: 60299606}
@@ -2016,7 +2016,7 @@ MonoBehaviour:
   m_Elasticity: 0.1
   m_Inertia: 1
   m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 10
+  m_ScrollSensitivity: 30
   m_Viewport: {fileID: 1698341606}
   m_HorizontalScrollbar: {fileID: 854494968}
   m_VerticalScrollbar: {fileID: 0}
@@ -9148,6 +9148,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   scrollRect: {fileID: 188589022}
   mask: {fileID: 1764707463}
+  animatior: {fileID: 854494971}
 --- !u!1 &855723617
 GameObject:
   m_ObjectHideFlags: 0
@@ -12577,6 +12578,8 @@ MonoBehaviour:
   enemyPoolFileName: EnemyPoolToLevel.csv
   isDone: 0
   pathLineFather: {fileID: 400154763}
+  map: {fileID: 1343826539}
+  moveStep: 20
 --- !u!1 &1219222994
 GameObject:
   m_ObjectHideFlags: 0
@@ -13801,7 +13804,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0.00004673004, y: 4}
-  m_SizeDelta: {x: 216.317, y: 108.945}
+  m_SizeDelta: {x: 216.317, y: 109}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1351052313
 GameObject:

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

@@ -4184,7 +4184,6 @@ RectTransform:
   m_Children:
   - {fileID: 1983000274}
   - {fileID: 291228396}
-  - {fileID: 1713144518}
   m_Father: {fileID: 1586415770}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -19773,6 +19772,7 @@ RectTransform:
   - {fileID: 8456878}
   - {fileID: 1989837796}
   - {fileID: 351842884}
+  - {fileID: 1713144518}
   - {fileID: 866545451}
   - {fileID: 1731883578}
   - {fileID: 1078406586}
@@ -21703,17 +21703,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1713144517}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000013805}
+  m_LocalPosition: {x: 0, y: 0, z: -0.00008282903}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 73094679}
-  m_Father: {fileID: 351842884}
+  m_Father: {fileID: 1586415770}
   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.0000036955, y: -16.567}
+  m_AnchoredPosition: {x: -468.47025, y: -434.5671}
   m_SizeDelta: {x: 134.68, y: 119.52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1713144519
@@ -21730,7 +21730,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.4490565, g: 0.4490565, b: 0.4490565, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

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

@@ -68,19 +68,24 @@ public class RewardManager : Singleton<RewardManager>
     {
         if (EnemyManager.Instance.enemySpeedSortingList.Count <= 1)
         {
+            StartCoroutine(WaitGameOver());
+        }
+    }
+    IEnumerator WaitGameOver()
+    {
+        yield return new WaitForSeconds(1.5f);
         rewardPanle.SetActive(true);
         //同步血量
-            PlayerStatsManager.Instance.playerState .currentHP = GameManager .Instance .playerState .currentHP;
+        PlayerStatsManager.Instance.playerState.currentHP = GameManager.Instance.playerState.currentHP;
         //关闭战斗场内UI
         // HideUIBarManager.Instance.HideUIBar();
         //清空buff
-            Usermanager.Instance .ClearBuff();
+        Usermanager.Instance.ClearBuff();
         //销毁手卡
         // PlayerStatsManager.Instance.DeleteHandCard();
         //设置奖励界面长度
         chooseRewardPanle.GetComponent<RectTransform>().sizeDelta = new Vector2(0, rewardsList.Count * 150f);
     }
-    }
     public void AddRewardTips(RewardManager.RewardType rewardType,string amount)//生成奖励
     {
         //todo：生成奖励条目，然后在生成条目数值

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

@@ -54,7 +54,9 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
     public bool isDone;
     [Header("路线合集")]//为了把路线从节点上摘下来，防止一块缩放
     public Transform pathLineFather;
-
+    [Header("自动下滚")]
+    public RectTransform map;//地图上下移动来保证每次回到地图都能看到当前走到的位置
+    public float moveStep;//下滚距离
     private void Start()
     {
         originalPoint = generatorPoint.transform.position;
@@ -68,9 +70,17 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
         {
             GeneratorLevelMapFormSave();
         }
-
+        SetMapToCurrentStep();
         isDone = true;
     }
+    //让地图自动下滚
+    public void SetMapToCurrentStep()
+    {
+        if(PlayerStatsManager.Instance.levelDevelopData.levelStep!=0)
+        {
+            map.anchoredPosition = new Vector2(4 - (moveStep * PlayerStatsManager.Instance.levelDevelopData.levelStep), 4);
+        }  
+    }
     public void GenerateLevelMap(int generatorLine, int generatorColumn)
     {
         GenerateGridMap(generatorLine, generatorColumn);

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs

@@ -218,7 +218,6 @@ public static class Name
     
     public static void getSingleDescription(StringBuilder sb, KeyValuePair<string, string> kvp)
     {  
-        Debug.Log("KeyValuePair是" + kvp.Key + "|" + kvp.Value);
         switch (kvp.Key)
         {
             case CardFunction.cardDamage: