diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab new file mode 100644 index 00000000..4dd10240 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab @@ -0,0 +1,1317 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &688789690455570313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7285859145388931973} + - component: {fileID: 1556748052669264222} + - component: {fileID: 2102827337445216865} + - component: {fileID: 8780837206578477006} + m_Layer: 0 + m_Name: TrueFun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7285859145388931973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + 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: 7139562062302679022} + 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: 1, y: 5} + m_SizeDelta: {x: 80, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1556748052669264222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + m_CullTransparentMesh: 1 +--- !u!114 &2102827337445216865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + 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: 1207736521, guid: 9e1e1d3c19411fa41a622f479e3f71ec, 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!114 &8780837206578477006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 688789690455570313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 25, y: 20} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &1447975007169538114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8507021733924720450} + - component: {fileID: 3908379299743407417} + - component: {fileID: 1056798440275425373} + m_Layer: 5 + m_Name: CostPanel + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8507021733924720450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447975007169538114} + 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: 1855824799099284199} + m_Father: {fileID: 7139562062302679022} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 99, y: 7.5} + m_SizeDelta: {x: 28.6048, y: 33.2259} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3908379299743407417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447975007169538114} + m_CullTransparentMesh: 1 +--- !u!114 &1056798440275425373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447975007169538114} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 756292014, guid: f0dc99a8de3b75a4bbb3bdc490b6f610, 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 &3177769488067894455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8229442996054676719} + - component: {fileID: 5689823300698625128} + - component: {fileID: 3867529107105442162} + - component: {fileID: 5973419634906082155} + m_Layer: 0 + m_Name: nodeColorResult + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8229442996054676719 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + 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: 7139562062302679022} + 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: 53.3, y: 52.4} + m_SizeDelta: {x: 20, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5689823300698625128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + m_CullTransparentMesh: 1 +--- !u!114 &3867529107105442162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 20, y: 20} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &5973419634906082155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177769488067894455} + 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: 1511406541, guid: 3eb23061a04738d45aa5cb4334d4b054, 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 &4169693119190854323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7139562062302679022} + - component: {fileID: 806089455888247474} + - component: {fileID: 2213389614096314727} + - component: {fileID: 8400832028529023394} + - component: {fileID: 5545682449418996990} + - component: {fileID: 7526181906643281268} + - component: {fileID: 7619122435525404041} + - component: {fileID: 8882143219709261918} + - component: {fileID: -8998391817720329076} + m_Layer: 5 + m_Name: Card_v04.2-CommonForReward + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7139562062302679022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5891999358152162990} + - {fileID: 8417263142375954454} + - {fileID: 1083118128749949784} + - {fileID: 8507021733924720450} + - {fileID: 8989630736753615331} + - {fileID: 7708569023393197294} + - {fileID: 7083643264776544898} + - {fileID: 7285859145388931973} + - {fileID: 8229442996054676719} + - {fileID: 66461956134587324} + 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: -3.1, y: 29} + m_SizeDelta: {x: 125, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &806089455888247474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_CullTransparentMesh: 1 +--- !u!114 &2213389614096314727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + 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: -434487570, guid: 78461e69b9e1eea4298f7afe36009d61, 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!114 &8400832028529023394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3} + m_Name: + m_EditorClassIdentifier: + cardId: 0 + cost: {fileID: 2839742468483413986} + cardIndex: 0 + cardName: {fileID: 0} + cardImage: {fileID: 5159259897654068178} + canUse: 1 + fun1Image: {fileID: 0} + fun2Image: {fileID: 0} + fun3Image: {fileID: 0} + fun1Val: {fileID: 0} + fun2Val: {fileID: 0} + fun3Val: {fileID: 0} + smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, + type: 3} + noSmallCard: 1 + noSyncText: 1 + conditionList: + - {fileID: 4398690247767463098} + - {fileID: 5970626616650445913} + - {fileID: 7367770060306744678} + trueFun: {fileID: 688789690455570313} + trueFunPrefab: {fileID: 4818544559399868804, guid: 98bfb86ee08b4924e8175b9d6145957d, + type: 3} + nodeColorResultFrame: {fileID: 3177769488067894455} + nodeColorResultImage: {fileID: 3463743346225269131, guid: 38f4837b968f61e4b94afcb5535f877c, + type: 3} + castRange: {fileID: 5584794665957624749} + colorConditon: {fileID: 4414271769496108467, guid: 1fd0d425cafce3f4588b40c9cfe1ac25, + type: 3} +--- !u!114 &5545682449418996990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3} + m_Name: + m_EditorClassIdentifier: + originalParent: {fileID: 0} + originalpoint: {x: 0, y: 0, z: 0} + originalIndexInChild: 0 + eventSystem: {fileID: 0} + canUse: 1 + ainPanle: {fileID: 5174392397216232880} + currentNode: {fileID: 0} + dragState: 3 + ready: 0 + castingPool: [] + layerMask: + serializedVersion: 2 + m_Bits: 64 + cardOnMouseEnter: {fileID: 0} +--- !u!225 &7526181906643281268 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7619122435525404041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 523596fd7703bbe44a0c37d83fd5c880, type: 3} + m_Name: + m_EditorClassIdentifier: + oringinIndex: 0 + cardDrag: {fileID: 0} + targetScale: {x: 0, y: 0, z: 0} + originScale: {x: 0, y: 0, z: 0} + speed: 4 + moveOffset: 50 + originPoint: {x: 0, y: 0, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} + originRotation: {x: 0, y: 0, z: 0} +--- !u!114 &8882143219709261918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + 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: 2213389614096314727} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -8998391817720329076} + m_TargetAssemblyTypeName: RewardCardNode, Assembly-CSharp + m_MethodName: RewardCardToDeck + 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 &-8998391817720329076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a52df32d6b281b4c80de6a8b468bc2f, type: 3} + m_Name: + m_EditorClassIdentifier: + cardID: + rewardTip: {fileID: 0} +--- !u!1 &4343990849769966524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66461956134587324} + - component: {fileID: 9073797113623819660} + - component: {fileID: 4177469149448917414} + m_Layer: 5 + m_Name: CastRangePanel + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &66461956134587324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + 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: 4872235896629707279} + m_Father: {fileID: 7139562062302679022} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.1, y: -172.9} + m_SizeDelta: {x: 28.6048, y: 33.2259} + m_Pivot: {x: 0, y: 1} +--- !u!222 &9073797113623819660 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + m_CullTransparentMesh: 1 +--- !u!114 &4177469149448917414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343990849769966524} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -888096905, guid: 2f47800ea3a40d646a3dfce662c34637, 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 &4398690247767463098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8989630736753615331} + - component: {fileID: 3754643477587389603} + - component: {fileID: 6002022395324240266} + - component: {fileID: 8883537695841318699} + m_Layer: 0 + m_Name: condition1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8989630736753615331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + 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: 7139562062302679022} + 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.2, y: -14.8} + m_SizeDelta: {x: 90, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3754643477587389603 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + m_CullTransparentMesh: 1 +--- !u!114 &6002022395324240266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + 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: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, 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!114 &8883537695841318699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4398690247767463098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 30, y: 20} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &5174392397216232880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5891999358152162990} + - component: {fileID: 5304992815847150061} + - component: {fileID: 1230043771585378953} + - component: {fileID: 4530502908829594795} + m_Layer: 5 + m_Name: AimPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5891999358152162990 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7139562062302679022} + 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: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5304992815847150061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_CullTransparentMesh: 1 +--- !u!114 &1230043771585378953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + 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.392} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, 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!114 &4530502908829594795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dea2a5cfc33ee743a3afdfa030e52bc, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowHeadPrefab: {fileID: 7429868863709343630, guid: f0b0ec00983ab49438a78adf75c2694c, + type: 3} + arrowNodePrefab: {fileID: 5422017731306186776, guid: 75f6f4f191fef2941a9c8f90833afbbf, + type: 3} + arrowNodeNum: 10 + scaleFactor: 0.5 +--- !u!1 &5970626616650445913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7708569023393197294} + - component: {fileID: 5787701428816686695} + - component: {fileID: 5392165220136475930} + - component: {fileID: 2647841805185336433} + m_Layer: 0 + m_Name: condition2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7708569023393197294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + 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: 7139562062302679022} + 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.2, y: -34.6} + m_SizeDelta: {x: 90, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5787701428816686695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + m_CullTransparentMesh: 1 +--- !u!114 &5392165220136475930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + 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: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, 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!114 &2647841805185336433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5970626616650445913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 30, y: 20} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &6018557167984620928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8417263142375954454} + - component: {fileID: 6630524511444619868} + - component: {fileID: 3893753280325337861} + m_Layer: 5 + m_Name: TopBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8417263142375954454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + 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: 7139562062302679022} + 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: 132.8754, y: 214.2679} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6630524511444619868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + m_CullTransparentMesh: 1 +--- !u!114 &3893753280325337861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6018557167984620928} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 39548142, guid: 8ee4c1a376a28ce4294ec0bb754ff306, 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 &6052323990296705033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1855824799099284199} + - component: {fileID: 6418759718487919919} + - component: {fileID: 2839742468483413986} + m_Layer: 5 + m_Name: CostText + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1855824799099284199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + 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: 8507021733924720450} + 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: 45, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6418759718487919919 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + m_CullTransparentMesh: 1 +--- !u!114 &2839742468483413986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6052323990296705033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &7367770060306744678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7083643264776544898} + - component: {fileID: 6495211555079877352} + - component: {fileID: 1878412079889438759} + - component: {fileID: 6664117381034053926} + m_Layer: 0 + m_Name: condition3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7083643264776544898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + 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: 7139562062302679022} + 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.2, y: -53.4} + m_SizeDelta: {x: 90, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6495211555079877352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + m_CullTransparentMesh: 1 +--- !u!114 &1878412079889438759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + 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: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, 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!114 &6664117381034053926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367770060306744678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: -1 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 30, y: 20} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &8081948450419621271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4872235896629707279} + - component: {fileID: 7985228304631699869} + - component: {fileID: 5584794665957624749} + m_Layer: 5 + m_Name: CastRangeText + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4872235896629707279 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + 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: 66461956134587324} + 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: 45, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7985228304631699869 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + m_CullTransparentMesh: 1 +--- !u!114 &5584794665957624749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8081948450419621271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &8951318475869846370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083118128749949784} + - component: {fileID: 2748996186627099962} + - component: {fileID: 5159259897654068178} + m_Layer: 5 + m_Name: CardIcon + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1083118128749949784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + 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: 7139562062302679022} + 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: -1.4, y: 54.4} + m_SizeDelta: {x: 100, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2748996186627099962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + m_CullTransparentMesh: 1 +--- !u!114 &5159259897654068178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8951318475869846370} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8a22e3267925107428c362e702d2c792, 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 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab.meta new file mode 100644 index 00000000..3517f484 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.2-CommonForReward.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0b7ece12d08c994c8148e8c99779e95 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon.meta new file mode 100644 index 00000000..3edfeee7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00413532d565759498ce9f44318f10c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab new file mode 100644 index 00000000..7df84da0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7923840369743001728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1697361232407890054} + - component: {fileID: 1550482915104832439} + - component: {fileID: 9161029464335761816} + m_Layer: 5 + m_Name: CardSlot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1697361232407890054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7923840369743001728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1550482915104832439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7923840369743001728} + m_CullTransparentMesh: 1 +--- !u!114 &9161029464335761816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7923840369743001728} + 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab.meta new file mode 100644 index 00000000..79207f5a --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/ChooseWeapon/CardSlot.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04fb9628a5a2dff4da117f5d5f865ae7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab index 44bebb01..e7d8ed72 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab @@ -154,90 +154,6 @@ MonoBehaviour: speed: 0.005 currentdisappearTime: 0 aimGamgObject: {fileID: 0} ---- !u!1 &3503442062960524747 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7913762572591673538} - - component: {fileID: 4976398930815977273} - - component: {fileID: 6117757704408044486} - m_Layer: 9 - m_Name: Enemy_1 - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7913762572591673538 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3503442062960524747} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.1, y: 0.41, z: -2.95} - m_LocalScale: {x: 1.71, y: 1, z: 1.46} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3917207023664244319} - m_Father: {fileID: 7743456883744001671} - m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0} ---- !u!33 &4976398930815977273 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3503442062960524747} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6117757704408044486 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3503442062960524747} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 32a39322fc9475c4287a8b6963d08cab, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &5886269389374315328 GameObject: m_ObjectHideFlags: 0 @@ -248,6 +164,7 @@ GameObject: m_Component: - component: {fileID: 3917207023664244319} - component: {fileID: 8474365485738530858} + - component: {fileID: 7424445081739338512} m_Layer: 0 m_Name: "\u9AB7\u9AC5\u6218\u58EB" m_TagString: Untagged @@ -263,13 +180,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5886269389374315328} serializedVersion: 2 - m_LocalRotation: {x: 0.0010483812, y: -0.7039183, z: 0.71027917, w: -0.0012619708} - m_LocalPosition: {x: 0.303, y: 0.0781, z: 0.001} - m_LocalScale: {x: 1.0313885, y: 0.8573279, z: 2.6150753} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0.302, y: 0.658, z: 0.139} + m_LocalScale: {x: 0.17, y: 0.17, z: 0.17} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7913762572591673538} - m_LocalEulerAnglesHint: {x: 89.452, y: -340.047, z: -160.03} + m_Father: {fileID: 7743456883744001671} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8474365485738530858 SpriteRenderer: m_ObjectHideFlags: 0 @@ -322,6 +239,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &7424445081739338512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5886269389374315328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &6928223977781211758 GameObject: m_ObjectHideFlags: 0 @@ -349,16 +279,16 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6928223977781211758} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.9657449, z: -0.2594933, w: 0} - m_LocalPosition: {x: 18.67, y: 0.36, z: 5.12} - m_LocalScale: {x: 0.1, y: 1, z: 0.12} + 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: 7913762572591673538} + - {fileID: 3917207023664244319} - {fileID: 3703101468976842238} - {fileID: 9059941972428441478} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1625631635205278374 SphereCollider: m_ObjectHideFlags: 0 @@ -410,6 +340,7 @@ MonoBehaviour: followPoint: {fileID: 3703101468976842238} bone: {fileID: 0} bone_Re: {fileID: 1880325291853289959, guid: a2d780b42e1e8544784a6c3fbad33b85, type: 3} + lasteHp: 0 canMove: 0 planAction: 2 --- !u!114 &2102810731187371268 @@ -450,15 +381,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8313325018234006301} - m_LocalRotation: {x: 0.00004351113, y: -0.7101218, z: 0.7040763, w: 0.0019181424} - m_LocalPosition: {x: 0, y: 0, z: 6.300003} - m_LocalScale: {x: 9.999354, y: 8.328876, z: 1.0000705} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0, y: 0, z: -0.205} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7743456883744001671} - 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.53699994} - m_SizeDelta: {x: 100, y: 100} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.12, y: 0.298} + m_SizeDelta: {x: 1.164, y: 0.6462} m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab index f4c33cb2..79936bfd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 67840643233759687} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -4} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -181,16 +181,16 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1880325291853289959} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.9657449, z: -0.2594933, w: 0} - m_LocalPosition: {x: 18.67, y: 0.36, z: 5.12} - m_LocalScale: {x: 0.1, y: 1, z: 0.12} + 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: 322596807654122222} + - {fileID: 2635436729644491437} - {fileID: 6460243059731195119} - {fileID: 5661943736827879434} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &3428195215565293398 SphereCollider: m_ObjectHideFlags: 0 @@ -242,6 +242,7 @@ MonoBehaviour: followPoint: {fileID: 6460243059731195119} bone: {fileID: 0} bone_Re: {fileID: 0} + lasteHp: 0 canMove: 0 planAction: 2 --- !u!114 &8412139385272254344 @@ -261,7 +262,7 @@ MonoBehaviour: m_Bits: 0 time: 0.2 moveSpeed: 4 ---- !u!1 &2778471538238530486 +--- !u!1 &3530869859334247682 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -269,60 +270,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 322596807654122222} - - component: {fileID: 278785895296680341} - - component: {fileID: 2729846693771078170} + - component: {fileID: 2635436729644491437} + - component: {fileID: 2454779380245334482} + - component: {fileID: 1352770113826862847} m_Layer: 9 - m_Name: Enemy_1 - m_TagString: Enemy + m_Name: Square + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &322596807654122222 +--- !u!4 &2635436729644491437 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2778471538238530486} + m_GameObject: {fileID: 3530869859334247682} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.1, y: 0.41, z: -2.95} - m_LocalScale: {x: 1.71, y: 1, z: 1.46} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0.284, y: 0.623, z: 0.064} + m_LocalScale: {x: 0.055, y: 0.055250004, z: 0.055000003} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4158766577167906083} - m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0} ---- !u!33 &278785895296680341 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2778471538238530486} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2729846693771078170 -MeshRenderer: + m_LocalEulerAnglesHint: {x: 25.517, y: 50.649, z: -1.756} +--- !u!212 &2454779380245334482 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2778471538238530486} + m_GameObject: {fileID: 3530869859334247682} m_Enabled: 1 m_CastShadows: 0 - m_ReceiveShadows: 1 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 + m_RayTracingMode: 0 m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 32a39322fc9475c4287a8b6963d08cab, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -335,7 +328,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -343,7 +336,30 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: e69f8bdf1b6fb814794e42cac08d7549, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1352770113826862847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3530869859334247682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &5722640600270653374 GameObject: m_ObjectHideFlags: 0 @@ -367,15 +383,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5722640600270653374} - m_LocalRotation: {x: 0.00004351113, y: -0.7101218, z: 0.7040763, w: 0.0019181424} - m_LocalPosition: {x: 0, y: 0, z: 6.300003} - m_LocalScale: {x: 9.999354, y: 8.328876, z: 1.0000705} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0, y: 0, z: -0.235} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4158766577167906083} - 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.53699994} - m_SizeDelta: {x: 100, y: 100} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.15, y: 0.285} + m_SizeDelta: {x: 1.164, y: 0.6462} m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab index 980f5a0a..d3862900 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab @@ -33,13 +33,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8541031873340959253} - - {fileID: 4123142054426980354} + - {fileID: 6921605590288491381} 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: 0} - m_SizeDelta: {x: 235, y: 414} + m_SizeDelta: {x: 450, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5082381512918421411 CanvasRenderer: @@ -69,7 +69,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1779544712, guid: 9c6e2eec531600547bcbee6a3fa35e32, type: 3} + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -152,7 +152,7 @@ MonoBehaviour: tipIcon: {fileID: 6436768908014461002} moneyCount: 0 cardChoosePanle: {fileID: 0} ---- !u!1 &524145267859443418 +--- !u!1 &4818641680202011626 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -160,57 +160,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4123142054426980354} - - component: {fileID: 6805645655677175712} - - component: {fileID: 444881404184867232} + - component: {fileID: 6921605590288491381} + - component: {fileID: 932239828588524315} + - component: {fileID: 5169059884336212058} m_Layer: 0 - m_Name: Text (Legacy) + m_Name: Text (Legacy) (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4123142054426980354 +--- !u!224 &6921605590288491381 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 524145267859443418} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4818641680202011626} + 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: 3663777237203882103} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.7287, y: 98.43335} - m_SizeDelta: {x: -27.367, y: -196.8667} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6805645655677175712 + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 128, y: -0.000024319} + m_SizeDelta: {x: 306.514, y: 80} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &932239828588524315 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 524145267859443418} + m_GameObject: {fileID: 4818641680202011626} m_CullTransparentMesh: 1 ---- !u!114 &444881404184867232 +--- !u!114 &5169059884336212058 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 524145267859443418} + m_GameObject: {fileID: 4818641680202011626} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -218,13 +218,13 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 54 - m_Alignment: 4 + m_MinSize: 4 + m_MaxSize: 45 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -263,11 +263,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 3663777237203882103} 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: -100} - m_SizeDelta: {x: 210, y: 210} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 18.9, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &2733445211847259160 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab index 4462af13..e396f9e4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1682963501642570129} - {fileID: 3314817480070878324} - {fileID: 2420895262137345472} - {fileID: 16500468953841105} @@ -61,6 +62,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} + m_Color: {r: 0.066037714, g: 0.066037714, b: 0.066037714, 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!1 &2133994053119878106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1682963501642570129} + - component: {fileID: 2590471704695295133} + - component: {fileID: 1204608526570677316} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1682963501642570129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133994053119878106} + 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: 7171988893087007611} + 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: 28.5} + m_SizeDelta: {x: 0, y: -57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2590471704695295133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133994053119878106} + m_CullTransparentMesh: 1 +--- !u!114 &1204608526570677316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133994053119878106} + 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} @@ -249,13 +325,13 @@ MonoBehaviour: m_Padding: m_Left: 115 m_Right: 0 - m_Top: 41 + m_Top: 107 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 235, y: 414} - m_Spacing: {x: 70, y: 20} + m_CellSize: {x: 125, y: 200} + m_Spacing: {x: 235, y: 20} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &5938922564071319870 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab index 4b40d0ac..d406bc68 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab @@ -32,11 +32,11 @@ RectTransform: 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: -8, y: -95} - m_SizeDelta: {x: 167.2862, y: 177.0422} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 26.4, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6432755592450523591 CanvasRenderer: m_ObjectHideFlags: 0 @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8374138624903993696 +--- !u!1 &6028908916859300172 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,9 +83,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2805335453933345837} - - component: {fileID: 2603548089923332108} - - component: {fileID: 6725896325916565601} + - component: {fileID: 3930577605498442910} + - component: {fileID: 6168811464473495969} + - component: {fileID: 949095511756987273} m_Layer: 0 m_Name: Text (Legacy) m_TagString: Untagged @@ -93,47 +93,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2805335453933345837 +--- !u!224 &3930577605498442910 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8374138624903993696} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6028908916859300172} + 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} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1.3565979, y: 96.93805} - m_SizeDelta: {x: -24.5764, y: -193.8761} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 56.865517, y: 0} + m_SizeDelta: {x: 307.131, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2603548089923332108 +--- !u!222 &6168811464473495969 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8374138624903993696} + m_GameObject: {fileID: 6028908916859300172} m_CullTransparentMesh: 1 ---- !u!114 &6725896325916565601 +--- !u!114 &949095511756987273 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8374138624903993696} + m_GameObject: {fileID: 6028908916859300172} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -141,19 +141,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 54 - m_Alignment: 4 + m_MinSize: 3 + m_MaxSize: 60 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u83B7\u5F97\u91D1\u5E01" + m_Text: "\u83B7\u5F97\u91D1\u5E01\u5956\u52B1" --- !u!1 &8550563113017744413 GameObject: m_ObjectHideFlags: 0 @@ -187,13 +187,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4642770450902390514} - - {fileID: 2805335453933345837} + - {fileID: 3930577605498442910} 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: 235, y: 414} + m_SizeDelta: {x: 450, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1534610038301911794 CanvasRenderer: @@ -223,7 +223,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 576239277, guid: 9c6e2eec531600547bcbee6a3fa35e32, type: 3} + m_Sprite: {fileID: 1694164675, guid: 2086866033a1171448dc9261291aafa8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1green.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1green.png.meta index ca46733e..7a6e1a4a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1green.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1green.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,7 +108,28 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: 1green_0 + rect: + serializedVersion: 2 + x: 1551 + y: 1213 + width: 903 + height: 717 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: be203215867ffd245ac25e892d927f32 + internalID: 1215536052 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -119,7 +140,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + 1green_0: 1215536052 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png index 8861afe5..da508cb6 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png.meta index 29c5b897..4b3d81a5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 123512f9faead4d4da8eb3aecef0b09e +guid: 1b86d79d3a5223e45b16307bd6ed2b92 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,18 +108,40 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Sslx_Card_Kamizn_Huikan_v01_0 + rect: + serializedVersion: 2 + x: 1553 + y: 1213 + width: 914 + height: 707 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bad4e6d701e004f43b6df2c5cb07b51a + internalID: 1398329276 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 7ea1dcbdc5feadd428399e705a5f41d8 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Sslx_Card_Kamizn_Huikan_v01_0: 1398329276 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red1.png similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red1.png diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red1.png.meta similarity index 80% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red1.png.meta index 4b3d81a5..29c5b897 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1red1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b86d79d3a5223e45b16307bd6ed2b92 +guid: 123512f9faead4d4da8eb3aecef0b09e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,40 +108,18 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: Sslx_Card_Kamizn_Huikan_v01_0 - rect: - serializedVersion: 2 - x: 1553 - y: 1213 - width: 914 - height: 707 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bad4e6d701e004f43b6df2c5cb07b51a - internalID: 1398329276 - vertices: [] - indices: - edges: [] - weights: [] + sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 7ea1dcbdc5feadd428399e705a5f41d8 + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: - Sslx_Card_Kamizn_Huikan_v01_0: 1398329276 + nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png index 8861afe5..626577aa 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png.meta index 1c8d542b..d3063ed8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1white.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 89ef6d1bd01c2da4cab21c0c2191f6d3 +guid: cff58db27719c644c874c12dddf14b26 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png new file mode 100644 index 00000000..8861afe5 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/2green.png.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png deleted file mode 100644 index da508cb6..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Huikan_v01.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity index 1c385103..dcf059df 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity @@ -614,10 +614,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1365068953} - - {fileID: 230626764} - - {fileID: 1610503991} - - {fileID: 792702243} - - {fileID: 797861395} m_Father: {fileID: 775097751} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -1581,7 +1577,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170914627} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -1861,81 +1857,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 206010630} m_CullTransparentMesh: 1 ---- !u!1 &230626763 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 230626764} - - component: {fileID: 230626766} - - component: {fileID: 230626765} - m_Layer: 5 - m_Name: Card - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &230626764 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230626763} - 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: 56212781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &230626765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230626763} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &230626766 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230626763} - m_CullTransparentMesh: 1 --- !u!1 &233745705 GameObject: m_ObjectHideFlags: 0 @@ -2447,7 +2368,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5d3a36546c4fcc41832bd9e3d5f6eb5, type: 3} m_Name: m_EditorClassIdentifier: - colorType: 0 + colorType: 2 layerMask: serializedVersion: 2 m_Bits: 32 @@ -3790,6 +3711,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1588135878} + - {fileID: 1124140201} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &522245650 @@ -5682,81 +5604,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 790202185} m_CullTransparentMesh: 1 ---- !u!1 &792702242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 792702243} - - component: {fileID: 792702245} - - component: {fileID: 792702244} - m_Layer: 5 - m_Name: Card (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &792702243 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 792702242} - 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: 56212781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &792702244 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 792702242} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &792702245 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 792702242} - m_CullTransparentMesh: 1 --- !u!1 &797127231 GameObject: m_ObjectHideFlags: 0 @@ -5832,81 +5679,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 797127231} m_CullTransparentMesh: 1 ---- !u!1 &797861394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 797861395} - - component: {fileID: 797861397} - - component: {fileID: 797861396} - m_Layer: 5 - m_Name: Card (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &797861395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 797861394} - 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: 56212781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &797861396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 797861394} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &797861397 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 797861394} - m_CullTransparentMesh: 1 --- !u!1 &821125871 GameObject: m_ObjectHideFlags: 0 @@ -6826,7 +6598,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1044738164} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -6929,7 +6701,7 @@ MonoBehaviour: onChoose: 0 onChooseMark: {fileID: 863185086} weaponPage: {fileID: 623500728} ---- !u!1 &1078464318 +--- !u!1 &1079791876 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6937,122 +6709,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1078464319} - - component: {fileID: 1078464321} - - component: {fileID: 1078464320} + - component: {fileID: 1079791877} + - component: {fileID: 1079791878} m_Layer: 5 - m_Name: Card + m_Name: Slider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1078464319 +--- !u!224 &1079791877 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1078464318} + m_GameObject: {fileID: 1079791876} 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: 1514211913} + m_Children: + - {fileID: 1122643028} + - {fileID: 522245651} + - {fileID: 1450875340} + m_Father: {fileID: 618524257} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -286.65} + m_SizeDelta: {x: 1000, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1078464320 +--- !u!114 &1079791878 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1078464318} + m_GameObject: {fileID: 1079791876} 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1078464321 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1078464318} - m_CullTransparentMesh: 1 ---- !u!1 &1079791876 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1079791877} - - component: {fileID: 1079791878} - m_Layer: 5 - m_Name: Slider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1079791877 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079791876} - 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: 1122643028} - - {fileID: 522245651} - - {fileID: 1450875340} - m_Father: {fileID: 618524257} - 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: -286.65} - m_SizeDelta: {x: 1000, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1079791878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079791876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -7885,6 +7582,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1123412764} m_CullTransparentMesh: 1 +--- !u!1 &1124140200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1124140201} + - component: {fileID: 1124140202} + m_Layer: 0 + m_Name: ChangeColorManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1124140201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1124140200} + serializedVersion: 2 + 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: 506708269} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1124140202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1124140200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1133830296 GameObject: m_ObjectHideFlags: 0 @@ -9074,81 +8815,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1247632133} m_CullTransparentMesh: 1 ---- !u!1 &1251950403 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1251950404} - - component: {fileID: 1251950406} - - component: {fileID: 1251950405} - m_Layer: 5 - m_Name: Card (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1251950404 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251950403} - 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: 1424524448} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1251950405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251950403} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1251950406 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251950403} - m_CullTransparentMesh: 1 --- !u!1 &1266195703 GameObject: m_ObjectHideFlags: 0 @@ -10072,82 +9738,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: colorType: 3 + groupIndex: 2 + cardGroup: [] image: {fileID: 0} ---- !u!1 &1351919055 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1351919056} - - component: {fileID: 1351919058} - - component: {fileID: 1351919057} - m_Layer: 5 - m_Name: Card (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1351919056 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351919055} - 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: 1514211913} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1351919057 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351919055} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1351919058 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1351919055} - m_CullTransparentMesh: 1 --- !u!1 &1359230637 GameObject: m_ObjectHideFlags: 0 @@ -10447,8 +10040,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 467896173} - - {fileID: 1454169402} - - {fileID: 1251950404} m_Father: {fileID: 775097751} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -10554,81 +10145,6 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1454169401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1454169402} - - component: {fileID: 1454169404} - - component: {fileID: 1454169403} - m_Layer: 5 - m_Name: Card - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1454169402 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454169401} - 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: 1424524448} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1454169403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454169401} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1454169404 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1454169401} - m_CullTransparentMesh: 1 --- !u!1 &1465343479 GameObject: m_ObjectHideFlags: 0 @@ -10661,81 +10177,6 @@ Transform: - {fileID: 1873955372} m_Father: {fileID: 714696342} m_LocalEulerAnglesHint: {x: -89.98021, y: 0, z: 0} ---- !u!1 &1472958653 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1472958654} - - component: {fileID: 1472958656} - - component: {fileID: 1472958655} - m_Layer: 5 - m_Name: Card (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1472958654 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472958653} - 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: 1514211913} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1472958655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472958653} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1472958656 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472958653} - m_CullTransparentMesh: 1 --- !u!1 &1514211912 GameObject: m_ObjectHideFlags: 0 @@ -10768,10 +10209,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1359230638} - - {fileID: 1078464319} - - {fileID: 1351919056} - - {fileID: 1472958654} - - {fileID: 1740557415} m_Father: {fileID: 775097751} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -11121,6 +10558,31 @@ MonoBehaviour: - {fileID: 1801667598} - {fileID: 1814845630} - {fileID: 1350086840} + cardSlotPrefab: {fileID: 7923840369743001728, guid: 04fb9628a5a2dff4da117f5d5f865ae7, + type: 3} + cardGroupsInfor: + - cardGroupFathers: {fileID: 56212781} + cardIDGroup: + - 1001 + - 1001 + - 1001 + - 1001 + - cardGroupFathers: {fileID: 1514211913} + cardIDGroup: + - 1002 + - 1002 + - 1002 + - 1002 + - cardGroupFathers: {fileID: 1424524448} + cardIDGroup: + - 1003 + - 1003 + cardGroup_1: [] + cardGroup_2: [] + cardGroup_3: [] + newCardGroup_1: [] + newCardGroup_2: [] + newCardGroup_3: [] --- !u!1 &1591943139 GameObject: m_ObjectHideFlags: 0 @@ -11257,81 +10719,6 @@ Transform: - {fileID: 1302919419} m_Father: {fileID: 1083197932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1610503990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1610503991} - - component: {fileID: 1610503993} - - component: {fileID: 1610503992} - m_Layer: 5 - m_Name: Card (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1610503991 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1610503990} - 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: 56212781} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1610503992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1610503990} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1610503993 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1610503990} - m_CullTransparentMesh: 1 --- !u!1 &1616243368 GameObject: m_ObjectHideFlags: 0 @@ -12127,7 +11514,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5d3a36546c4fcc41832bd9e3d5f6eb5, type: 3} m_Name: m_EditorClassIdentifier: - colorType: 0 + colorType: 1 layerMask: serializedVersion: 2 m_Bits: 32 @@ -12285,81 +11672,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734914347} m_CullTransparentMesh: 1 ---- !u!1 &1740557414 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1740557415} - - component: {fileID: 1740557417} - - component: {fileID: 1740557416} - m_Layer: 5 - m_Name: Card (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1740557415 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740557414} - 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: 1514211913} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1740557416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740557414} - 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.8867924, g: 0.8867924, b: 0.8867924, 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: 10907, 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 &1740557417 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1740557414} - m_CullTransparentMesh: 1 --- !u!1 &1755168324 GameObject: m_ObjectHideFlags: 0 @@ -12651,6 +11963,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: colorType: 3 + groupIndex: 0 + cardGroup: [] image: {fileID: 0} --- !u!1 &1810278972 GameObject: @@ -12858,6 +12172,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: colorType: 3 + groupIndex: 1 + cardGroup: [] image: {fileID: 0} --- !u!1 &1823185807 GameObject: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 50bc7cbf..fe092eac 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -2335,6 +2335,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 138908763} m_CullTransparentMesh: 1 +--- !u!1 &140913053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 140913054} + - component: {fileID: 140913057} + - component: {fileID: 140913056} + - component: {fileID: 140913055} + m_Layer: 0 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &140913054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140913053} + 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: 736984975} + m_Father: {fileID: 458098384} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &140913055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140913053} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &140913056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140913053} + 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: 10917, 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 &140913057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140913053} + m_CullTransparentMesh: 1 --- !u!1 &144535832 GameObject: m_ObjectHideFlags: 0 @@ -2445,132 +2535,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144591441} m_CullTransparentMesh: 1 ---- !u!1 &155354866 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 155354867} - - component: {fileID: 155354870} - - component: {fileID: 155354869} - - component: {fileID: 155354868} - m_Layer: 0 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &155354867 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155354866} - 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: 397884638} - m_Father: {fileID: 898728704} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1064, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!114 &155354868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155354866} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1484136705} - m_HandleRect: {fileID: 1484136704} - m_Direction: 0 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &155354869 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155354866} - 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: 10907, 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 &155354870 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155354866} - m_CullTransparentMesh: 1 --- !u!1 &165968472 GameObject: m_ObjectHideFlags: 0 @@ -5848,7 +5812,6 @@ Transform: m_Children: - {fileID: 2050905750} - {fileID: 495423659} - - {fileID: 1147870383} - {fileID: 1485850294} - {fileID: 1227255859} - {fileID: 14034787} @@ -6828,42 +6791,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &397884637 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 397884638} - m_Layer: 0 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &397884638 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 397884637} - 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: 1484136704} - m_Father: {fileID: 155354867} - 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: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &400337728 GameObject: m_ObjectHideFlags: 0 @@ -8176,6 +8103,114 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: attack: 10001 +--- !u!1 &458098383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 458098384} + - component: {fileID: 458098387} + - component: {fileID: 458098386} + - component: {fileID: 458098385} + m_Layer: 0 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &458098384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458098383} + 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: 140913054} + - {fileID: 840847489} + m_Father: {fileID: 2012988518} + 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: -1.498, y: -54.411102} + m_SizeDelta: {x: 550.316, y: 647.7823} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &458098385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458098383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 736984975} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 140913054} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 840847490} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &458098386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458098383} + 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.43137255} + 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: 10907, 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 &458098387 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458098383} + m_CullTransparentMesh: 1 --- !u!1 &464618902 GameObject: m_ObjectHideFlags: 0 @@ -8457,96 +8492,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467535681} m_CullTransparentMesh: 1 ---- !u!1 &468587659 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 468587660} - - component: {fileID: 468587663} - - component: {fileID: 468587662} - - component: {fileID: 468587661} - m_Layer: 0 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &468587660 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468587659} - 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: 1928766451} - m_Father: {fileID: 898728704} - 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: -17} - m_Pivot: {x: 0, y: 1} ---- !u!114 &468587661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468587659} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &468587662 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468587659} - 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: 10917, 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 &468587663 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468587659} - m_CullTransparentMesh: 1 --- !u!1 &468997172 GameObject: m_ObjectHideFlags: 0 @@ -10753,6 +10698,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 550452002} m_CullTransparentMesh: 1 +--- !u!1 &550922266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 550922267} + - component: {fileID: 550922269} + - component: {fileID: 550922268} + m_Layer: 0 + m_Name: ChoosCardPanleFather + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &550922267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550922266} + 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: 1725757948} + 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: 411.82666, y: 219.12756} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &550922268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550922266} + 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: 10907, 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 &550922269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550922266} + m_CullTransparentMesh: 1 --- !u!1 &552008216 GameObject: m_ObjectHideFlags: 0 @@ -13424,6 +13444,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 734247257} m_CullTransparentMesh: 1 +--- !u!1 &736984974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 736984975} + - component: {fileID: 736984976} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &736984975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736984974} + 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: 140913054} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1000} + m_Pivot: {x: 0, y: 1} +--- !u!114 &736984976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736984974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 40 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 450, y: 100} + m_Spacing: {x: 0, y: 25} + m_Constraint: 1 + m_ConstraintCount: 1 --- !u!1 &739475931 GameObject: m_ObjectHideFlags: 0 @@ -13454,11 +13534,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2012988518} + m_Father: {fileID: 1322671366} 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: 335} + m_AnchoredPosition: {x: -0.0000019073486, y: 12} m_SizeDelta: {x: 625.6322, y: 89.2077} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &739475933 @@ -15159,6 +15239,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -350} m_SizeDelta: {x: 1000, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &840847488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 840847489} + - component: {fileID: 840847492} + - component: {fileID: 840847491} + - component: {fileID: 840847490} + m_Layer: 0 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &840847489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840847488} + 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: 2141308102} + m_Father: {fileID: 458098384} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &840847490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840847488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1330430296} + m_HandleRect: {fileID: 1330430295} + m_Direction: 2 + m_Value: 1 + m_Size: 0.64778227 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &840847491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840847488} + 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: 10907, 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 &840847492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840847488} + m_CullTransparentMesh: 1 --- !u!1 &846544928 GameObject: m_ObjectHideFlags: 0 @@ -15964,114 +16170,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 893839548} m_CullTransparentMesh: 1 ---- !u!1 &898728703 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 898728704} - - component: {fileID: 898728707} - - component: {fileID: 898728706} - - component: {fileID: 898728705} - m_Layer: 0 - m_Name: Scroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &898728704 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 898728703} - 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: 468587660} - - {fileID: 155354867} - m_Father: {fileID: 2012988518} - 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.0080414, y: 35.96753} - m_SizeDelta: {x: 1064, y: 457.0929} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &898728705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 898728703} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1928766451} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 50 - m_Viewport: {fileID: 468587660} - m_HorizontalScrollbar: {fileID: 155354868} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &898728706 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 898728703} - 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.392} - 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: 10907, 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 &898728707 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 898728703} - m_CullTransparentMesh: 1 --- !u!1 &910259996 GameObject: m_ObjectHideFlags: 0 @@ -17440,6 +17538,9 @@ MonoBehaviour: chooseClip: {fileID: 8300000, guid: b0a53ae3759f330419116d317aeb12f1, type: 3} disChooseClip: {fileID: 8300000, guid: f15e1aab9d3d92943902c03337517e9f, type: 3} flipClip: {fileID: 8300000, guid: ba40307e688223e4d85ba5ad5749e73c, type: 3} + gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} + gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} + buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} UIClickSource: {fileID: 992566369} ActionSource: {fileID: 992566372} --- !u!4 &992566371 @@ -18207,7 +18308,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u8DF3\u8FC7" + m_Text: "\u8FD4\u56DE" --- !u!222 &1019483703 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18730,7 +18831,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rewardPanle: {fileID: 1725757947} - chooseRewardPanle: {fileID: 1928766450} + chooseRewardPanle: {fileID: 736984974} rewardTipPrefabCard: {fileID: 419554946002882475, guid: f14fcc5c39f3bd541a30d5444cd9d56e, type: 3} rewardTipPrefabMoney: {fileID: 8550563113017744413, guid: d7a796725757b814483b4877e9dd3a6a, @@ -18745,9 +18846,13 @@ MonoBehaviour: potionTipIcon: {fileID: 21300000, guid: 0f0274fed944193419950861f0f57273, type: 3} rewardsList: [] cardRewardList: [] - cardPrefab: {fileID: 7164379299506578448, guid: a53dcc33d1837ab4d85fd97f1381a6b3, + cardPrefabCommon: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, + type: 3} + cardPrefabLegendary: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, type: 3} - cardChoosePanleFather: {fileID: 1304969850} + cardPrefabRare: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95, + type: 3} + cardChoosePanleFather: {fileID: 550922266} cardChoosePanlePrefab: {fileID: 589092828266680353, guid: eb223c06382861e4486db9aa6bb52050, type: 3} levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} @@ -19951,7 +20056,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 348176937} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1147870384 MonoBehaviour: @@ -23299,8 +23404,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 18, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 13.846, y: 0} + m_SizeDelta: {x: -27.693, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1296021404 MonoBehaviour: @@ -23323,19 +23428,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 70 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 54 + m_MaxSize: 70 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7EE7\u7EED\u524D\u8FDB--->" + m_Text: "\u7EE7\u7EED\u524D\u8FDB-->" --- !u!222 &1296021405 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23528,10 +23633,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2012988518} - - {fileID: 1746482167} - - {fileID: 1373007395} + m_Children: [] m_Father: {fileID: 1725757948} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -23804,13 +23906,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 739475932} m_Father: {fileID: 2012988518} 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.0039349, y: 298.4408} - m_SizeDelta: {x: 2331.8, y: 1241.8065} + m_AnchoredPosition: {x: -11.4895, y: 390} + m_SizeDelta: {x: 513.4182, y: 241.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1322671367 MonoBehaviour: @@ -23832,7 +23935,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7db45ade1c595dc4b96b3d0e30e36e1f, type: 3} + m_Sprite: {fileID: -1094772320, guid: 8dd42b56a643d5444987e0f9ee5b5d94, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24004,6 +24107,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330278963} m_CullTransparentMesh: 1 +--- !u!1 &1330430294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1330430295} + - component: {fileID: 1330430297} + - component: {fileID: 1330430296} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1330430295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330430294} + 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: 2141308102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.35221773} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1330430296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330430294} + 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: 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 &1330430297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330430294} + m_CullTransparentMesh: 1 --- !u!1 &1337505876 GameObject: m_ObjectHideFlags: 0 @@ -24169,6 +24347,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1341243796} m_CullTransparentMesh: 1 +--- !u!1 &1343580418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1343580419} + - component: {fileID: 1343580421} + - component: {fileID: 1343580420} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1343580419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343580418} + 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: 1373007395} + 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 &1343580420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343580418} + 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: 3641a741c10ef4d48be50cd1efb5d010, 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 &1343580421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343580418} + m_CullTransparentMesh: 1 --- !u!1 &1373007394 GameObject: m_ObjectHideFlags: 0 @@ -24194,19 +24447,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373007394} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1343580419} - {fileID: 1140853216} - {fileID: 409052242} - {fileID: 2032320508} - m_Father: {fileID: 1304969851} + m_Father: {fileID: 1725757948} 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: -57} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2331.8267, y: 1299.1276} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1373007396 @@ -24222,15 +24476,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.103773594, g: 0.103773594, b: 0.103773594, 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: 3641a741c10ef4d48be50cd1efb5d010, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -25805,81 +26059,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479632590} m_CullTransparentMesh: 1 ---- !u!1 &1484136703 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1484136704} - - component: {fileID: 1484136706} - - component: {fileID: 1484136705} - m_Layer: 0 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1484136704 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1484136703} - 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: 397884638} - 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: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1484136705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1484136703} - 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: 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 &1484136706 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1484136703} - m_CullTransparentMesh: 1 --- !u!1 &1485211133 GameObject: m_ObjectHideFlags: 0 @@ -30033,6 +30212,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1304969851} + - {fileID: 1746482167} + - {fileID: 2012988518} + - {fileID: 550922267} + - {fileID: 1373007395} m_Father: {fileID: 890519216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -30606,16 +30789,16 @@ RectTransform: m_GameObject: {fileID: 1746482166} 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1296021403} - m_Father: {fileID: 1304969851} + m_Father: {fileID: 1725757948} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1525.2375, y: -834.92505} - m_SizeDelta: {x: 290.563, y: 102.0899} + m_AnchoredPosition: {x: 1466.3513, y: -892.7318} + m_SizeDelta: {x: 485.8867, y: 169.2655} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1746482168 MonoBehaviour: @@ -30693,8 +30876,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1498400022, guid: 9a88fa8a9ca6a2542b5233f887a89c35, type: 3} - m_Type: 0 + m_Sprite: {fileID: 2137927476, guid: de8e54fdb68f4864c80bebb0c8079497, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -34553,66 +34736,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1917696511} m_CullTransparentMesh: 1 ---- !u!1 &1928766450 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1928766451} - - component: {fileID: 1928766452} - m_Layer: 0 - m_Name: ChooseRewardBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1928766451 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1928766450} - 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: 468587660} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000061035156, y: 0} - m_SizeDelta: {x: 1064, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1928766452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1928766450} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 40 - m_Right: 0 - m_Top: 25 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 235, y: 414} - m_Spacing: {x: 145, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 --- !u!1 &1931870065 GameObject: m_ObjectHideFlags: 0 @@ -35929,20 +36052,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2012988517} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 898728704} - {fileID: 1322671366} - - {fileID: 739475932} - m_Father: {fileID: 1304969851} + - {fileID: 458098384} + m_Father: {fileID: 1725757948} 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: -57} - m_SizeDelta: {x: 2331.8267, y: 1299.1276} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2012988519 MonoBehaviour: @@ -35957,14 +36079,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8584906, g: 0.8584906, b: 0.8584906, 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: 3641a741c10ef4d48be50cd1efb5d010, type: 3} + m_Sprite: {fileID: -395849654, guid: 89d2e111086186d45a91e52bfb95775f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -37623,6 +37745,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2132133211} m_CullTransparentMesh: 1 +--- !u!1 &2141308101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141308102} + m_Layer: 0 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2141308102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141308101} + 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: 1330430295} + m_Father: {fileID: 840847489} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &29249060631100806 Transform: m_ObjectHideFlags: 0 @@ -39436,6 +39594,7 @@ SceneRoots: - {fileID: 993262479} - {fileID: 1210516119} - {fileID: 1597411728} + - {fileID: 1147870383} - {fileID: 281408863} - {fileID: 1690695890} - {fileID: 515302569} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 45b4474a..f1a6e0fd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -1962,7 +1962,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 1 + m_IntArgument: 5 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs index 20c89d4d..8588852a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs @@ -24,10 +24,15 @@ public class AudioManager : Singleton public AudioClip chooseClip; public AudioClip disChooseClip; public AudioClip flipClip;//卡牌滑动 - + [Header("奖励界面音频")] + public AudioClip gainMoneyClip; + public AudioClip gainCardClip; + [Header("商店界面音频")] + public AudioClip buyClip; [Header("音源")] public AudioSource UIClickSource; public AudioSource ActionSource; + AudioSource GainObjectSource;//获得物品交互音效 AudioSource attackSource; AudioSource BookSource; AudioSource CardSource; @@ -42,6 +47,7 @@ public class AudioManager : Singleton CardSource = gameObject.AddComponent(); attackSource = gameObject.AddComponent(); enemyActionSource = gameObject.AddComponent(); + GainObjectSource = gameObject.AddComponent(); } public void UIClickPlayer() @@ -140,4 +146,19 @@ public class AudioManager : Singleton yield return new WaitForSeconds(time); ShieldVoicePlayer(value); } + public void GainMoneyVoicePlayer() + { + GainObjectSource.clip = gainMoneyClip; + GainObjectSource.Play(); + } + public void GainCardVoicePlayer() + { + GainObjectSource.clip = gainCardClip; + GainObjectSource.Play(); + } + public void BuyVoicePlayer() + { + GainObjectSource.clip = buyClip; + GainObjectSource.Play(); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs deleted file mode 100644 index 6a0a5a38..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.Text; -using UnityEngine; -using UnityEngine.UI; - -public class CardDataForChooseUI : MonoBehaviour -{ - public CardOriginalData cardOriginalData; - public HashSet influencePreviewPool = new HashSet();//卡牌的影响范围 - - public string cardId; - - public Text cost; - public string CardId - { - get { return cardId; } - set { cardId = value; } - } - - public int cardIndex; - - public Text cardDescription; - public Text cardName; - - public Image cardImage; - - public bool costEnough = true; - [Header("奖励选卡控件")] - public GameObject currentRewardCardTip; - - [Header("商店选卡控件")] - public bool canSale =true;//可以出售 - public int price;//价格 - public float discount;//折扣 - public Text priceText;//售价UI - public GameObject saledIcon;//已售出标识 - - //商店界面 - public void ReturnSelectedDeleteIndex() - { - // ShopManager.Instance.selectedDeleteIndex = cardIndex; - - } - public void BuyCard() - { - if (canSale && ShopManager.Instance.playerState.money >= (int)(price * discount)) - { - ShopManager.Instance.cardDeck.Add(cardId); - saledIcon.SetActive(true); - - ShopManager.Instance.playerState .money -= (int)(price * discount); - canSale = false; - } - else - { - Debug.Log("金币不足"); - } - } - - public void SetUpSaleCard() - { - priceText.text = ((int)price * discount).ToString(); - } - - //奖励界面 - public void RewardCardToDeck() - { - PlayerStatsManager .Instance.cardDeck.cardDeckList.Add(this .cardId); - - RewardManager.Instance.DeleteRewardTip(currentRewardCardTip); - currentRewardCardTip.GetComponent ().cardChoosePanle . SetActive(false); - - } - - //创建卡牌 - public void createCard(string cardId, int cardIndex) - { - this.cardId = cardId; - cardOriginalData = CardOriginalDataList.Instance.cardOriginalDataList[cardId]; - - //createCardDescription(); - createCardName(); - createCardCost(); - createCardImage(); - this.cardIndex = cardIndex; - } - - //获取卡牌图片 - public void createCardImage() - { - if (cardOriginalData.ImgPath != null) - { - Sprite sprite = Resources.Load(cardOriginalData.ImgPath); - if (sprite != null) - { - cardImage.sprite = sprite; - } - } - - } - //获取卡牌名字 - public void createCardName() - { - cardName.text = cardOriginalData.ChineseName; - } - - public void createCardCost() - { - cost.text = cardOriginalData.Cost.ToString(); - } - - - -} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs index 5ea74a99..3eff8b4a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs @@ -27,7 +27,10 @@ public class CardOriginalDataList : Singleton } - + private void Start() + { + DontDestroyOnLoad(this.gameObject); + } public HashSet GetCardRewards(int count) { double rareCardCount = 0; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs index eecc72da..5e80051c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ChooseWeaponManaher.cs @@ -20,6 +20,28 @@ public class ChooseWeaponManager : Singleton [Header("未选择颜色提示")] public GameObject NoneColorTip; public List colorSlots = new List(); + + [Header("卡牌组信息")] + public GameObject cardSlotPrefab; + public List cardGroupsInfor; + [System .Serializable] + public class CardGroupInfor + { + public Transform cardGroupFathers; + public List cardIDGroup; + } + [Header("卡牌组")] + public List cardGroup_1; + public List cardGroup_2; + public List cardGroup_3; + public List newCardGroup_1; + public List newCardGroup_2; + public List newCardGroup_3; + private void Start() + { + GenerateCardGroup(); + } + public void ChooseWeapon(int weaponID) { for(int i =0;i } ScenceLoadManager.Instance.LoadTargetLevel(levelIndex); } + + public void GenerateCardGroup() + { + for(int i=0;i()); + break; + case 1: + cardGroup_2.Add(card.GetComponent()); + break; + case 2: + cardGroup_3.Add(card.GetComponent()); + break; + } + + } + } + } + public void GenerateChangeColorCardGroup(int groupIndex ,List newCard ) + { + List cardGroup = new List(); + List newCardGroup = new List(); + switch (groupIndex) + { + case 0: + cardGroup = cardGroup_1; + newCardGroup = newCardGroup_1; + break; + case 1: + cardGroup = cardGroup_2; + newCardGroup = newCardGroup_2; + break; + case 2: + cardGroup = cardGroup_3; + newCardGroup = newCardGroup_3; + break; + } + foreach (var card in newCardGroup ) + { + CardOriginalDataList.Instance.existCardOriginalDataList.Remove(card.cardId); + Destroy(card.gameObject); + } + newCardGroup.Clear(); + + for (int i = 0; i < newCard.Count; i++) + { + var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(newCard[i], cardGroup[i].transform.parent); + card.transform.localPosition = new Vector3(0, 0, 0); + card.transform.SetAsLastSibling(); + + newCardGroup.Add(card.GetComponent()); + } + + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs index 5320d2fe..4636ac39 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/ColorSlot.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,13 +7,62 @@ using UnityEngine.UI; public class ColorSlot : MonoBehaviour { public ChooseWeaponManager.ColorType colorType; + [Header ("决定哪个卡组的颜色")] + public int groupIndex; + [HideInInspector] public List cardGroup; [HideInInspector] public Image image; private void Start() { image = GetComponent(); + + switch (groupIndex) + { + case 0: + cardGroup = ChooseWeaponManager.Instance.cardGroup_1; + break; + case 1: + cardGroup = ChooseWeaponManager.Instance.cardGroup_2; + break; + case 2: + cardGroup = ChooseWeaponManager.Instance.cardGroup_3; + break; + } } public void ChangeColor(ChooseWeaponManager.ColorType inputColorType) { colorType = inputColorType; - } + + List newCard = new List(); + for(int i=0;i().cardChoosePanle.SetActive(false); + //声音 + AudioManager.Instance.GainCardVoicePlayer(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardCardNode.cs.meta similarity index 83% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardCardNode.cs.meta index a38619ab..150f8a7f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs.meta +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardCardNode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3237ec859125a24a8de6cc0ccd79d00 +guid: 6a52df32d6b281b4c80de6a8b468bc2f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs similarity index 66% rename from ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs index aaf8c84c..c04dc44c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs @@ -28,7 +28,9 @@ public class RewardManager : Singleton [Header("卡牌奖励表")] public List cardRewardList = new List(); - public GameObject cardPrefab; + public GameObject cardPrefabCommon; + public GameObject cardPrefabLegendary; + public GameObject cardPrefabRare; public GameObject cardChoosePanleFather;//选卡界面生成父级 public GameObject cardChoosePanlePrefab;//选卡界面预制体 @@ -47,7 +49,7 @@ public class RewardManager : Singleton { //AddRewardTips(RewardManager.RewardType.card,0); AddRewardTips(RewardManager.RewardType.money,20); - //AddRewardTips(RewardManager.RewardType.card, 0); + AddRewardTips(RewardManager.RewardType.card, 3); AddRewardTips(RewardManager.RewardType.money, 20); } public void JudgeEnemyOver()//判断是否结束回合 @@ -74,7 +76,7 @@ public class RewardManager : Singleton var cardChoosePanle = Instantiate(cardChoosePanlePrefab, cardChoosePanleFather.transform);//生成选卡表 cardRewardTipData.cardChoosePanle = cardChoosePanle; - GeneratorRewardCard(cardChoosePanle.transform .GetChild(0), cardTip);//生成随机卡牌 + GeneratorRewardCard(cardChoosePanle.transform .GetChild(1), cardTip,amount);//生成随机卡牌 break; case RewardType.money: var moneyTip = Instantiate(rewardTipPrefabMoney, chooseRewardPanle.transform); @@ -93,41 +95,55 @@ public class RewardManager : Singleton chooseRewardPanle.GetComponent().sizeDelta = new Vector2(400 * rewardsList.Count, 0); } - public void DeleteRewardTip( GameObject gameObject)//删除已领取的奖励 - { - for(int i=0;i()); + Destroy(gameObject); + if (rewardsList.Count <= 0) { - if(rewardsList[i].gameObject . GetHashCode()==gameObject.GetHashCode() ) - { - rewardsList[i].gameObject .SetActive (false ); - rewardsList.RemoveAt(i); - - if(rewardsList.Count<=0) - { - ScenceLoadManager.Instance.LoadTargetLevel(1); - } - break; - } + ScenceLoadManager.Instance.LoadTargetLevel(1); } - + } - public void GeneratorRewardCard(Transform cardFather ,GameObject cardTip) + public void GeneratorRewardCard(Transform cardFather ,GameObject cardTip ,int cardCount) { - List cardList = CardOriginalDataList .Instance .GetCardRewards (3).ToList(); + List cardList = CardOriginalDataList .Instance .GetCardRewards (cardCount).ToList(); for(int i =0;i(); - cardDataForChooseUI.createCard(cardList[i], cardList.Count - 1); - cardDataForChooseUI.currentRewardCardTip = cardTip; + var currentCard = CreateCardWithIDForReward(cardList[i], cardFather); + RewardCardNode rewardCardNode = currentCard.GetComponent(); + rewardCardNode.cardID = cardList[i]; + rewardCardNode.rewardTip = cardTip; } - cardRewardList = cardList; } - - + + //创建其奖励卡牌 + public GameObject CreateCardWithIDForReward(string id, Transform cardFrather) + { + GameObject cardPrefab; + cardPrefab = new GameObject(); + int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity; + switch (cardRarity) + { + case Name.CardRarity.Legendary: + cardPrefab = Instantiate(cardPrefabLegendary, cardFrather); + break; + case Name.CardRarity.Rare: + cardPrefab = Instantiate(cardPrefabRare, cardFrather); + break; + case Name.CardRarity.Common: + cardPrefab = Instantiate(cardPrefabCommon, cardFrather); + break; + } + cardPrefab.GetComponent().localEulerAngles = new Vector3(0, 0, 0); + CardEntity cardEntity = cardPrefab.GetComponent(); + cardEntity.createCard(id, 0); + + return cardPrefab; + } public void LevelStepAdd() { levelDevelopData.levelStep += 1; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/RewardTipData.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs similarity index 91% rename from ColorlessWorld-2024-4-2/Assets/Scripts/UI/RewardTipData.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs index d23ead5c..2d3f43bb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/RewardTipData.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs @@ -7,7 +7,6 @@ using static RewardManager; public class RewardTipData : MonoBehaviour { public RewardManager.RewardType rewardType; - public int rewardID; [Header("组装UI")] public Image tipIcon; @@ -26,14 +25,17 @@ public class RewardTipData : MonoBehaviour public void ShowCardChoosePanle() { cardChoosePanle.SetActive(true); - + //加卡牌 + //声音 + AudioManager.Instance.MenuOpenPlayer(); } public void AddMoney() { RewardManager.Instance.DeleteRewardTip(this .gameObject); - //加钱 - // GameManager.Instance.AddMoney( moneyCount); + //加钱; PlayerStatsManager.Instance.EffectFunction(1, moneyCount); + //声音 + AudioManager.Instance.MenuClosePlayer(); } public void AddLegacy() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/RewardTipData.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/UI/RewardTipData.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs index e06fa48d..534101a6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs @@ -37,6 +37,8 @@ public class PlayerStatsManager : Singleton case 1: gainMoney(amount); BroadCastSyncMoneyText();//同步UI + //声音 + AudioManager.Instance.GainMoneyVoicePlayer(); break; //加血 case 2: @@ -115,5 +117,5 @@ public class PlayerStatsManager : Singleton return cardPrefab; } - + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs index e3dbebe2..09ce5b9f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs @@ -13,5 +13,7 @@ public class CardSaleNode : MonoBehaviour { saledMark.SetActive(true); ShopManager.Instance.cardDeck.Add(cardID); + //声音 + AudioManager.Instance.BuyVoicePlayer(); } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs index 0f1db6a4..c88a9bf6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs @@ -107,6 +107,7 @@ public class ShopManager : Singleton card.transform.SetAsFirstSibling(); currentSaleCardNode.GetComponent().cardID = cardId.ToString (); } + //单独购买的无色卡 int noneColorCardId = (int)Random.Range(1001, 1004); var noneColorCardNode = Instantiate(saleCardNode, cardNoneColorFather); var noneColorCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(noneColorCardId.ToString(), noneColorCardNode.transform); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs index cff7b534..abe85efd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/CardManager.cs @@ -48,6 +48,27 @@ public class CardManager : Singleton string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData); return newCardId; } + + public string SwitchCardAllColor(string orginalCardId, CardOriginalData cardOriginalData, string newColor) + { + //改条件 + for(int i=0;i(JsonConvert.SerializeObject(cardOriginalData)); + for (int i = 0; i < newCardOriginalData.nodesColor.Length; i++) + { + newCardOriginalData.nodesColor[i] = newColor; + } + string newCardImgPath = "CardIcon/" + cardOriginalData.EffectRange + newColor; + newCardOriginalData.ImgPath = newCardImgPath; + + string newCardId = AddElementToDictionary(CardOriginalDataList.Instance.existCardOriginalDataList, cardOriginalData.CardId, newCardOriginalData); + return newCardId; + } public static string AddElementToDictionary(Dictionary dictionary, string baseKey, CardOriginalData value) { string key = baseKey;