Merge pull request 'bug修缮0617' (#131) from dev45-0612 into dev-1217

Reviewed-on: #131

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

@@ -1218,7 +1218,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &41649720
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8564,6 +8564,109 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 513816544}
   m_CullTransparentMesh: 1
+--- !u!1 &519918598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 519918599}
+  - component: {fileID: 519918602}
+  - component: {fileID: 519918601}
+  - component: {fileID: 519918600}
+  m_Layer: 0
+  m_Name: NewLoadScreenCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &519918599
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519918598}
+  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: 1742492288}
+  - {fileID: 1179459156}
+  m_Father: {fileID: 1243326554}
+  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 &519918600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519918598}
+  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 &519918601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519918598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &519918602
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519918598}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 74706213}
+  m_PlaneDistance: 6
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1 &522245650
 GameObject:
   m_ObjectHideFlags: 0
@@ -12780,6 +12883,9 @@ MonoBehaviour:
   loadScreen: {fileID: 1037319343}
   slider: {fileID: 1079791878}
   text: {fileID: 41649721}
+  intoBlack: {fileID: 1179459157}
+  intoWhite: {fileID: 1742492287}
+  blackMask: {fileID: 1037319343}
 --- !u!1 &789795033
 GameObject:
   m_ObjectHideFlags: 0
@@ -16202,7 +16308,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1079791877
 RectTransform:
   m_ObjectHideFlags: 0
@@ -18066,6 +18172,166 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1175445897}
   m_CullTransparentMesh: 1
+--- !u!1001 &1179459155
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 519918599}
+    m_Modifications:
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -560.0113
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.00012207031
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2490369801246147296, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: prewarm
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Name
+      value: par_eff_ui_gameout
+      objectReference: {fileID: 0}
+    - target: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6589840777862894700, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3}
+--- !u!224 &1179459156 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1179459155}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1179459157 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1179459155}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1181181990
 GameObject:
   m_ObjectHideFlags: 0
@@ -19708,6 +19974,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 776935411}
+  - {fileID: 519918599}
   - {fileID: 1037319344}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -24933,7 +25200,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7fdb8517729ce2b42b8193e7b887c770, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  gameObjectUI: {fileID: 0}
+  gameObjectUI: {fileID: 1782739916}
 --- !u!1 &1626509943
 GameObject:
   m_ObjectHideFlags: 0
@@ -26890,6 +27157,176 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1733290891}
   m_CullTransparentMesh: 1
+--- !u!1001 &1742492286
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 519918599}
+    m_Modifications:
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.66666657
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -560.0113
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.00012207031
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 445384651250783383, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 522108414717790821, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: startDelay.scalar
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2490369801246147296, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: TriggerModule.enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2490369801246147296, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: TriggerModule.primitives.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_Name
+      value: par_eff_ui_gameIn
+      objectReference: {fileID: 0}
+    - target: {fileID: 6218921812816820065, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: startDelay.scalar
+      value: 0.58
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3}
+--- !u!1 &1742492287 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1742492286}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1742492288 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1742492286}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1748774195
 GameObject:
   m_ObjectHideFlags: 0
@@ -27378,7 +27815,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1782739916}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_ConstrainProportionsScale: 1
   m_Children:
@@ -27387,7 +27824,7 @@ 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: 37.9, y: 19}
+  m_AnchoredPosition: {x: 45.2, y: 20.7}
   m_SizeDelta: {x: 525.733, y: 240.384}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1782739918

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

@@ -734,19 +734,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp
-        m_MethodName: LoadTargetLevel
-        m_Mode: 3
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 434976241}
         m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp
         m_MethodName: ClearLevelStep
         m_Mode: 1
@@ -758,10 +746,10 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
-        m_MethodName: UIClickPlayer
-        m_Mode: 1
+      - 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
@@ -9079,18 +9067,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
-        m_MethodName: UIClickPlayer
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &793432885
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10168,7 +10144,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 434976241}
         m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp
         m_MethodName: QuitGame
         m_Mode: 1
@@ -13226,7 +13202,7 @@ Canvas:
   m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
+  m_SortingLayerID: 269777783
   m_SortingOrder: 1
   m_TargetDisplay: 0
 --- !u!224 &1239355138

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

@@ -5321,7 +5321,7 @@ 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: -430, y: -482}
+  m_AnchoredPosition: {x: 754, y: -409}
   m_SizeDelta: {x: 376.1, y: 140.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &218472043
@@ -6804,7 +6804,7 @@ 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: -1002, y: -411}
+  m_AnchoredPosition: {x: -1135, y: -411}
   m_SizeDelta: {x: 131, y: 197}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &287427685
@@ -16389,8 +16389,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2132133213}
   m_HandleRect: {fileID: 2132133212}
   m_Direction: 0
-  m_Value: 0
-  m_Size: 0.50391704
+  m_Value: 0.00000010040332
+  m_Size: 0.51286167
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -18350,8 +18350,8 @@ 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: 0.000045776367, y: -4.25}
-  m_SizeDelta: {x: 2540.1, y: 791.5}
+  m_AnchoredPosition: {x: -0.00024414062, y: -4.25}
+  m_SizeDelta: {x: 2495.8, y: 791.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &513794051
 MonoBehaviour:
@@ -18372,7 +18372,7 @@ MonoBehaviour:
   levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2}
   generatorPoint: {fileID: 282261046}
   lineOffset: 200
-  columnOffset: 150
+  columnOffset: 140
   levelMap:
   - levelColumn: []
   - levelColumn: []
@@ -25332,6 +25332,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 795797973}
   m_CullTransparentMesh: 1
+--- !u!1 &801862243
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 801862244}
+  - component: {fileID: 801862246}
+  - component: {fileID: 801862245}
+  m_Layer: 5
+  m_Name: BackGround
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &801862244
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801862243}
+  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: 1803518538}
+  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!114 &801862245
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801862243}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fe29622f75fbeed4fa639759f398470d, type: 3}
+  m_Type: 0
+  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 &801862246
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 801862243}
+  m_CullTransparentMesh: 1
 --- !u!1 &802147682
 GameObject:
   m_ObjectHideFlags: 0
@@ -32834,6 +32909,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1137579205}
   m_CullTransparentMesh: 1
+--- !u!1 &1143106108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1143106109}
+  - component: {fileID: 1143106111}
+  - component: {fileID: 1143106110}
+  m_Layer: 5
+  m_Name: FrontGround
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1143106109
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1143106108}
+  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: 1803518538}
+  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!114 &1143106110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1143106108}
+  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: 69c2b17a1fb47a64c90557eb3194bb3d, type: 3}
+  m_Type: 0
+  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 &1143106111
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1143106108}
+  m_CullTransparentMesh: 1
 --- !u!1 &1143340465
 GameObject:
   m_ObjectHideFlags: 0
@@ -37300,7 +37450,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1341243796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
@@ -37313,7 +37463,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1341243796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -48857,18 +49007,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1611111518}
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.110459104, y: -0.06972209, z: 0.71956825, w: 0.68202573}
+  m_LocalPosition: {x: 0, y: 0, z: -195}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1341243797}
   - {fileID: 465036639}
   m_Father: {fileID: 1803518538}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+  m_LocalEulerAnglesHint: {x: 14.537, y: 3.783, z: 93.551}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -17, y: 293}
   m_SizeDelta: {x: 1280, y: 800}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1611111520
@@ -54440,7 +54590,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 801862244}
   - {fileID: 1611111519}
+  - {fileID: 1143106109}
   - {fileID: 218472042}
   m_Father: {fileID: 846544929}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54495,7 +54647,7 @@ Animator:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1803518537}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: dee19c6c654842344992a94e232490ce, type: 2}
   m_CullingMode: 0
@@ -57549,7 +57701,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1941832818}
   m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -57557,8 +57709,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 1268, y: 396.2}
-  m_SizeDelta: {x: 787.4, y: 2346.5}
+  m_AnchoredPosition: {x: 1034, y: 379}
+  m_SizeDelta: {x: 755, y: 2048}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1941832820
 MonoBehaviour:
@@ -57580,7 +57732,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 18a53229c569f8c45a25cd6e68d2e350, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4d35d88971ce1e240801765b9e2ff685, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -61620,8 +61772,8 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 234112442}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.50391704, y: 1}
+  m_AnchorMin: {x: 0.000000048910305, y: 0}
+  m_AnchorMax: {x: 0.5128617, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

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

@@ -480,8 +480,8 @@ public class CardManager : Singleton<CardManager>
         texture.ReadPixels(new Rect(0, 0, renderTexture.width, renderTexture.height), 0, 0);
         texture.Apply();
         RenderTexture.active = null;
-        Material material = new Material(Shader.Find("Standard"));
-        material.mainTexture = renderTexture;
+       // Material material = new Material(Shader.Find("Standard"));
+       // material.mainTexture = renderTexture;
         Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
         CardManager.Instance.cardImageMap.Add(cardOriginalData.cardImageMark, sprite);
         

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

@@ -92,13 +92,13 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
     public void ClearLevelStep()
     {
         PlayerStatsManager.Instance.levelDevelopData.levelStep = 0;
-        PlayerStatsManager.Instance.playerState.maxHP  = 68;
-        PlayerStatsManager.Instance.playerState.currentHP  = 68;
-        PlayerStatsManager.Instance.playerState.currentCost = 3;
-        PlayerStatsManager.Instance.playerState.maxCost = 3;
-        PlayerStatsManager.Instance.playerState.maxStepRange = 2;
-        PlayerStatsManager.Instance.playerState.currentStepRange = 2;
-        PlayerStatsManager.Instance.playerState.money = 0;
+        PlayerStatsManager.Instance.playerState.maxHP  = 1000;
+        PlayerStatsManager.Instance.playerState.currentHP  = 1000;
+        PlayerStatsManager.Instance.playerState.currentCost = 10;
+        PlayerStatsManager.Instance.playerState.maxCost = 10;
+        PlayerStatsManager.Instance.playerState.maxStepRange = 5;
+        PlayerStatsManager.Instance.playerState.currentStepRange = 5;
+        PlayerStatsManager.Instance.playerState.money = 10000;
         PlayerStatsManager.Instance.relicList.relicClassNameList.Clear();
        // PlayerStatsManager.Instance.relicList.relicClassNameList.Add("LegacyNode_AncientSilverCoin");
         PlayerStatsManager.Instance.isPass = false;