Merge pull request 'uibug修理1022' (#215) from dev45-1017 into dev45-0703NewVer

Reviewed-on: #215

ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/WeaponNodeReward.prefab

@@ -329,7 +329,7 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1637390125
-  m_SortingOrder: 8
+  m_SortingOrder: 11
   m_TargetDisplay: 0
 --- !u!1 &3065247018658047995
 GameObject:
@@ -1020,7 +1020,7 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1637390125
-  m_SortingOrder: 8
+  m_SortingOrder: 11
   m_TargetDisplay: 0
 --- !u!1 &5626331431228865942
 GameObject:

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

@@ -300,7 +300,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 39864051}
-  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}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
@@ -1285,7 +1285,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: -561
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -7681,7 +7681,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: -561
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -25028,7 +25028,7 @@ RectTransform:
   m_GameObject: {fileID: 1607537229}
   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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1160537117}

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

@@ -2115,7 +2115,7 @@ RectTransform:
   m_GameObject: {fileID: 350212427}
   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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1749142483}
@@ -6761,6 +6761,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inforCanvas: {fileID: 1692744068}
   infotText: {fileID: 304527609}
+  time: 0.3
 --- !u!4 &1179992464
 Transform:
   m_ObjectHideFlags: 0
@@ -8125,6 +8126,8 @@ MonoBehaviour:
   - {fileID: 1212031463}
   - {fileID: 2075663380}
   selectWeaponNode: {fileID: 0}
+  selectWeaponNodeConditionLevel: 
+  selectWeaponNodeResultLevel: 
   conditionOrResultSelectedNodeList:
   - {fileID: 274352957}
   - {fileID: 1212031465}
@@ -9123,7 +9126,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -9153,7 +9156,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.00012207031
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -9170,6 +9173,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 445384651250783383, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_IsActive
@@ -9195,11 +9203,86 @@ PrefabInstance:
       propertyPath: m_Name
       value: par_eff_ui_gameIn
       objectReference: {fileID: 0}
+    - target: {fileID: 4399532240125217102, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 4474068405783861940, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653352
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863557
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6218921812816820065, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: startDelay.scalar
       value: 0.58
       objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653353
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863557
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7341079655015253322, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653352
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863557
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -12955,7 +13038,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -12985,7 +13068,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.00012207031
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -13017,11 +13100,86 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4399532240125217102, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 4474068405783861940, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653351
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863552
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6589840777862894700, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653352
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7341079655015253322, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.653351
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.863552
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

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

@@ -966,7 +966,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &37691703
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6058,6 +6058,7 @@ MonoBehaviour:
   isScorSettle: 0
   isWeaponSettle: 0
   isSyncWeaponNodePos: 1
+  isShowSmallHPBar: 1
 --- !u!1 &283852422
 GameObject:
   m_ObjectHideFlags: 0
@@ -6827,6 +6828,85 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 308828738}
   m_CullTransparentMesh: 1
+--- !u!1 &312136756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 312136757}
+  - component: {fileID: 312136759}
+  - component: {fileID: 312136758}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &312136757
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 312136756}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000005364418}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 942562533}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -10.700073, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &312136758
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 312136756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e59eb77956527a8429f97f3812601d51, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 60
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u953B\u9020"
+--- !u!222 &312136759
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 312136756}
+  m_CullTransparentMesh: 1
 --- !u!1 &317019736
 GameObject:
   m_ObjectHideFlags: 0
@@ -8761,6 +8841,138 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 365390167}
   m_CullTransparentMesh: 1
+--- !u!1 &371770698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 371770699}
+  - component: {fileID: 371770702}
+  - component: {fileID: 371770701}
+  - component: {fileID: 371770700}
+  m_Layer: 5
+  m_Name: Button (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &371770699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 371770698}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000021457672}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 942562533}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.00012207031, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &371770700
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 371770698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.5943396, g: 0.5943396, b: 0.5943396, a: 1}
+    m_PressedColor: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 942562534}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 434976241}
+        m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp
+        m_MethodName: LoadTargetLevel
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 6
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &371770701
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 371770698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &371770702
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 371770698}
+  m_CullTransparentMesh: 1
 --- !u!1 &372848679
 GameObject:
   m_ObjectHideFlags: 0
@@ -11475,6 +11687,11 @@ MonoBehaviour:
   saleCardNode: {fileID: 5262991169384419118, guid: c0b973b5a584bf04a85bc49727fecda7,
     type: 3}
   cantReflashCardMark: {fileID: 0}
+  deleteCardFather: {fileID: 0}
+  deleteCardSlotPrefab: {fileID: 0}
+  confirmCardPanel: {fileID: 0}
+  confirmCardFather: {fileID: 0}
+  deleteCardList: []
   cardDeck: []
   playerState: {fileID: 0}
   groundMaterial: {fileID: 0}
@@ -22112,6 +22329,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 938732766}
   m_CullTransparentMesh: 1
+--- !u!1 &942562532
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 942562533}
+  - component: {fileID: 942562535}
+  - component: {fileID: 942562534}
+  m_Layer: 5
+  m_Name: Panel (1)GoForging
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &942562533
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 942562532}
+  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:
+  - {fileID: 312136757}
+  - {fileID: 371770699}
+  m_Father: {fileID: 1481044891}
+  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: -194, y: 236}
+  m_SizeDelta: {x: 300, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &942562534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 942562532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8e09533f26f8fd244971319fec036157, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 7
+--- !u!222 &942562535
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 942562532}
+  m_CullTransparentMesh: 1
 --- !u!1 &947610133
 GameObject:
   m_ObjectHideFlags: 0
@@ -28339,7 +28633,7 @@ MonoBehaviour:
   forgingFloor: 9
   getWeaponNodeFloor: 5
   fightFloor: 0100000003000000070000000a000000
-  randomRoomTypeWeightBase: 060000000b0000000b0000000a0000000a00000008000000
+  randomRoomTypeWeightBase: 0b0000000b0000000a0000000a000000
   rewardFloor: 02000000040000000600000008000000
   levelPrefab: {fileID: 980190143975240430, guid: c8c223db4c0d17645bca03489a39b721,
     type: 3}
@@ -34469,6 +34763,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 37691703}
+  - {fileID: 942562533}
   - {fileID: 1888067489}
   - {fileID: 1656578817}
   m_Father: {fileID: 1881684503}
@@ -44070,8 +44365,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: 567.82, y: -235.99}
-  m_SizeDelta: {x: 399.49, y: 107.03}
+  m_AnchoredPosition: {x: 236, y: 236}
+  m_SizeDelta: {x: 350, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1888067490
 MonoBehaviour:
@@ -49551,7 +49846,7 @@ RectTransform:
   m_GameObject: {fileID: 2096422397}
   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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 259117943}

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

@@ -16353,6 +16353,7 @@ Transform:
   m_Children:
   - {fileID: 1601223406}
   - {fileID: 1915587657}
+  - {fileID: 353823588}
   - {fileID: 469385439}
   - {fileID: 1504312509}
   - {fileID: 172253752}
@@ -30187,7 +30188,7 @@ Camera:
   far clip plane: 1000
   field of view: 50
   orthographic: 1
-  orthographic size: 4.2
+  orthographic size: 5
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -30957,7 +30958,6 @@ GameObject:
   - component: {fileID: 343098088}
   - component: {fileID: 343098091}
   - component: {fileID: 343098090}
-  - component: {fileID: 343098089}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -30984,29 +30984,6 @@ RectTransform:
   m_AnchoredPosition: {x: 7.3502045, y: 0.0000076293945}
   m_SizeDelta: {x: -14.7, y: -62.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &343098089
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 343098087}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &343098090
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -31964,6 +31941,108 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 351714076}
   m_CullTransparentMesh: 1
+--- !u!1 &353823587
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 353823588}
+  - component: {fileID: 353823591}
+  - component: {fileID: 353823590}
+  - component: {fileID: 353823589}
+  m_Layer: 5
+  m_Name: EndGameCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &353823588
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353823587}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 767496039}
+  m_Father: {fileID: 196188496}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &353823589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353823587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &353823590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353823587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0.5
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &353823591
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 353823587}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 330585545}
+  m_PlaneDistance: 3
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 1637390125
+  m_SortingOrder: 10
+  m_TargetDisplay: 0
 --- !u!1 &354324291
 GameObject:
   m_ObjectHideFlags: 0
@@ -49287,7 +49366,7 @@ RectTransform:
   m_GameObject: {fileID: 548608355}
   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_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 129931012}
@@ -62232,7 +62311,7 @@ MonoBehaviour:
   m_Follow: {fileID: 0}
   m_Lens:
     FieldOfView: 50
-    OrthographicSize: 4.2
+    OrthographicSize: 5
     NearClipPlane: 0.3
     FarClipPlane: 1000
     Dutch: 0
@@ -66643,6 +66722,7 @@ GameObject:
   - component: {fileID: 767496039}
   - component: {fileID: 767496038}
   - component: {fileID: 767496037}
+  - component: {fileID: 767496040}
   m_Layer: 5
   m_Name: EndGamePanle
   m_TagString: Untagged
@@ -66695,7 +66775,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 767496036}
-  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}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -66703,13 +66783,34 @@ RectTransform:
   - {fileID: 1961912544}
   - {fileID: 1903492753}
   - {fileID: 125896957}
-  m_Father: {fileID: 846544929}
+  m_Father: {fileID: 353823588}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!65 &767496040
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 767496036}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2000, y: 1500, z: 10}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &767549752
 GameObject:
   m_ObjectHideFlags: 0
@@ -71199,7 +71300,6 @@ RectTransform:
   - {fileID: 922151528}
   - {fileID: 1728880052}
   - {fileID: 1998717001}
-  - {fileID: 767496039}
   - {fileID: 809894446}
   - {fileID: 1803518538}
   - {fileID: 328558928}
@@ -99753,7 +99853,6 @@ GameObject:
   - component: {fileID: 1157860541}
   - component: {fileID: 1157860544}
   - component: {fileID: 1157860543}
-  - component: {fileID: 1157860542}
   m_Layer: 5
   m_Name: PlayerScoreText (TMP)
   m_TagString: Untagged
@@ -99780,29 +99879,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.000040054}
   m_SizeDelta: {x: 183.49, y: 155.1}
   m_Pivot: {x: 0, y: 0.5}
---- !u!223 &1157860542
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1157860540}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &1157860543
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -122550,7 +122626,6 @@ GameObject:
   - component: {fileID: 1364066709}
   - component: {fileID: 1364066708}
   - component: {fileID: 1364066706}
-  - component: {fileID: 1364066707}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -122648,29 +122723,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!223 &1364066707
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1364066705}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!222 &1364066708
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -175604,7 +175656,6 @@ GameObject:
   - component: {fileID: 1703405331}
   - component: {fileID: 1703405334}
   - component: {fileID: 1703405333}
-  - component: {fileID: 1703405332}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -175631,29 +175682,6 @@ RectTransform:
   m_AnchoredPosition: {x: -13.600006, y: 0}
   m_SizeDelta: {x: -27.2, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &1703405332
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1703405330}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &1703405333
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -178210,7 +178238,6 @@ GameObject:
   - component: {fileID: 1750518380}
   - component: {fileID: 1750518383}
   - component: {fileID: 1750518382}
-  - component: {fileID: 1750518381}
   m_Layer: 5
   m_Name: EnemyScoreText (TMP)
   m_TagString: Untagged
@@ -178237,29 +178264,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0.000061035156, y: -0.000029087}
   m_SizeDelta: {x: 183.3, y: 155.1}
   m_Pivot: {x: 1, y: 0.5}
---- !u!223 &1750518381
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1750518379}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &1750518382
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -11757,6 +11757,7 @@ MonoBehaviour:
   isScorSettle: 0
   isWeaponSettle: 0
   isSyncWeaponNodePos: 1
+  isShowSmallHPBar: 1
 --- !u!1 &1639950161
 GameObject:
   m_ObjectHideFlags: 0
@@ -15490,7 +15491,7 @@ RectTransform:
   m_GameObject: {fileID: 2068035518}
   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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1460597006}

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

@@ -24650,7 +24650,6 @@ GameObject:
   - component: {fileID: 516936917}
   - component: {fileID: 516936920}
   - component: {fileID: 516936919}
-  - component: {fileID: 516936918}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -24677,29 +24676,6 @@ RectTransform:
   m_AnchoredPosition: {x: 61.199997, y: 1.7999992}
   m_SizeDelta: {x: -177.7, y: -40.9}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &516936918
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 516936916}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &516936919
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -31961,7 +31937,6 @@ GameObject:
   - component: {fileID: 695350748}
   - component: {fileID: 695350751}
   - component: {fileID: 695350750}
-  - component: {fileID: 695350749}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -31988,29 +31963,6 @@ RectTransform:
   m_AnchoredPosition: {x: 10.5, y: 0.0000076293945}
   m_SizeDelta: {x: -21, y: -62.5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &695350749
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 695350747}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &695350750
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -78798,7 +78750,6 @@ GameObject:
   - component: {fileID: 1441383771}
   - component: {fileID: 1441383774}
   - component: {fileID: 1441383773}
-  - component: {fileID: 1441383772}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -78825,29 +78776,6 @@ RectTransform:
   m_AnchoredPosition: {x: -11.979996, y: 0}
   m_SizeDelta: {x: -23.96, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &1441383772
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1441383770}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 1637390125
-  m_SortingOrder: 7
-  m_TargetDisplay: 0
 --- !u!114 &1441383773
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -82261,7 +82189,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: -561
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -94935,7 +94863,7 @@ PrefabInstance:
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -560.0113
+      value: -561
       objectReference: {fileID: 0}
     - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
@@ -135402,7 +135330,7 @@ RectTransform:
   m_GameObject: {fileID: 2019384293}
   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_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 171665382}

ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs

@@ -214,6 +214,7 @@ public class AttackScorManager : Singleton<AttackScorManager>
         {
             TurnMaster.Instance.turn = TurnMaster.Turn.turnStop;//中断回合
             RewardManager.Instance.EnemyOver();
+            return;
         }
 
         if (PlayerStatsManager.Instance.playerState.currentHP <= 0)
@@ -221,6 +222,7 @@ public class AttackScorManager : Singleton<AttackScorManager>
             TurnMaster.Instance.turn = TurnMaster.Turn.turnStop;//中断回合
             if (gameOverPanel != null)
                 gameOverPanel.SetActive(true);
+            return;
         }
 
         TurnMaster.Instance.StartCoroutine(TurnMaster.Instance.WaitEndPlayerTurn());

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

@@ -389,7 +389,7 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
         //目前只需要检查同一条线上会不会出现相同的房间就行了
         for (int i = 0; i < 3; i++)
         {
-            if (levelMap[rewardFloor[0]].levelColumn[i] == levelMap[rewardFloor[1]].levelColumn[i])
+            if (levelMap[rewardFloor[0]].levelColumn[i].roomType == levelMap[rewardFloor[1]].levelColumn[i].roomType)
             {
                 RoomType currentRoomType = levelMap[rewardFloor[1]].levelColumn[i].roomType;
                 int offsetI = i + 1;
@@ -401,7 +401,7 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
                 levelMap[rewardFloor[1]].levelColumn[offsetI].SetUpRoom(currentRoomType);
                 Debug.Log("违规房间修正");
             }
-            if (levelMap[rewardFloor[2]].levelColumn[i] == levelMap[rewardFloor[3]].levelColumn[i] )
+            if (levelMap[rewardFloor[2]].levelColumn[i].roomType == levelMap[rewardFloor[3]].levelColumn[i].roomType )
             {
                 RoomType currentRoomType = levelMap[rewardFloor[3]].levelColumn[i].roomType;
                 int offsetI = i + 1;
@@ -460,10 +460,10 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
             }
             else if (i == getWeaponNodeFloor)
             {
-                //Ö¸¶¨¸½Ä§²ã¼¶
+                //指定固定战斗层级
                 foreach (var room in levelMap[i].levelColumn)
                 {
-                    room.SetUpRoom(RoomType.resource);
+                    room.SetUpRoom(RoomType.monster);
                 }
             }
             /*else if (i == treasureFloor)
@@ -535,13 +535,23 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
 
         //先确定奖励刷新数量
         Dictionary<RoomType, int> roomCount = new Dictionary<RoomType, int>()
-        { { RoomType.incident ,3},{ RoomType .addCard ,3},{ RoomType .resource ,2},{ RoomType .forging ,2},{RoomType .tavern ,2},{RoomType .shop ,2} };
+        { { RoomType.incident ,4},{ RoomType .addCard ,3},{ RoomType .resource ,3},{RoomType .tavern ,2},{RoomType .shop ,2} };
 
-        for(int i=0;i<2;i++)
+        roomCount[RoomType.incident] = Random.Range(3, 5);
+        int deleteCount = 2;
+        if(roomCount[RoomType.incident]==4)
+        {
+            deleteCount = 2;
+        }
+        else
+        {
+            deleteCount = 1;
+        }
+        for (int i = 0; i < deleteCount; i++)
         {
             int randomIndex = Random.Range(0, randomRoomTypeWeightBase.Count);
             roomCount[randomRoomTypeWeightBase[randomIndex]] -= 1;
-            randomRoomTypeWeightBase .RemoveAt (randomIndex);
+            randomRoomTypeWeightBase.RemoveAt(randomIndex);
         }
 
         //随机奖励房间刷新位置
@@ -556,6 +566,43 @@ public class LeveGeneraterNew : Singleton<LeveGeneraterNew>
             roomKvpList_2.Add(new List<LevelNode>() { levelMap[rewardFloor[2]].levelColumn[i], levelMap[rewardFloor[3]].levelColumn[i] });  
         }
         foreach (RoomType roomType in roomCount.Keys.ToList())
+        {
+            if (roomCount[roomType] == 4)
+            {
+                int grounpIndex = Random.Range(0, 2);
+                if(grounpIndex ==0)
+                {
+                    //房间组_1
+                    int kvpIndex = Random.Range(0, roomKvpList_1.Count);//随机到的房间组序号
+                    int nodeInex = Random.Range(0, roomKvpList_1[kvpIndex].Count);//房间在房间组内的序号
+
+                    roomKvpList_1[kvpIndex][nodeInex].SetUpRoom(roomType);
+                    roomKvpList_1[kvpIndex].RemoveAt(nodeInex);
+
+                    if (roomKvpList_1[kvpIndex].Count == 0)
+                    {
+                        roomKvpList_1.RemoveAt(kvpIndex);
+                    }
+                }
+                else
+                {
+                    //房间组_2
+                    int kvpIndex_2 = Random.Range(0, roomKvpList_2.Count);//随机到的房间组序号
+                    int nodeInex_2 = Random.Range(0, roomKvpList_2[kvpIndex_2].Count);//房间在房间组内的序号
+
+                    roomKvpList_2[kvpIndex_2][nodeInex_2].SetUpRoom(roomType);
+                    roomKvpList_2[kvpIndex_2].RemoveAt(nodeInex_2);
+
+                    if (roomKvpList_2[kvpIndex_2].Count == 0)
+                    {
+                        roomKvpList_2.RemoveAt(kvpIndex_2);
+                    }
+
+                }
+                roomCount[roomType] = 3;
+            }
+        }
+        foreach (RoomType roomType in roomCount.Keys.ToList())
         {
             if (roomCount[roomType] == 3||roomCount[roomType] == 2)
             {

ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.SceneManagement;
+using static Name;
 
 public class ScenceLoadManager : Singleton <ScenceLoadManager>
 {
@@ -116,7 +117,22 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
         }
         PlayerStatsManager .Instance .potionList .potionList .Clear();
         PotionManager.Instance.ReflashPotionFromHaven();
-        PlayerStatsManager.Instance.isPass = false; 
+        PlayerStatsManager.Instance.isPass = false;
+
+        //ÇåÀí¸½Ä§
+        int weaponNodeInBagCount = BagManager.Instance.bagWeaponNodeFather.childCount;
+        for (int i = 0; i < weaponNodeInBagCount; i++)
+        {
+            BagWeaponNode bagWeaponNode = BagManager.Instance.bagWeaponNodeFather.GetChild(i).GetComponent<BagWeaponNode>();
+            if(bagWeaponNode .weaponNode != null )
+            {
+                Destroy(bagWeaponNode.weaponNode.gameObject);
+            }  
+        }
+        for (int i = 0; i < weaponNodeInBagCount; i++)
+        {
+            DestroyImmediate(BagManager.Instance.bagWeaponNodeFather.GetChild(0).gameObject);
+        }
     }
     public void QuitGame()
     {