背包优化0824

ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@@ -12,4 +12,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4cac7ba486f106409799af2bd4b4fc8, type: 3}
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
-  cardDeckList: []
+  cardDeckList:
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030
+  - 1030

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/Plugins/Microsoft.CSharp.dll.meta

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

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

@@ -353,7 +353,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 3518299505702855430}
         m_TargetAssemblyTypeName: RewardTipData, Assembly-CSharp
-        m_MethodName: AddForgingPoint
+        m_MethodName: GetForgerMaterial
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab

@@ -0,0 +1,518 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &123425418661306064
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4642770450902390514}
+  - component: {fileID: 6432755592450523591}
+  - component: {fileID: 4417952436473866504}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4642770450902390514
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123425418661306064}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000057126}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5883788949264027352}
+  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: 25.12, y: 5}
+  m_SizeDelta: {x: 72.43, y: 74.76}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6432755592450523591
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123425418661306064}
+  m_CullTransparentMesh: 1
+--- !u!114 &4417952436473866504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123425418661306064}
+  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: 8ff42b0a4db219e4aac2e0b399cb91a7, 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!1 &1885111812718849015
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1153001328077518075}
+  - component: {fileID: 719991134412349060}
+  - component: {fileID: 5963560438582484688}
+  m_Layer: 0
+  m_Name: "\u56FE\u6807\u5E95\u6846"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1153001328077518075
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1885111812718849015}
+  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: 5883788949264027352}
+  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: 25.119995, y: 2.75}
+  m_SizeDelta: {x: 85, y: 85}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &719991134412349060
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1885111812718849015}
+  m_CullTransparentMesh: 1
+--- !u!114 &5963560438582484688
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1885111812718849015}
+  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: 7aed610e3ffe5b24db660525833d909a, 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!1 &1977117767283953770
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 877958655911799010}
+  - component: {fileID: 8025807410309392727}
+  - component: {fileID: 6557105671467629144}
+  m_Layer: 0
+  m_Name: "\u9009\u4E2D\u5E95\u677F"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &877958655911799010
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1977117767283953770}
+  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: 5883788949264027352}
+  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: 74, y: 3.06}
+  m_SizeDelta: {x: 420.75, y: 59.28}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8025807410309392727
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1977117767283953770}
+  m_CullTransparentMesh: 1
+--- !u!114 &6557105671467629144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1977117767283953770}
+  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: cd94074760f9c6f40aef8152f926baea, 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!1 &8550563113017744413
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5883788949264027352}
+  - component: {fileID: 1534610038301911794}
+  - component: {fileID: 1378505349253547389}
+  - component: {fileID: 5350052881258363760}
+  - component: {fileID: 3518299505702855430}
+  m_Layer: 0
+  m_Name: ForgedMaterialReward 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5883788949264027352
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8550563113017744413}
+  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: 877958655911799010}
+  - {fileID: 1153001328077518075}
+  - {fileID: 4642770450902390514}
+  - {fileID: 2598097653698985699}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -94}
+  m_SizeDelta: {x: 450, y: 136}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1534610038301911794
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8550563113017744413}
+  m_CullTransparentMesh: 1
+--- !u!114 &1378505349253547389
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8550563113017744413}
+  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: 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: 8b1975934dfc1a74eb4729dd3f86d8fa, 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: 3
+--- !u!114 &5350052881258363760
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8550563113017744413}
+  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: 2
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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: 21300000, guid: 9e751b3208a34fc48901d682e98aec45,
+      type: 3}
+    m_PressedSprite: {fileID: 21300000, guid: 9e751b3208a34fc48901d682e98aec45, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: 9e751b3208a34fc48901d682e98aec45, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: cd94074760f9c6f40aef8152f926baea, type: 3}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6557105671467629144}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 3518299505702855430}
+        m_TargetAssemblyTypeName: RewardTipData, Assembly-CSharp
+        m_MethodName: AddForgingPoint
+        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 &3518299505702855430
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8550563113017744413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62e6281a9b62933439f319c9ccf6e136, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rewardType: 0
+  tipIcon: {fileID: 4417952436473866504}
+  tipText: {fileID: 4360995042761493367}
+  count: 0
+  cardChoosePanle: {fileID: 0}
+  relicDescription: {fileID: 0}
+--- !u!1 &9013330305105550707
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2598097653698985699}
+  - component: {fileID: 3388745224996848261}
+  - component: {fileID: 4360995042761493367}
+  m_Layer: 0
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2598097653698985699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9013330305105550707}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.00014129}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5883788949264027352}
+  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: 49.89, y: 6.7088}
+  m_SizeDelta: {x: 293.18, y: 66.583}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3388745224996848261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9013330305105550707}
+  m_CullTransparentMesh: 1
+--- !u!114 &4360995042761493367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9013330305105550707}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: +100
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
+  m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 45.5
+  m_fontSizeBase: 45.5
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 4
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2f5ee416cca8c1446841ade2852ac524
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1387,21 +1387,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1010123422}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
       - m_Target: {fileID: 1303037353}
         m_TargetAssemblyTypeName: StartChooseCardManager, Assembly-CSharp
-        m_MethodName: RefreshWeaponNode
+        m_MethodName: OpenGetWeaponNodePanel
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -17335,10 +17323,10 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1580813379}
+      - m_Target: {fileID: 1303037353}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_TargetAssemblyTypeName: StartChooseCardManager, Assembly-CSharp
-        m_MethodName: SetActive
+        m_MethodName: OpenGetCardPanel
-        m_Mode: 6
+        m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -18001,6 +17989,8 @@ MonoBehaviour:
   - {fileID: 1451274352}
   - {fileID: 1358131220}
   chooseCardPanel: {fileID: 2027835680}
+  getCardPanel: {fileID: 1580813379}
+  getWeaponNodePanel: {fileID: 1010123422}
   getWeaponNodeCount: 3
   playerWeaponNode: {fileID: 2036384094}
   getWeaponNodeList:

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

@@ -162,7 +162,14 @@ MonoBehaviour:
   bagForgedMaterialNodeFather: {fileID: 532420846}
   bagForgerMaterialNodePrefab: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
     type: 3}
+  bagForgedMaterialDataeLsit:
+  - {fileID: 11400000, guid: 3f6854dca3ef20d4e9ea0ecc9c55bb6e, type: 2}
+  - {fileID: 11400000, guid: b62f545cb2d676b429eb13a51c03b5ce, type: 2}
+  - {fileID: 11400000, guid: 40e2e591e9ab11c41b8df901ac950d59, type: 2}
+  - {fileID: 11400000, guid: bda419d22c1bd934684c69ff13b65299, type: 2}
+  - {fileID: 11400000, guid: 92551597994967b4abb1afe83cb61010, type: 2}
   bagForgedMaterialNodeLsit: []
+  forgedMaterialLoadPath: BagForgerMaterial/
 --- !u!4 &1381861
 Transform:
   m_ObjectHideFlags: 0
@@ -9284,18 +9291,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 768437914}
-        m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp
-        m_MethodName: ShowCard
-        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 &352650520
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9311,6 +9306,7 @@ MonoBehaviour:
   startPos: {x: 0, y: 0, z: 0}
   isSelect: 0
   associatePage: {fileID: 1073857232}
+  startTigger: 1
 --- !u!114 &352650521
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9932,136 +9928,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 372935114}
   m_CullTransparentMesh: 1
---- !u!1001 &375423534
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 532420846}
-    m_Modifications:
-    - target: {fileID: 984340898546835505, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: bagForgedMaterialData
-      value: 
-      objectReference: {fileID: 11400000, guid: bda419d22c1bd934684c69ff13b65299,
-        type: 2}
-    - target: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Name
-      value: BagForgedMaterialNode (3)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 520
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 40d0ba14db166834dad081840a8cae7c, type: 3}
---- !u!224 &375423535 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 375423534}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &381077674
 GameObject:
   m_ObjectHideFlags: 0
@@ -10711,6 +10577,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+      - m_Target: {fileID: 768437914}
+        m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp
+        m_MethodName: ShowCard
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!114 &402300955
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -14016,12 +13894,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 961878884}
-  - {fileID: 1394152100}
-  - {fileID: 1378135175}
-  - {fileID: 375423535}
-  - {fileID: 1040876951}
   m_Father: {fileID: 1854244866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -14180,7 +14053,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 3.5999756, y: 7.736328}
+  m_AnchoredPosition: {x: 3.6000977, y: 7.736328}
   m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!65 &540969703
@@ -19992,6 +19865,7 @@ MonoBehaviour:
   conditionDescription: 
   turnScore: 0
   isGemImage: 0
+  time: 0.5
 --- !u!225 &770457893
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -25039,136 +24913,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &961878883
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 532420846}
-    m_Modifications:
-    - target: {fileID: 984340898546835505, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: bagForgedMaterialData
-      value: 
-      objectReference: {fileID: 11400000, guid: 3f6854dca3ef20d4e9ea0ecc9c55bb6e,
-        type: 2}
-    - target: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Name
-      value: BagForgedMaterialNode
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 40d0ba14db166834dad081840a8cae7c, type: 3}
---- !u!224 &961878884 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 961878883}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &963935344
 GameObject:
   m_ObjectHideFlags: 0
@@ -27334,136 +27078,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1031694415}
   m_CullTransparentMesh: 1
---- !u!1001 &1040876950
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 532420846}
-    m_Modifications:
-    - target: {fileID: 984340898546835505, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: bagForgedMaterialData
-      value: 
-      objectReference: {fileID: 11400000, guid: 92551597994967b4abb1afe83cb61010,
-        type: 2}
-    - target: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Name
-      value: BagForgedMaterialNode (4)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 660
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 40d0ba14db166834dad081840a8cae7c, type: 3}
---- !u!224 &1040876951 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1040876950}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1040910949
 GameObject:
   m_ObjectHideFlags: 0
@@ -30785,6 +30399,7 @@ MonoBehaviour:
   startPos: {x: 0, y: 0, z: 0}
   isSelect: 0
   associatePage: {fileID: 626756295}
+  startTigger: 0
 --- !u!114 &1147393030
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -36145,136 +35760,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1376897621}
   m_CullTransparentMesh: 1
---- !u!1001 &1378135174
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 532420846}
-    m_Modifications:
-    - target: {fileID: 984340898546835505, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: bagForgedMaterialData
-      value: 
-      objectReference: {fileID: 11400000, guid: 40e2e591e9ab11c41b8df901ac950d59,
-        type: 2}
-    - target: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Name
-      value: BagForgedMaterialNode (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 380
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 40d0ba14db166834dad081840a8cae7c, type: 3}
---- !u!224 &1378135175 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1378135174}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1378460836
 GameObject:
   m_ObjectHideFlags: 0
@@ -36727,136 +36212,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1394152099
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 532420846}
-    m_Modifications:
-    - target: {fileID: 984340898546835505, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: bagForgedMaterialData
-      value: 
-      objectReference: {fileID: 11400000, guid: b62f545cb2d676b429eb13a51c03b5ce,
-        type: 2}
-    - target: {fileID: 2854515758532034481, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Name
-      value: BagForgedMaterialNode (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 240
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 40d0ba14db166834dad081840a8cae7c, type: 3}
---- !u!224 &1394152100 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1394152099}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1398981533
 GameObject:
   m_ObjectHideFlags: 0
@@ -49823,6 +49178,7 @@ MonoBehaviour:
   startPos: {x: 0, y: 0, z: 0}
   isSelect: 0
   associatePage: {fileID: 461361660}
+  startTigger: 0
 --- !u!114 &1902244217
 MonoBehaviour:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagForgedMaterial/BagForgedMaterialNode.cs

@@ -13,20 +13,17 @@ public class BagForgedMaterialNode : MonoBehaviour, IPointerExitHandler, IPointe
     public TMP_Text nunberText;
     public Image nodeIcon;
     public BagForgedMaterialData_SO bagForgedMaterialData;
-    public void Start()
+   
-    {
-        SetUpBagForgedMaterialNode();
-        BagManager.Instance.bagForgedMaterialNodeLsit.Add(this);
-    }
     public void SetUpBagForgedMaterialNode()
     {
         nameText.text = bagForgedMaterialData.materialName;
         infortext.text = bagForgedMaterialData.materialInfor;
-        nunberText.text = bagForgedMaterialData.materialCount;
+        nunberText.text = bagForgedMaterialData.materialCount.ToString();
         if(bagForgedMaterialData .materialIcon != null )
         {
             nodeIcon.sprite = bagForgedMaterialData.materialIcon;
         }
+        BagManager.Instance.bagForgedMaterialNodeLsit.Add(this);
     }
     public void OnPointerEnter(PointerEventData eventData)
     {

ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagManager.cs

@@ -12,8 +12,9 @@ public class BagManager : Singleton <BagManager>
     [Header("똴芚꼼죕교관")]
     public Transform bagForgedMaterialNodeFather;
     public GameObject bagForgerMaterialNodePrefab;
+    public List<BagForgedMaterialData_SO> bagForgedMaterialDataeLsit = new List<BagForgedMaterialData_SO>();
     public List<BagForgedMaterialNode> bagForgedMaterialNodeLsit = new List<BagForgedMaterialNode>();
-
+    public string forgedMaterialLoadPath = "BagForgerMaterial/"; 
     private void Start()
     {
         DontDestroyOnLoad(this.gameObject);
@@ -36,5 +37,63 @@ public class BagManager : Singleton <BagManager>
         weaponNode .bagWeaponNode = bagWeaponNode;
         weaponNodeObject.transform.SetParent(bagWeaponNode.preparePanel);
         weaponNodeObject .transform .localPosition = Vector3.zero;
+
+        weaponNode.SetUpBagNode();
+    }
+
+    public void GetForgedMaterialToBag(BagForgedMaterialData_SO  bagForgedMaterialData,int count)
+    {
+        bagForgedMaterialData.materialCount += count;
+        bool isExist = false;
+        for (int i=0; i< bagForgedMaterialDataeLsit.Count;i++)
+        {
+            if(bagForgedMaterialDataeLsit[i] == bagForgedMaterialData)
+            {
+                isExist = true;
+                break;
+            }
+        }
+        if (isExist == false)
+        {
+            bagForgedMaterialDataeLsit.Add (bagForgedMaterialData);
+        }
+
+        RefreshForgedMaterialBag();
+    }
+    public void RemoveForgedMaterialToBag(BagForgedMaterialData_SO bagForgedMaterialData, int count)
+    {
+        for (int i = 0; i < bagForgedMaterialDataeLsit.Count; i++)
+        {
+            if (bagForgedMaterialDataeLsit[i] == bagForgedMaterialData)
+            {
+                bagForgedMaterialData.materialCount -= count;
+                if (bagForgedMaterialData.materialCount <= 0)
+                {
+                    bagForgedMaterialDataeLsit.Remove(bagForgedMaterialData);
+                }
+
+                RefreshForgedMaterialBag();
+                break;
+            }
+        } 
+    }
+    public void RefreshForgedMaterialBag()
+    {
+        for (int i = 0; i < bagForgedMaterialNodeLsit.Count; i++)
+        {
+            Destroy(bagForgedMaterialNodeLsit[i].gameObject);
+        }
+        bagForgedMaterialNodeLsit.Clear();
+
+        for (int i = 0; i < bagForgedMaterialDataeLsit.Count; i++)
+        {
+            if(bagForgedMaterialDataeLsit[i].materialCount > 0)
+            {
+                BagForgedMaterialNode bagForgedMaterialNode = Instantiate(bagForgerMaterialNodePrefab, bagForgedMaterialNodeFather).GetComponent<BagForgedMaterialNode>();
+                bagForgedMaterialNode.bagForgedMaterialData = bagForgedMaterialDataeLsit[i];
+                bagForgedMaterialNode.SetUpBagForgedMaterialNode();
+            }
+            
+        }
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Bag/LabelNode.cs

@@ -9,10 +9,18 @@ public class LabelNode : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
     public bool isSelect;
     [Header ("对应页面")]
     public GameObject associatePage;
+    [Header("初始触发")]
+    public bool startTigger;
 
     void Start()
     {
         startPos = transform.localPosition;
+        if (startTigger )
+        {
+            isSelect = true;
+            transform.localPosition += new Vector3(-50f, 0, 0);
+            associatePage.SetActive(true);
+        }
     }
 
     public void LabelTigger()

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

@@ -8,30 +8,55 @@ public class ShowEnemyDeck : MonoBehaviour, IPointerEnterHandler, IPointerExitHa
     public GameObject cardDeck;
     public bool isLock;
     public bool isOn;
+
+    [Header("¼ÆʱÆ÷")]
+    public float time = 0.5f;
+    float currentTime;
+    bool isShow;
+    private void Start()
+    {
+        currentTime = time;
+    }
     private void Update()
     {
-        if(isLock ==true )
+        if (isLock == true)
         {
-            if (Input.GetKeyDown(KeyCode.Mouse0)|| Input.GetKeyDown(KeyCode.Mouse1))
+            if (Input.GetKeyDown(KeyCode.Mouse0) || Input.GetKeyDown(KeyCode.Mouse1))
             {
                 cardDeck.gameObject.SetActive(false);
                 isLock = false;
+
+                isShow = false;
+                currentTime = time;
             }
         }
-        else
+
+        if (isOn)
         {
-            if (Input.GetKeyDown(KeyCode.Mouse1))
+            if (isShow == false)
+            {
+                if (currentTime > 0)
+                {
+                    currentTime -= Time.deltaTime;
+                }
+                else
+                {
+                    isShow = true;
+                    cardDeck.SetActive(true);
+                }
+            }
+            else
             {
-                if (isOn == true)
+                if (Input.GetKeyDown(KeyCode.Mouse1))
                 {
-                   isLock = true;
+                    isLock = true;
                 }
             }
+           
         }       
     }
     public void OnPointerEnter(PointerEventData eventData)
     {
-        cardDeck.SetActive(true);
         isOn = true;
     }
 
@@ -40,6 +65,8 @@ public class ShowEnemyDeck : MonoBehaviour, IPointerEnterHandler, IPointerExitHa
         if (isLock == false)
         {
             cardDeck.SetActive(false);
+            isShow = false;
+            currentTime = time;
         }
         isOn = false;
     }

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

@@ -20,7 +20,7 @@ public class RewardManager : Singleton<RewardManager>
     public GameObject rewardTipPrefabLegacy;
     public GameObject rewardTipPrefabPotion;
     public GameObject rewardTipPrefabForgPoint;
-
+    public GameObject rewardTipPrefabForgedMaterial;
     public List<RewardTipData> rewardsList = new List<RewardTipData>();//奖励生成后实体表
 
     [Header("卡牌奖励表")]
@@ -41,7 +41,8 @@ public class RewardManager : Singleton<RewardManager>
         money,
         legacy,
         potion,
-        forgPoint
+        forgPoint,
+        forgedMaterial
     }
 
     private void Start()
@@ -53,8 +54,7 @@ public class RewardManager : Singleton<RewardManager>
         yield return new WaitForSeconds(3f);
         AddRewardTips(RewardManager.RewardType.money,"20");
         AddRewardTips(RewardManager.RewardType.card,"3");
-        AddRewardTips(RewardManager.RewardType.forgPoint, "20");
+        AddRewardTips(RewardManager.RewardType.forgedMaterial, "»ðɽ");
-        AddRewardTips(RewardManager.RewardType.potion, "6001");
         AddRewardTips(RewardManager.RewardType.legacy, "LegacyNode_PlatedSteelcaps");
      }
 
@@ -130,6 +130,14 @@ public class RewardManager : Singleton<RewardManager>
                 forgPonitRewardTipData.tipText.text = "+" + amount;
                 rewardsList.Add(forgPonitRewardTipData);
                 break;
+            case RewardType.forgedMaterial:
+                var forgedMaterialTip = Instantiate(rewardTipPrefabForgedMaterial, chooseRewardPanle.transform);
+                RewardTipData forgedMaterialTipData = forgedMaterialTip.GetComponent<RewardTipData>();
+                forgedMaterialTipData.rewardType = RewardType.forgedMaterial;
+                forgedMaterialTipData.count = amount;
+                forgedMaterialTipData.tipText.text = amount;
+                rewardsList.Add(forgedMaterialTipData);
+                break;
         }
 
         chooseRewardPanle.GetComponent<RectTransform>().sizeDelta = new Vector2(400 * rewardsList.Count, 0);

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

@@ -72,4 +72,14 @@ public class RewardTipData : MonoBehaviour
         RewardManager.Instance.DeleteRewardTip(this.gameObject);
         
     }   
+    //获取锻造材料
+    public void GetForgerMaterial()
+    {
+        //加锻造点;
+        PlayerStatsManager.Instance.EffectFunction(Name.Reward.forgedMaterial, count);
+        //声音
+        AudioManager.Instance.MenuClosePlayer();
+
+        RewardManager.Instance.DeleteRewardTip(this.gameObject);
+    }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing.Printing;
 using System.IO;
 using System.Linq;
 using Unity.VisualScripting;
@@ -145,6 +146,20 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
                 PotionManager.Instance.ReflashPotionFromHaven();
                 Debug.Log("»ñµÃÒ©Ë®:" + amount);
                 break;
+            //鳳腕傯婖第蹋
+            case Name.Reward.forgedMaterial:
+                BagForgedMaterialData_SO bagForgedMaterialData = Resources.Load<BagForgedMaterialData_SO>(BagManager.Instance.forgedMaterialLoadPath + amount);
+                if(bagForgedMaterialData == null )
+                {
+                    Debug.Log("樓婥囮啖");
+                }
+                else
+                {
+                    Debug.Log("樓婥傖髡");
+                }
+                BagManager.Instance.GetForgedMaterialToBag(bagForgedMaterialData, 1);
+                Debug.Log("鳳腕傯婖第蹋:" + amount);
+                break;
         }
     }
     public void gainMoney(int value)

ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs

@@ -16,13 +16,15 @@ public class StartChooseCardManager : Singleton<StartChooseCardManager>
     [Header("엥탬삿혤")]
     public List<Transform> chooseCardFather;//역관덤朞엥탬
     public GameObject chooseCardPanel;
-
+    public GameObject getCardPanel;
     [Header("삿혤맒침")]
+    public GameObject getWeaponNodePanel;
     public int getWeaponNodeCount = 3;
     public Transform playerWeaponNode;
     public List<GetWeaponNode> getWeaponNodeList = new List<GetWeaponNode>();
     public Animator getWeaponNodeAnimator;
     public GameObject weaponNodeMove;
+    bool firstRefresh;//首次打开刷新，之后不刷新
 
     public void GenerateChooseCard(List<string> cardID)
     {
@@ -136,9 +138,41 @@ public class StartChooseCardManager : Singleton<StartChooseCardManager>
            {
                 //playerWeaponNode.GetChild(i).GetChild(0).SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i));
                 // WeaponManager.Instance.playerWeaponNodeList.GetChild(i).GetChild(0).localPosition = Vector3.zero;
+                GameObject currentWeaponNode = playerWeaponNode.GetChild(i).GetChild(0).gameObject;
 
                 BagManager.Instance.GetWeaponNodeToBag(playerWeaponNode.GetChild(i).GetChild(0).gameObject);
-           }
+
+                currentWeaponNode.transform.SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i));
+                currentWeaponNode.transform.localPosition = Vector3.zero;
+            }
+        }
+    }
+
+    public void OpenGetWeaponNodePanel()
+    {
+        if(getWeaponNodeCount>0)
+        {
+            getWeaponNodePanel.SetActive(true);
+        }
+        else
+        {
+            TipManager.Instance.SendGetItemTip("获取次数已用尽");
+        }
+        if(firstRefresh ==false )
+        {
+            RefreshWeaponNode();
+        }
+        firstRefresh = true;
+    }
+    public void OpenGetCardPanel()
+    {
+        if (openCount  > 0)
+        {
+            getCardPanel.SetActive(true);
+        }
+        else
+        {
+            TipManager.Instance.SendGetItemTip("获取次数已用尽");
         }
     }
 }

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

@@ -9,6 +9,6 @@ public class BagForgedMaterialData_SO : ScriptableObject
     [TextArea]
     public string materialInfor;
     public string materialNodeMark;
-    public string materialCount;
+    public int materialCount;
     public Sprite materialIcon;
 }

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

@@ -119,6 +119,7 @@ public static class Name
         public const int CurrentCost = 9;
         public const int Potion = 10;
         public const int GetItemTip = 11;
+        public const int forgedMaterial = 12;
     }
     public static class SpriteColorString
     {

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

@@ -59,14 +59,39 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
 
     //public Sprite gemImage;
     public bool isGemImage;//标志是否是领域类型宝石
-
+    [Header("信息板计时器")]
+    public float time =0.5f;
+    float currentTime;
+    bool isShow;
+    bool isOn;
     private void Update()
     {
         //SettleScore();
+        if(isOn &&isShow ==false )
+        {
+            if (currentTime > 0)
+            {
+                currentTime -= Time.deltaTime;
+            }
+            else
+            {
+                if (condition.Equals(Name.WeaponNodeCondition.node) == false)
+                {
+                    inforPanel.SetActive(true);
+                }
+                else
+                {
+                    gemImageInforPanel.SetActive(true);
+                }
+                isShow = true;
+            }
+        }
+       
     }
     
     private void Start()
     {
+        currentTime = time;
         resultDescription = Name.getGemResultDescription(result, resultValue, nodesMark, nodesColor);
         conditionDescription = Name.getGemConditionDescription(condition, conditionValue, nodesMark, nodesColor);
         SetUpInforText();
@@ -689,7 +714,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
     {
         originParent = transform.parent;
         GameObject targetObj = eventData.pointerCurrentRaycast.gameObject;
-        if (targetObj.CompareTag("WeaponDragPanel"))
+        if (targetObj != null && targetObj.CompareTag("WeaponDragPanel"))
         {
             transform.SetParent(transform.parent.parent);
             //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
@@ -715,7 +740,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
     public void OnDrag(PointerEventData eventData)
     {
         GameObject targetObj = eventData.pointerCurrentRaycast.gameObject;
-        if(targetObj.CompareTag("WeaponDragPanel"))
+        if(targetObj != null && targetObj.CompareTag("WeaponDragPanel"))
         {
             //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
             screenPosition = Camera.main.WorldToScreenPoint(transform.position);
@@ -738,7 +763,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
     {
         onDragVFX.SetActive(false);
         GameObject targetObj = eventData.pointerCurrentRaycast.gameObject;
-        if (targetObj.name == "WeaponSlot")//Íϵ½½»»¥µã´¥·¢½»»¥
+        if (targetObj != null && targetObj.name == "WeaponSlot")//拖到交互点触发交互
         {
             if (targetObj.transform.childCount == 0)//子集没有物体，这是个空仓位，可以置入
             {
@@ -746,7 +771,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
                 transform.localPosition = Vector3.zero;
             }   
         }
-        else if(targetObj .name == "WeaponNode(Clone)")
+        else if(targetObj != null && targetObj .name == "WeaponNode(Clone)")
         {
             if(targetObj.transform .parent.name != "WeaponNodeBag")//不在背包内才能调换
             {
@@ -770,7 +795,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
             }
             else
             {
-                if(targetObj.name == "BagPlayerWeaponPanel")
+                if(targetObj == null ||targetObj.name == "BagPlayerWeaponPanel")
                 {
                     BackPosition();
                 }
@@ -803,17 +828,14 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
 
     public void OnPointerEnter(PointerEventData eventData)
     {
-        if (condition.Equals(Name.WeaponNodeCondition.node) == false)
+        isOn = true;
-        {
-            inforPanel.SetActive(true);
-        }
-        else
-        {
-           gemImageInforPanel .SetActive(true);
-        }
     }
+
     public void OnPointerExit(PointerEventData eventData)
     {
+        isOn = false;
+        isShow = false;
+        currentTime = time;
         inforPanel.SetActive(false);
         gemImageInforPanel.SetActive(false);
     }
@@ -885,10 +907,14 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
             // inforTextGemImage.text = resultDescription;
             WeaponManager.Instance.StartCoroutine(GenerateGemImage());
         }
-        if(bagWeaponNode != null )
+    }
+
+    public void SetUpBagNode()
+    {
+        if (bagWeaponNode != null)
         {
             bagWeaponNode.nameText.text = nameText.text;
-            bagWeaponNode .inforText.text = inforText.text;
+            bagWeaponNode.inforText.text = inforText.text;
             bagWeaponNode.gemImageIcon.sprite = gemImageIcon.sprite;
             bagWeaponNode.nameTextGemImage.text = nameTextGemImage.text;
             bagWeaponNode.inforTextGemImage.text = inforTextGemImage.text;