diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 61eca93a..ca84d986 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/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 diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta new file mode 100644 index 00000000..1d182472 --- /dev/null +++ b/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: diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta deleted file mode 100644 index 17bba4e5..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta +++ /dev/null @@ -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: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgPointReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgPointReward.prefab index de612c61..82c4adee 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgPointReward.prefab +++ b/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} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab new file mode 100644 index 00000000..5beee52a --- /dev/null +++ b/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} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab.meta new file mode 100644 index 00000000..d68d91e7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ForgedMaterialReward 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f5ee416cca8c1446841ade2852ac524 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/二级红色地块.asset b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/二级红色地块.asset similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/二级红色地块.asset rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/二级红色地块.asset diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/二级红色地块.asset.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/二级红色地块.asset.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/二级红色地块.asset.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/二级红色地块.asset.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/垃圾.asset b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/垃圾.asset similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/垃圾.asset rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/垃圾.asset diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/垃圾.asset.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/垃圾.asset.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/垃圾.asset.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/垃圾.asset.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/据点.asset b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/据点.asset similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/据点.asset rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/据点.asset diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/据点.asset.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/据点.asset.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/据点.asset.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/据点.asset.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/植物.asset b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/植物.asset similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/植物.asset rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/植物.asset diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/植物.asset.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/植物.asset.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/植物.asset.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/植物.asset.meta diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/火山.asset b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/火山.asset similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/火山.asset rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/火山.asset diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/火山.asset.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/火山.asset.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/GameDate/BagForgerMaterial/火山.asset.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/BagForgerMaterial/火山.asset.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity index 6cd071df..51b5e01a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity +++ b/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_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1303037353} + m_TargetAssemblyTypeName: StartChooseCardManager, Assembly-CSharp + m_MethodName: OpenGetCardPanel + 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: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 1e2f8aa1..695229d1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -1711,107 +1711,6 @@ RectTransform: m_AnchoredPosition: {x: -0.0000076293945, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &35264499 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 35264500} - - component: {fileID: 35264503} - - component: {fileID: 35264502} - - component: {fileID: 35264501} - m_Layer: 5 - m_Name: InforPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &35264500 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35264499} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000053656} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 281561566} - - {fileID: 2136444646} - m_Father: {fileID: 1625351731} - 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: 135, y: -50.455} - m_SizeDelta: {x: 200, y: 140} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &35264501 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35264499} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 1637390125 - m_SortingOrder: 8 - m_TargetDisplay: 0 ---- !u!114 &35264502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35264499} - 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: b3eb51b644a6858478e0cb59f8bf44f2, 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: 10 ---- !u!222 &35264503 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35264499} - m_CullTransparentMesh: 1 --- !u!1 &35558263 GameObject: m_ObjectHideFlags: 0 @@ -8168,6 +8067,7 @@ MonoBehaviour: startPos: {x: 0, y: 0, z: 0} isSelect: 0 associatePage: {fileID: 171639738} + startTigger: 0 --- !u!114 &188435671 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12853,141 +12753,6 @@ MonoBehaviour: textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, type: 3} tree: {fileID: 2458175114420723768, guid: f3c59a4c3b3c54a4c952f50e44940dfc, type: 3} ---- !u!1 &281561565 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 281561566} - - component: {fileID: 281561568} - - component: {fileID: 281561567} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &281561566 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281561565} - 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: 35264500} - 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: -6.8, y: 43} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &281561567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281561565} - 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: "\u9178\u96E8" - 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: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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} ---- !u!222 &281561568 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281561565} - m_CullTransparentMesh: 1 --- !u!1 &282261046 GameObject: m_ObjectHideFlags: 0 @@ -22382,139 +22147,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 381488711} m_CullTransparentMesh: 1 ---- !u!1 &385563947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 385563948} - - component: {fileID: 385563951} - - component: {fileID: 385563950} - - component: {fileID: 385563949} - m_Layer: 5 - m_Name: WeaponNodeBagButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &385563948 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385563947} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000017256045} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2133607302} - m_Father: {fileID: 1237113655} - 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: -908.1, y: -283.4} - m_SizeDelta: {x: 63, y: 34.8} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &385563949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385563947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.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: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 385563950} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 595819629} - 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 ---- !u!114 &385563950 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385563947} - 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: 0, g: 0, b: 0, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &385563951 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385563947} - m_CullTransparentMesh: 1 --- !u!1 &391507784 GameObject: m_ObjectHideFlags: 0 @@ -26692,141 +26324,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484006313} m_CullTransparentMesh: 1 ---- !u!1 &484561979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 484561980} - - component: {fileID: 484561982} - - component: {fileID: 484561981} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &484561980 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 484561979} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000051768133} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2140385644} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.000045776367, y: 0} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &484561981 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 484561979} - 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: "\u9886\u57DF" - 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: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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} ---- !u!222 &484561982 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 484561979} - m_CullTransparentMesh: 1 --- !u!1 &485490294 GameObject: m_ObjectHideFlags: 0 @@ -27810,7 +27307,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &504928347 RectTransform: m_ObjectHideFlags: 0 @@ -30999,81 +30496,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 565794694} m_CullTransparentMesh: 1 ---- !u!1 &568603656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 568603657} - - component: {fileID: 568603659} - - component: {fileID: 568603658} - m_Layer: 5 - m_Name: GenImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &568603657 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 568603656} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000019144} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2140385644} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -117.325} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &568603658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 568603656} - 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.4745098} - 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: 0} - 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 &568603659 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 568603656} - m_CullTransparentMesh: 1 --- !u!1 &569168380 GameObject: m_ObjectHideFlags: 0 @@ -31188,102 +30610,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inforPanleType: 0 ---- !u!1 &570916661 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 570916662} - - component: {fileID: 570916665} - - component: {fileID: 570916664} - - component: {fileID: 570916663} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &570916662 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 570916661} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00006289} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 595819630} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 2.5} - m_SizeDelta: {x: 187.84, y: 5} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &570916663 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 570916661} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &570916664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 570916661} - 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: 2417b4f61de715a4bb4c632aeed5fd8b, 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 &570916665 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 570916661} - m_CullTransparentMesh: 1 --- !u!1 &572442448 GameObject: m_ObjectHideFlags: 0 @@ -31993,160 +31319,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 590518868} m_CullTransparentMesh: 1 ---- !u!1 &592423529 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 592423530} - - component: {fileID: 592423534} - - component: {fileID: 592423533} - - component: {fileID: 592423532} - - component: {fileID: 592423531} - m_Layer: 5 - m_Name: "\u5173\u95ED" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &592423530 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592423529} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000070103} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1427585204} - m_Father: {fileID: 595819630} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 162.7, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &592423531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592423529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &592423532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592423529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.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: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 592423533} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 595819629} - 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: 0 - m_CallState: 2 ---- !u!114 &592423533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592423529} - 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!222 &592423534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592423529} - m_CullTransparentMesh: 1 --- !u!1 &592425485 GameObject: m_ObjectHideFlags: 0 @@ -32457,110 +31629,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 595454839} m_CullTransparentMesh: 1 ---- !u!1 &595819629 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 595819630} - - component: {fileID: 595819633} - - component: {fileID: 595819632} - - component: {fileID: 595819631} - m_Layer: 5 - m_Name: WeaponNodeBag - m_TagString: WeaponDragPanel - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &595819630 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595819629} - 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: 570916662} - - {fileID: 1161982676} - - {fileID: 592423530} - - {fileID: 1625351731} - m_Father: {fileID: 1544873703} - 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: -762.8, y: -48.4} - m_SizeDelta: {x: 162.3, y: 404.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &595819631 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595819629} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 0 - m_Top: 10 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 40, y: 40} - m_Spacing: {x: 10, y: 10} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &595819632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595819629} - 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: 6f1a9652ce8517f42b2c19c45da9236e, 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 &595819633 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595819629} - m_CullTransparentMesh: 1 --- !u!1 &598474231 GameObject: m_ObjectHideFlags: 0 @@ -34525,141 +33593,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641937636} m_CullTransparentMesh: 1 ---- !u!1 &644398891 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 644398892} - - component: {fileID: 644398894} - - component: {fileID: 644398893} - m_Layer: 5 - m_Name: Text (TMP) (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &644398892 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644398891} - 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: 2140385644} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.0000019073, y: -50.1} - m_SizeDelta: {x: 200, y: 27.54} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &644398893 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644398891} - 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: "\u5F53\u573A\u5730\u4E2D\u5B58\u5728" - 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: 11400000, guid: 1177b64b22a7dfb4a8e45264a472c7f8, type: 2} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 17 - m_fontSizeBase: 17 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -16 - 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} ---- !u!222 &644398894 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644398891} - m_CullTransparentMesh: 1 --- !u!1 &652901960 GameObject: m_ObjectHideFlags: 0 @@ -37040,6 +35973,30 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 1675556060} + 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 + - m_Target: {fileID: 1863170921} + m_TargetAssemblyTypeName: BagManager, Assembly-CSharp + m_MethodName: RefreshForgedMaterialBag + 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 &716255039 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44190,136 +43147,6 @@ MonoBehaviour: wind: {fileID: 2542737382161037691, guid: c56025805a991fe4ca8b2abe2d021e36, type: 3} blackVFX: {fileID: 6585974295055736227, guid: 571c658a07856f644896d8be50648df7, type: 3} ---- !u!1001 &887556989 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1065623412} - 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 &887556990 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c, - type: 3} - m_PrefabInstance: {fileID: 887556989} - m_PrefabAsset: {fileID: 0} --- !u!1 &891845966 GameObject: m_ObjectHideFlags: 0 @@ -47188,7 +46015,7 @@ MonoBehaviour: m_EditorClassIdentifier: playerUICanvas: {fileID: 951356944} infightMapComplete: 1 - weaponNodeBag: {fileID: 595819629} + weaponNodeBag: {fileID: 0} --- !u!114 &951356942 MonoBehaviour: m_ObjectHideFlags: 0 @@ -48160,81 +46987,6 @@ RectTransform: m_AnchoredPosition: {x: 291, y: -26.699898} m_SizeDelta: {x: 70.7, y: 57.33} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &966097119 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 966097120} - - component: {fileID: 966097122} - - component: {fileID: 966097121} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &966097120 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966097119} - 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: 1625351731} - 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: 0} - m_SizeDelta: {x: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &966097121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966097119} - 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.49019608} - 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: 0} - 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 &966097122 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 966097119} - m_CullTransparentMesh: 1 --- !u!1 &967334092 GameObject: m_ObjectHideFlags: 0 @@ -49999,6 +48751,7 @@ MonoBehaviour: conditionDescription: turnScore: 0 isGemImage: 0 + time: 0.5 --- !u!1 &1009332616 GameObject: m_ObjectHideFlags: 0 @@ -51426,136 +50179,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040257164} m_CullTransparentMesh: 1 ---- !u!1001 &1047568730 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1065623412} - 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 &1047568731 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c, - type: 3} - m_PrefabInstance: {fileID: 1047568730} - m_PrefabAsset: {fileID: 0} --- !u!1 &1051341099 GameObject: m_ObjectHideFlags: 0 @@ -52256,7 +50879,7 @@ GameObject: - component: {fileID: 1065623411} - component: {fileID: 1065623410} m_Layer: 5 - m_Name: CardContent + m_Name: ForgedMaterialContent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -52309,12 +50932,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1187971389} - - {fileID: 1121843407} - - {fileID: 1674923847} - - {fileID: 1047568731} - - {fileID: 887556990} + m_Children: [] m_Father: {fileID: 1881955723} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -52414,6 +51032,7 @@ MonoBehaviour: cardDeck: {fileID: 1647403363} isLock: 0 isOn: 0 + time: 0.5 --- !u!1 &1071114257 GameObject: m_ObjectHideFlags: 0 @@ -52669,6 +51288,8 @@ MonoBehaviour: type: 3} rewardTipPrefabForgPoint: {fileID: 8550563113017744413, guid: 4938ceb3d7e244e4e80676ed98aa8b7e, type: 3} + rewardTipPrefabForgedMaterial: {fileID: 8550563113017744413, guid: 4938ceb3d7e244e4e80676ed98aa8b7e, + type: 3} rewardsList: [] cardRewardList: [] cardPrefabCommon: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc, @@ -55114,136 +53735,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1121634044} m_CullTransparentMesh: 1 ---- !u!1001 &1121843406 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1065623412} - 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 &1121843407 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c, - type: 3} - m_PrefabInstance: {fileID: 1121843406} - m_PrefabAsset: {fileID: 0} --- !u!1 &1126048776 GameObject: m_ObjectHideFlags: 0 @@ -56371,102 +54862,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160192692} m_CullTransparentMesh: 1 ---- !u!1 &1161982675 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1161982676} - - component: {fileID: 1161982679} - - component: {fileID: 1161982678} - - component: {fileID: 1161982677} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1161982676 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161982675} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000043140113} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 595819630} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -2.5} - m_SizeDelta: {x: 187.84, y: 5} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &1161982677 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161982675} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1161982678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161982675} - 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: 2417b4f61de715a4bb4c632aeed5fd8b, 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 &1161982679 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161982675} - m_CullTransparentMesh: 1 --- !u!1 &1162620700 GameObject: m_ObjectHideFlags: 0 @@ -58237,12 +56632,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1184552115} m_CullTransparentMesh: 1 ---- !u!224 &1187971389 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c, - type: 3} - m_PrefabInstance: {fileID: 2010533703671165524} - m_PrefabAsset: {fileID: 0} --- !u!1 &1188036621 GameObject: m_ObjectHideFlags: 0 @@ -60148,7 +58537,6 @@ RectTransform: - {fileID: 2038017531} - {fileID: 1848216718} - {fileID: 1864193507} - - {fileID: 385563948} - {fileID: 1344828968} - {fileID: 1308856591} m_Father: {fileID: 951356945} @@ -64525,141 +62913,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1344828967} m_CullTransparentMesh: 1 ---- !u!1 &1345845498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1345845499} - - component: {fileID: 1345845501} - - component: {fileID: 1345845500} - m_Layer: 5 - m_Name: Text (TMP) (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1345845499 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1345845498} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00012079} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2140385644} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 100.174995, y: -257.585} - m_SizeDelta: {x: 200, y: 99.57001} - m_Pivot: {x: 1, y: 0} ---- !u!114 &1345845500 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1345845498} - 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: "12\u6740\u4E86\u6253\u5F00\u554A\u6740\u4E86\u6253\u5F00ask\u7684\u79BB\u5F00ask\u7684" - 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: 11400000, guid: 1177b64b22a7dfb4a8e45264a472c7f8, type: 2} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 17 - m_fontSizeBase: 17 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -16 - 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} ---- !u!222 &1345845501 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1345845498} - m_CullTransparentMesh: 1 --- !u!1 &1350584448 GameObject: m_ObjectHideFlags: 0 @@ -64971,6 +63224,7 @@ MonoBehaviour: conditionDescription: turnScore: 0 isGemImage: 0 + time: 0.5 --- !u!225 &1355472099 CanvasGroup: m_ObjectHideFlags: 0 @@ -67663,81 +65917,6 @@ RectTransform: m_AnchoredPosition: {x: 291, y: 28.66517} m_SizeDelta: {x: 70.7, y: 57.65} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1427585203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1427585204} - - component: {fileID: 1427585206} - - component: {fileID: 1427585205} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1427585204 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427585203} - 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: 592423530} - 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: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1427585205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427585203} - 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: 945ce1cb72eb95840b94268b73cd2468, 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 &1427585206 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427585203} - m_CullTransparentMesh: 1 --- !u!1 &1428717752 GameObject: m_ObjectHideFlags: 0 @@ -74039,7 +72218,6 @@ RectTransform: m_Children: - {fileID: 1852263527} - {fileID: 1296022614} - - {fileID: 595819630} - {fileID: 1747403914} m_Father: {fileID: 951356945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -82329,140 +80507,6 @@ RectTransform: m_AnchoredPosition: {x: 298.24, y: -29.91} m_SizeDelta: {x: 50.99, y: 59.511} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1625351730 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1625351731} - - component: {fileID: 1625351735} - - component: {fileID: 1625351734} - - component: {fileID: 1625351733} - - component: {fileID: 1625351732} - m_Layer: 5 - m_Name: WeaponNode - m_TagString: WeaponDragPanel - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1625351731 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625351730} - 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: 35264500} - - {fileID: 2140385644} - - {fileID: 966097120} - m_Father: {fileID: 595819630} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -30} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1625351732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625351730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d6302809f06dc36468787c81c4c492aa, type: 3} - m_Name: - m_EditorClassIdentifier: - enableVFX: {fileID: 966097119} - onBeginDargVFX: {fileID: 0} - onDragVFX: {fileID: 0} - inforPanel: {fileID: 35264499} - nameText: {fileID: 281561567} - inforText: {fileID: 2136444647} - gemImageInforPanel: {fileID: 2140385643} - gemImageIcon: {fileID: 568603658} - nameTextGemImage: {fileID: 484561981} - inforTextGemImage: {fileID: 1345845500} - bagWeaponNode: {fileID: 0} - condition: blue>5 - result: addScore - conditionValue: - resultValue: 7 - nodesMark: [] - nodesColor: [] - extraRedNodeCount: 0 - extraBlueNodeCount: 0 - extraYellowNodeCount: 0 - extraMostNodeCount: 0 - extraLeastNodeCount: 0 - extraAllNodeCount: 0 - isIgnoreCondition: 0 - isDoubleSettle: 0 - resultDescription: - conditionDescription: - turnScore: 0 - isGemImage: 0 ---- !u!225 &1625351733 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625351730} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1625351734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625351730} - 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: 0, g: 0.5377358, b: 0.5037413, 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: -2413806693520163455, guid: 901615a662d008a48a082760ca1c91ee, - 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 &1625351735 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1625351730} - m_CullTransparentMesh: 1 --- !u!1 &1627366718 GameObject: m_ObjectHideFlags: 0 @@ -84847,136 +82891,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674521217} m_CullTransparentMesh: 1 ---- !u!1001 &1674923846 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1065623412} - 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 &1674923847 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5479616897448529614, guid: 40d0ba14db166834dad081840a8cae7c, - type: 3} - m_PrefabInstance: {fileID: 1674923846} - m_PrefabAsset: {fileID: 0} --- !u!1 &1675556059 GameObject: m_ObjectHideFlags: 0 @@ -93199,9 +91113,17 @@ MonoBehaviour: bagWeaponNodePrefab: {fileID: 3371056076410450524, guid: 281985e5e196c3d4fbcba3420258be3b, type: 3} bagWeaponNodeFather: {fileID: 391507788} - bagForgedMaterialNodeFather: {fileID: 0} - bagForgerMaterialNodePrefab: {fileID: 0} + bagForgedMaterialNodeFather: {fileID: 1065623412} + 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 &1863170922 Transform: m_ObjectHideFlags: 0 @@ -99230,6 +97152,7 @@ MonoBehaviour: startPos: {x: 0, y: 0, z: 0} isSelect: 0 associatePage: {fileID: 504928346} + startTigger: 1 --- !u!114 &2002010801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -99286,18 +97209,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1675556060} - 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!1 &2005167260 GameObject: m_ObjectHideFlags: 0 @@ -101800,6 +99711,7 @@ MonoBehaviour: startPos: {x: 0, y: 0, z: 0} isSelect: 0 associatePage: {fileID: 2077002200} + startTigger: 0 --- !u!114 &2055624296 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105410,141 +103322,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132133211} m_CullTransparentMesh: 1 ---- !u!1 &2133607301 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2133607302} - - component: {fileID: 2133607304} - - component: {fileID: 2133607303} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2133607302 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133607301} - 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: 385563948} - 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 &2133607303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133607301} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u9644\u9B54\u80CC\u5305" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7a60aa5fec9ac434a8b71587377eeb8c, type: 2} - m_sharedMaterial: {fileID: -4989954011452443200, guid: 7a60aa5fec9ac434a8b71587377eeb8c, - 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: 15 - m_fontSizeBase: 15 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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} ---- !u!222 &2133607304 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133607301} - m_CullTransparentMesh: 1 --- !u!1 &2134147479 GameObject: m_ObjectHideFlags: 0 @@ -105778,141 +103555,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135547780} m_CullTransparentMesh: 1 ---- !u!1 &2136444645 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2136444646} - - component: {fileID: 2136444648} - - component: {fileID: 2136444647} - m_Layer: 5 - m_Name: Text (TMP) (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2136444646 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2136444645} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000047454} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 35264500} - 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.94, y: -26.5} - m_SizeDelta: {x: 188.28, y: 87} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2136444647 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2136444645} - 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: "\u56DE\u5408\u7ED3\u675F\u65F6\u4F4D\u4E8E\u4F4D\u7F6E1\u5219\u968F\u673A\u751F\u6210\u4E00\u4E2A\u9178\u96E8" - 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: 11400000, guid: 1177b64b22a7dfb4a8e45264a472c7f8, type: 2} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 17 - m_fontSizeBase: 17 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - 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} ---- !u!222 &2136444648 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2136444645} - m_CullTransparentMesh: 1 --- !u!1 &2139760290 GameObject: m_ObjectHideFlags: 0 @@ -106071,109 +103713,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2139760290} m_CullTransparentMesh: 1 ---- !u!1 &2140385643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2140385644} - - component: {fileID: 2140385647} - - component: {fileID: 2140385646} - - component: {fileID: 2140385645} - m_Layer: 5 - m_Name: InforPanelGemImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2140385644 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140385643} - 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: 484561980} - - {fileID: 1345845499} - - {fileID: 568603657} - - {fileID: 644398892} - m_Father: {fileID: 1625351731} - 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: 156.83, y: -89.29} - m_SizeDelta: {x: 243.65, y: 217.68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &2140385645 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140385643} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 1637390125 - m_SortingOrder: 8 - m_TargetDisplay: 0 ---- !u!114 &2140385646 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140385643} - 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: b3eb51b644a6858478e0cb59f8bf44f2, 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: 10 ---- !u!222 &2140385647 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140385643} - m_CullTransparentMesh: 1 --- !u!1 &2140661234 GameObject: m_ObjectHideFlags: 0 @@ -106313,130 +103852,6 @@ RectTransform: m_AnchoredPosition: {x: 401, y: 395} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &2010533703671165524 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1065623412} - 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!1001 &3584999912520410507 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 7f9b1add..a8a4dab1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/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: - - {fileID: 961878884} - - {fileID: 1394152100} - - {fileID: 1378135175} - - {fileID: 375423535} - - {fileID: 1040876951} + m_Children: [] 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 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagForgedMaterial/BagForgedMaterialNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagForgedMaterial/BagForgedMaterialNode.cs index db588082..77261df4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagForgedMaterial/BagForgedMaterialNode.cs +++ b/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) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagManager.cs index 058c6f21..46f83766 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/BagManager.cs @@ -12,8 +12,9 @@ public class BagManager : Singleton [Header("ϱ")] public Transform bagForgedMaterialNodeFather; public GameObject bagForgerMaterialNodePrefab; + public List bagForgedMaterialDataeLsit = new List(); public List bagForgedMaterialNodeLsit = new List(); - + public string forgedMaterialLoadPath = "BagForgerMaterial/"; private void Start() { DontDestroyOnLoad(this.gameObject); @@ -36,5 +37,63 @@ public class BagManager : Singleton 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.bagForgedMaterialData = bagForgedMaterialDataeLsit[i]; + bagForgedMaterialNode.SetUpBagForgedMaterialNode(); + } + + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/LabelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/LabelNode.cs index 8457e920..677dd8bc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bag/LabelNode.cs +++ b/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() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs index 13b97abb..fa94ab21 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs +++ b/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 (isOn == true) + if (currentTime > 0) { - isLock = true; + currentTime -= Time.deltaTime; + } + else + { + isShow = true; + cardDeck.SetActive(true); } } - } + else + { + if (Input.GetKeyDown(KeyCode.Mouse1)) + { + 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; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs index b56a175c..e975b306 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs @@ -20,7 +20,7 @@ public class RewardManager : Singleton public GameObject rewardTipPrefabLegacy; public GameObject rewardTipPrefabPotion; public GameObject rewardTipPrefabForgPoint; - + public GameObject rewardTipPrefabForgedMaterial; public List rewardsList = new List();//ɺʵ [Header("ƽ")] @@ -34,14 +34,15 @@ public class RewardManager : Singleton [Header("¼")] public LevelDevelopData_SO levelDevelopData; - + public enum RewardType { card, money, legacy, potion, - forgPoint + forgPoint, + forgedMaterial } private void Start() @@ -53,8 +54,7 @@ public class RewardManager : Singleton yield return new WaitForSeconds(3f); AddRewardTips(RewardManager.RewardType.money,"20"); AddRewardTips(RewardManager.RewardType.card,"3"); - AddRewardTips(RewardManager.RewardType.forgPoint, "20"); - AddRewardTips(RewardManager.RewardType.potion, "6001"); + AddRewardTips(RewardManager.RewardType.forgedMaterial, "ɽ"); AddRewardTips(RewardManager.RewardType.legacy, "LegacyNode_PlatedSteelcaps"); } @@ -130,6 +130,14 @@ public class RewardManager : Singleton forgPonitRewardTipData.tipText.text = "+" + amount; rewardsList.Add(forgPonitRewardTipData); break; + case RewardType.forgedMaterial: + var forgedMaterialTip = Instantiate(rewardTipPrefabForgedMaterial, chooseRewardPanle.transform); + RewardTipData forgedMaterialTipData = forgedMaterialTip.GetComponent(); + forgedMaterialTipData.rewardType = RewardType.forgedMaterial; + forgedMaterialTipData.count = amount; + forgedMaterialTipData.tipText.text = amount; + rewardsList.Add(forgedMaterialTipData); + break; } chooseRewardPanle.GetComponent().sizeDelta = new Vector2(400 * rewardsList.Count, 0); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs index 12710600..0c05cc56 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs +++ b/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); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs index 5298ae25..41561d5b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs +++ b/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 PotionManager.Instance.ReflashPotionFromHaven(); Debug.Log("ҩˮ:" + amount); break; + //ö + case Name.Reward.forgedMaterial: + BagForgedMaterialData_SO bagForgedMaterialData = Resources.Load(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) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs index ede0d545..c461481c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs @@ -16,13 +16,15 @@ public class StartChooseCardManager : Singleton [Header("ƻȡ")] public List chooseCardFather;//ѡ public GameObject chooseCardPanel; - + public GameObject getCardPanel; [Header("ȡħ")] + public GameObject getWeaponNodePanel; public int getWeaponNodeCount = 3; public Transform playerWeaponNode; public List getWeaponNodeList = new List(); public Animator getWeaponNodeAnimator; public GameObject weaponNodeMove; + bool firstRefresh;//״δˢ£֮ˢ public void GenerateChooseCard(List cardID) { @@ -136,9 +138,41 @@ public class StartChooseCardManager : Singleton { //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("ȡþ"); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/BagForgedMaterialData_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/BagForgedMaterialData_SO.cs index ca88fbf4..e66a5706 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/BagForgedMaterialData_SO.cs +++ b/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; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 9bfa3f85..e6c21159 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/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 { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs index 4b2cb170..77975329 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs @@ -14,7 +14,7 @@ using static UnityEngine.InputSystem.InputControlScheme.MatchResult; using Image = UnityEngine.UI.Image; using Match = System.Text.RegularExpressions.Match; -public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDragHandler,IPointerExitHandler ,IPointerEnterHandler +public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDragHandler,IPointerExitHandler ,IPointerEnterHandler { [Header("Ч")] public GameObject enableVFX;//ɹЧ @@ -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) - { - inforPanel.SetActive(true); - } - else - { - gemImageInforPanel .SetActive(true); - } + isOn = 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;