diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight.meta new file mode 100644 index 00000000..a57e1b62 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97d4070ea1966aa49a2d0943f21aaa9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab new file mode 100644 index 00000000..2b674031 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab @@ -0,0 +1,313 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &860516491705332148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019132283333216709} + - component: {fileID: 2644614145497559102} + - component: {fileID: 132958885633141561} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2019132283333216709 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860516491705332148} + 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: 5213364049820256618} + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2644614145497559102 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860516491705332148} + m_CullTransparentMesh: 1 +--- !u!114 &132958885633141561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860516491705332148} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2776771565202051383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5213364049820256618} + - component: {fileID: 4335612967075336222} + - component: {fileID: 5075812866206836245} + - component: {fileID: 5862290999745784335} + - component: {fileID: 11168243621498474} + m_Layer: 5 + m_Name: EmptyNode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5213364049820256618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776771565202051383} + 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: 1 + m_Children: + - {fileID: 2696885577588718013} + - {fileID: 2019132283333216709} + 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.5000001, y: 0.00000023562461} +--- !u!222 &4335612967075336222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776771565202051383} + m_CullTransparentMesh: 1 +--- !u!114 &5075812866206836245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776771565202051383} + m_Enabled: 0 + 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!114 &5862290999745784335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776771565202051383} + m_Enabled: 0 + 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: 5075812866206836245} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11168243621498474} + m_TargetAssemblyTypeName: LevelNode, Assembly-CSharp + m_MethodName: ButtenLoadTo + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 2 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &11168243621498474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776771565202051383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ed1dc125839ae4087d9ede669a2d00, type: 3} + m_Name: + m_EditorClassIdentifier: + canEnter: 0 + isUse: 0 + line: 0 + column: 0 + fatherLevelNodes: [] + nextLevelNodes: [] + lineRenderer: {fileID: 3498766877212628700, guid: 627727da82f872c4dbc2519635427a3d, + type: 3} + roomType: 0 + roomDestinationIndex: 0 +--- !u!1 &5824790460616149335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2696885577588718013} + - component: {fileID: 1920680224325453006} + - component: {fileID: 3256753201700063874} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2696885577588718013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5824790460616149335} + 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: 5213364049820256618} + 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!222 &1920680224325453006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5824790460616149335} + m_CullTransparentMesh: 1 +--- !u!114 &3256753201700063874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5824790460616149335} + 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.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 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab.meta new file mode 100644 index 00000000..d33ff285 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b905c93e0100a840bdd4b09bd25384a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab new file mode 100644 index 00000000..de4b817d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3498766877212628700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8177702991867439191} + - component: {fileID: 8379389830787278148} + - component: {fileID: 2571787168702643260} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8177702991867439191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498766877212628700} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.72, y: 0} + m_SizeDelta: {x: 10, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &8379389830787278148 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498766877212628700} + m_CullTransparentMesh: 1 +--- !u!114 &2571787168702643260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3498766877212628700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab.meta new file mode 100644 index 00000000..af52585f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 627727da82f872c4dbc2519635427a3d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_baowu_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_baowu_v01.png index 83ba08b3..d1214fc9 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_baowu_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_baowu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chanraou_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chanraou_v01.png index faf86231..1eef7671 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chanraou_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chanraou_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chenshui_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chenshui_v01.png index a72fc3c1..cbaf16c3 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chenshui_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_chenshui_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_fushi_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_fushi_v01.png index 85a45dc9..91a4a662 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_fushi_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_fushi_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_haigu_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_haigu_v01.png index a6eee68d..4a4ff365 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_haigu_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_haigu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_hunmi_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_hunmi_v01.png index 000e204d..688ae0e4 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_hunmi_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_hunmi_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_huozhong_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_huozhong_v01.png index 11d66c1c..6ee33b7e 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_huozhong_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_huozhong_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu1_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu1_v01.png index e2e6d813..efa85287 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu1_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu1_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu2_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu2_v01.png index f5b63357..2b9a2c0d 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu2_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiangu2_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jianpai_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jianpai_v01.png index 555ad471..06b76fd6 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jianpai_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jianpai_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiaoxie_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiaoxie_v01.png index 21dae318..6d652559 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiaoxie_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiaoxie_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiapai_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiapai_v01.png index 653260ad..257c8999 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiapai_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jiapai_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jingji_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jingji_v01.png index f38f30d6..7f2c8ea6 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jingji_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jingji_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jinpai_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jinpai_v01.png index 3afd8a2c..0c8e7a27 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jinpai_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jinpai_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jisheng_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jisheng_v01.png index 012f4bb7..082e4702 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jisheng_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_jisheng_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_liuxue_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_liuxue_v01.png index 95fb10de..82edc40c 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_liuxue_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_liuxue_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_maozixifa_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_maozixifa_v01.png index e2f94df5..7a9303af 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_maozixifa_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_maozixifa_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_mokang_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_mokang_v01.png index fd4887bb..5f438e0b 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_mokang_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_mokang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo1_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo1_v01.png index 8f6eed10..452a7edc 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo1_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo1_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo2_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo2_v01.png index d91dfbd7..20d61cfc 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo2_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_nuhuo2_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_qianggu_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_qianggu_v01.png index 676d37e4..52119f93 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_qianggu_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_qianggu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_shanwei_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_shanwei_v01.png index 09431483..4cb2f36a 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_shanwei_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_shanwei_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu1_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu1_v01.png index c7dde391..9f91e0bc 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu1_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu1_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu2_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu2_v01.png index 12f48c11..8d8668ef 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu2_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_sudu2_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_xuruo_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_xuruo_v01.png index 93cc351d..8cb58b84 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_xuruo_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_xuruo_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_yishang_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_yishang_v01.png index 0cd9ce65..f63a80e2 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_yishang_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_yishang_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zhongdu_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zhongdu_v01.png index 0cf33101..58085b26 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zhongdu_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zhongdu_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zibao_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zibao_v01.png index 29dfeeee..2b295d8b 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zibao_v01.png and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Sslx_Ui_Buff_zibao_v01.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 2023d484..03c931af 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -742,10 +742,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 20 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -753,7 +753,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: "\u6309\u83B7\u5F97\u987A\u5E8F\u6392\u5E8F" --- !u!222 &90854705 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1886,6 +1886,96 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b11a487f21e55274181e172db1955ef0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &210762156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 210762157} + - component: {fileID: 210762160} + - component: {fileID: 210762159} + - component: {fileID: 210762158} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &210762157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 210762156} + 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: 1780349018} + m_Father: {fileID: 1982133052} + 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 &210762158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 210762156} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &210762159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 210762156} + 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 &210762160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 210762156} + m_CullTransparentMesh: 1 --- !u!1 &216708359 GameObject: m_ObjectHideFlags: 0 @@ -2019,6 +2109,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 216708359} m_CullTransparentMesh: 1 +--- !u!1 &218472041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 218472042} + - component: {fileID: 218472045} + - component: {fileID: 218472044} + - component: {fileID: 218472043} + m_Layer: 5 + m_Name: Back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &218472042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218472041} + 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: 674273954} + m_Father: {fileID: 1803518538} + 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: -601, y: -207} + m_SizeDelta: {x: 234.5, y: 66.95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &218472043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218472041} + 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: 218472044} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1803518537} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &218472044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218472041} + 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.690566, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &218472045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218472041} + m_CullTransparentMesh: 1 --- !u!1 &219845939 GameObject: m_ObjectHideFlags: 0 @@ -2256,6 +2479,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263387096} m_CullTransparentMesh: 1 +--- !u!1 &282261046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282261047} + m_Layer: 5 + m_Name: GeneratorPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &282261047 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282261046} + 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: 1780349018} + 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: -450, y: -878} + m_SizeDelta: {x: 131, y: 197} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &312433543 GameObject: m_ObjectHideFlags: 0 @@ -2966,7 +3224,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.61973345, g: 0.16527586, b: 0.6301887, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4372,10 +4630,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 20 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4383,7 +4641,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: "\u6309\u79CD\u7C7B\u6392\u5E8F" --- !u!222 &501355297 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5229,6 +5487,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 669923021} m_CullTransparentMesh: 1 +--- !u!1 &674273953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 674273954} + - component: {fileID: 674273956} + - component: {fileID: 674273955} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &674273954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674273953} + 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: 218472042} + 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 &674273955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674273953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Back +--- !u!222 &674273956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674273953} + m_CullTransparentMesh: 1 --- !u!1 &674342469 GameObject: m_ObjectHideFlags: 0 @@ -6422,7 +6759,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 816979503} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1803518537} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!114 &816979503 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6624,6 +6973,7 @@ RectTransform: - {fileID: 1748859174} - {fileID: 1998717001} - {fileID: 809894446} + - {fileID: 1803518538} - {fileID: 893839549} - {fileID: 197216736} m_Father: {fileID: 1915587657} @@ -8188,15 +8538,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 45 + m_Left: 35 m_Right: 0 - m_Top: 20 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 131, y: 197} - m_Spacing: {x: 20, y: 20} + m_Spacing: {x: 40, y: 50} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &1086901269 @@ -8215,6 +8565,7 @@ MonoBehaviour: cardGameObjectList: [] lookCardPrefab: {fileID: 1620241905568773253, guid: 5537996c2537a6d4daacc1d4ff899078, type: 3} + cardScale: {x: 1.15, y: 1.15, z: 1.15} --- !u!1 &1093559904 GameObject: m_ObjectHideFlags: 0 @@ -9669,6 +10020,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265058007} m_CullTransparentMesh: 1 +--- !u!1 &1271583135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271583136} + - component: {fileID: 1271583139} + - component: {fileID: 1271583138} + - component: {fileID: 1271583137} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1271583136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271583135} + 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: 1736686173} + m_Father: {fileID: 1982133052} + 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: -0.000061035} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1271583137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271583135} + 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: 1387694160} + m_HandleRect: {fileID: 1387694159} + m_Direction: 2 + m_Value: -0.00000013268514 + m_Size: 0.54 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1271583138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271583135} + 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 &1271583139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271583135} + m_CullTransparentMesh: 1 --- !u!1 &1278694492 GameObject: m_ObjectHideFlags: 0 @@ -10552,12 +11029,87 @@ MonoBehaviour: m_Color: {r: 0.8037735, g: 0.8037735, b: 0.8037735, a: 0.8509804} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, 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 &1381967977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381967974} + m_CullTransparentMesh: 1 +--- !u!1 &1387694158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1387694159} + - component: {fileID: 1387694161} + - component: {fileID: 1387694160} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1387694159 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387694158} + 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: 1736686173} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.54} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1387694160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387694158} + 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: bd8f3094e7ef01148bddd857e065ebc3, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10566,13 +11118,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1381967977 +--- !u!222 &1387694161 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1381967974} + m_GameObject: {fileID: 1387694158} m_CullTransparentMesh: 1 --- !u!1 &1433470489 GameObject: @@ -13159,6 +13711,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1736686172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1736686173} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1736686173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736686172} + 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: 1387694159} + m_Father: {fileID: 1271583136} + 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 &1746482166 GameObject: m_ObjectHideFlags: 0 @@ -13892,6 +14480,105 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1779627253} m_CullTransparentMesh: 1 +--- !u!1 &1780349017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1780349018} + - component: {fileID: 1780349019} + - component: {fileID: 1780349020} + m_Layer: 5 + m_Name: CardContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1780349018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780349017} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00003701212} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 282261047} + m_Father: {fileID: 210762157} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_SizeDelta: {x: 834, y: 2000} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1780349019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780349017} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 45 + m_Right: 0 + m_Top: 20 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 131, y: 197} + m_Spacing: {x: 20, y: 20} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &1780349020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780349017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92ebdfcbdb82fb149b8613ed10e2f9e8, type: 3} + m_Name: + m_EditorClassIdentifier: + levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, + type: 3} + levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} + generatorPoint: {fileID: 282261046} + lineOffset: 150 + columnOffset: 150 + levelMap: + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + monsterIcon: {fileID: 21300000, guid: 76c98050a10569a47b1a39a896495b71, type: 3} + eliteMonsterIcon: {fileID: 21300000, guid: 646e58a8cd5cd2145bf0985299361fa8, type: 3} + bossIcon: {fileID: 21300000, guid: a61b314c8ac7c44468531f8788cfafcc, type: 3} + shopIcon: {fileID: 21300000, guid: 0ede3fde763ed2f4eb0a9d302223dfc8, type: 3} + campfireIcon: {fileID: 21300000, guid: 61f8f385d55979a48aeda4bcce61fccf, type: 3} + incidentIcon: {fileID: 21300000, guid: 44e3626da16308c43b0b0c0842f18ab9, type: 3} + treasureIcon: {fileID: 21300000, guid: ec538e81295984d4ab30a848644947dc, type: 3} --- !u!1 &1786742914 GameObject: m_ObjectHideFlags: 0 @@ -14000,7 +14687,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.71675426, g: 0.9547169, b: 0.17833383, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -14195,8 +14882,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 11.24, y: -94.66} - m_SizeDelta: {x: 851, y: 890.67} + m_AnchoredPosition: {x: 18.36, y: -94.66} + m_SizeDelta: {x: 899.16, y: 890.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1793415343 MonoBehaviour: @@ -14326,6 +15013,83 @@ Transform: m_Children: [] m_Father: {fileID: 1819238997} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1803518537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1803518538} + - component: {fileID: 1803518540} + - component: {fileID: 1803518539} + m_Layer: 5 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1803518538 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803518537} + 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: 1982133052} + - {fileID: 218472042} + m_Father: {fileID: 846544929} + 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.000015259, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1803518539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803518537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.9137255} + 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 &1803518540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803518537} + m_CullTransparentMesh: 1 --- !u!1 &1809205612 GameObject: m_ObjectHideFlags: 0 @@ -15539,10 +16303,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 20 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -15550,7 +16314,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: "\u6309\u8D39\u7528\u6392\u5E8F" --- !u!222 &1979494149 CanvasRenderer: m_ObjectHideFlags: 0 @@ -15559,6 +16323,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1979494146} m_CullTransparentMesh: 1 +--- !u!1 &1982133051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982133052} + - component: {fileID: 1982133055} + - component: {fileID: 1982133054} + - component: {fileID: 1982133053} + m_Layer: 5 + m_Name: MainGroundScroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1982133052 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982133051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000022207} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 210762157} + - {fileID: 1271583136} + m_Father: {fileID: 1803518538} + 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: 11.24, y: 0.0024872} + m_SizeDelta: {x: 851, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1982133053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982133051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1780349018} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 45 + m_Viewport: {fileID: 210762157} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1271583137} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1982133054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982133051} + 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 &1982133055 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982133051} + m_CullTransparentMesh: 1 --- !u!1 &1998717000 GameObject: m_ObjectHideFlags: 0 @@ -15744,7 +16616,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.0056602955, b: 0.43493927, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs index 3441239d..d96eafc3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs @@ -11,6 +11,8 @@ public class LookCardManager : MonoBehaviour bool defaultSort =true;//(升序) + public Vector3 cardScale;//卡牌大小缩放 + public void ShowCard() { @@ -25,12 +27,14 @@ public class LookCardManager : MonoBehaviour cardList.Add(card); } - GetComponent().sizeDelta = new Vector2(GetComponent().sizeDelta.x, cardList.Count / 5f * 220f + 45); + GetComponent().sizeDelta = new Vector2(GetComponent().sizeDelta.x, cardList.Count / 5f * 260f + 45); for (int i= 0;i().createCard(cardList[i],i); + + currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } } @@ -123,6 +127,7 @@ public class LookCardManager : MonoBehaviour { var currentCard = Instantiate(lookCardPrefab, this.transform); currentCard.GetComponent().createCard(cardList[i], i); + currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } defaultSort = false; @@ -133,6 +138,7 @@ public class LookCardManager : MonoBehaviour { var currentCard = Instantiate(lookCardPrefab, this.transform); currentCard.GetComponent().createCard(cardList[i], i); + currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } defaultSort = true; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap.meta new file mode 100644 index 00000000..dadbc3b9 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 881e7318dcc752b42ac8bdf3b383060c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs new file mode 100644 index 00000000..fa671533 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs @@ -0,0 +1,126 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InFightMap : Singleton +{ + public GameObject levelPrefab; + public LevelDevelopData_SO levelDevelopData; + public GameObject generatorPoint; + Vector3 originalPoint; + + public float lineOffset; + public float columnOffset; + + public List levelMap = new List();//关卡列表 + + [Header("房间图标")] + public Sprite monsterIcon; + public Sprite eliteMonsterIcon; + public Sprite bossIcon; + public Sprite shopIcon; + public Sprite campfireIcon; + public Sprite incidentIcon; + public Sprite treasureIcon; + + private void Start() + { + originalPoint = generatorPoint.transform.localPosition; + GenerateGridMap(levelDevelopData.levelSaveMap.Count, 5); + + GeneratorLevelMapFormSave(); + } + + //生成一个节点 + public LevelNode GenerateLevelNode(int line, int column, Vector3 pos) + { + var level = Instantiate(levelPrefab, transform); + // var level = Instantiate(levelPrefab, pos, this .transform .rotation ); + level.transform.localPosition = pos ; + LevelNode levelNode = level.GetComponent(); + levelNode.line = line; + levelNode.column = column; + levelMap[line].levelColumn.Add(levelNode); + + return levelNode; + } + //生成网格 + public void GenerateGridMap(int generatorLine, int generatorColumn) + { + + for (int i = 0; i < generatorLine; i++) + { + if (i == generatorLine - 1) + { + generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0); + for (int j = 0; j < generatorColumn; j++) + { + generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0); + + //var level = Instantiate(levelPrefab, generatorPoint.transform.position, this.transform.rotation); + //level.transform.SetParent(transform); + + var level = Instantiate(levelPrefab, transform); + level.transform.localPosition = generatorPoint.transform.localPosition; + + level.transform.localScale = level.transform.localScale*2; + + LevelNode bossLevelNode = level.GetComponent(); + bossLevelNode.line = i; + bossLevelNode.column = j; + levelMap[i].levelColumn.Add(bossLevelNode); + } + + } + else + { + for (int j = 0; j < generatorColumn; j++) + { + generatorPoint.transform.localPosition= new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0); + + GenerateLevelNode(i, j, generatorPoint.transform.localPosition); + } + } + + generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0); + } + } + //根据保存的信息生成地图 + public void GeneratorLevelMapFormSave() + { + for (int i = 0; i < levelDevelopData.levelSaveMap.Count; i++) + { + for (int j = 0; j < levelDevelopData.levelSaveMap[i].levelDataList.Count; j++) + { + LevelDevelopData_SO.levelData currentLevelData = levelDevelopData.levelSaveMap[i].levelDataList[j]; + + LevelNode currentNode = levelMap[i].levelColumn[j]; + currentNode.SetUpRoomWithRoomDataInFightScence(currentLevelData); + + } + + } + + for (int i = 0; i fatherLevelNodes = new List(); + [Header("子节点（到哪去）")] + public List nextLevelNodes = new List(); + + [Header("线路生成器")] + public GameObject lineRenderer; + + [Header("房间类型")] + public LevelDevelopManager.RoomType roomType; + [Header("房间目的地")] + public int roomDestinationIndex; + + Image roomIcon; + Text roomText; + + private void OnEnable() + { + roomIcon = this.transform.GetChild(1).GetComponent(); + roomText = this.transform.GetChild(0).GetComponent(); + } + private void Start() + { + canEnter = true; + SetUPRoomDestination(); + + //JudgeCanEnter(); + } + + public void SetUPRoomDestination() + { + switch (roomType) + { + case LevelDevelopManager.RoomType.monster: + roomDestinationIndex = 2; + break; + case LevelDevelopManager.RoomType.eliteMonster: + roomDestinationIndex = 2; + break; + case LevelDevelopManager.RoomType.boss: + roomDestinationIndex = 2; + break; + case LevelDevelopManager.RoomType.shop: + roomDestinationIndex = 4; + break; + case LevelDevelopManager.RoomType.campfire: + roomDestinationIndex = 3; + break; + case LevelDevelopManager.RoomType.incident: + roomDestinationIndex = 3; + break; + case LevelDevelopManager.RoomType.treasure: + roomDestinationIndex = 3; + break; + } + } + public void JudgeCanEnter() + { + if (LevelDevelopManager.Instance.levelDevelopData.levelStep != line) + { + canEnter = false; + } + else + { + canEnter = true; + } + } + + public void ButtenLoadTo(int index) + { + if (canEnter) + { + ScenceLoadManager.Instance.LoadTargetLevel(roomDestinationIndex); + } + else + { + Debug.Log("该关卡目前不可进入"); + } + } + + public void LineShow() + { + for (int i = 0; i < nextLevelNodes.Count; i++) + { + var line = Instantiate(lineRenderer, this.gameObject.transform.position, Quaternion.identity); + line.transform.SetParent(this.transform); + line.transform.SetAsFirstSibling(); + Vector3 direction = nextLevelNodes[i].transform.position - line.transform.position; + float angle = Vector3.SignedAngle(line.transform.up, direction, Vector3.forward); + line.transform.Rotate(0, 0, angle); + + //长度 + float distance = Vector3.Distance(nextLevelNodes[i].transform.position, line.transform.position); + line.GetComponent().sizeDelta = new Vector2(line.GetComponent().sizeDelta.x, distance); + } + } + public LevelDevelopData_SO.levelData ReturnSaveData() + { + LevelDevelopData_SO.levelData levelData = new LevelDevelopData_SO.levelData(); + levelData.isUse = isUse; + levelData.roomType = roomType; + levelData.nodePos = this.transform.position; + levelData.column = column; + levelData.line = line; + foreach (var father in fatherLevelNodes) + { + levelData.fatherLevelNodes.Add(new Vector2(father.line, father.column)); + } + foreach (var child in nextLevelNodes) + { + levelData.nextLevelNodes.Add(new Vector2(child.line, child.column)); + } + return levelData; + } + + public void SetUpRoomWithRoomData(LevelDevelopData_SO.levelData levelData) + { + isUse = levelData.isUse; + roomType = levelData.roomType; + SetUpRoom(roomType); + // LevelDevelopManager.Instance.levelMap[line].levelColumn.Add(this); + } + public void SetUpRoomLinkWithRoomData(LevelDevelopData_SO.levelData levelData) + { + foreach (var father in levelData.fatherLevelNodes) + { + fatherLevelNodes.Add(LevelDevelopManager.Instance.levelMap[(int)father.x].levelColumn[(int)father.y]); + } + foreach (var child in levelData.nextLevelNodes) + { + nextLevelNodes.Add(LevelDevelopManager.Instance.levelMap[(int)child.x].levelColumn[(int)child.y]); + } + } + + public void SetUpRoom(LevelDevelopManager.RoomType roomType) + { + this.roomType = roomType; + switch (roomType) + { + case LevelDevelopManager.RoomType.monster: + roomText.text = "小怪"; + roomIcon.sprite = LevelDevelopManager.Instance.monsterIcon; + break; + case LevelDevelopManager.RoomType.eliteMonster: + roomText.text = "精英怪"; + roomIcon.sprite = LevelDevelopManager.Instance.eliteMonsterIcon; + break; + case LevelDevelopManager.RoomType.boss: + roomText.text = "Boss"; + roomIcon.sprite = LevelDevelopManager.Instance.bossIcon; + break; + case LevelDevelopManager.RoomType.shop: + roomText.text = "商店"; + roomIcon.sprite = LevelDevelopManager.Instance.shopIcon; + break; + case LevelDevelopManager.RoomType.incident: + roomText.text = "事件"; + roomIcon.sprite = LevelDevelopManager.Instance.incidentIcon; + break; + case LevelDevelopManager.RoomType.campfire: + roomText.text = "篝火"; + roomIcon.sprite = LevelDevelopManager.Instance.campfireIcon; + break; + case LevelDevelopManager.RoomType.treasure: + roomText.text = "宝箱"; + roomIcon.sprite = LevelDevelopManager.Instance.treasureIcon; + break; + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightNode.cs.meta new file mode 100644 index 00000000..221b0d46 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a5b7adc6dcab04c43a4da374923bee1b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs index 7ba72ba4..3d03027a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs @@ -134,6 +134,8 @@ public class LevelNode : MonoBehaviour SetUpRoom(roomType); // LevelDevelopManager.Instance.levelMap[line].levelColumn.Add(this); } + + public void SetUpRoomLinkWithRoomData(LevelDevelopData_SO.levelData levelData) { foreach (var father in levelData.fatherLevelNodes) @@ -181,4 +183,75 @@ public class LevelNode : MonoBehaviour break; } } + + //战斗场景地图UI加载 + public void SetUpRoomWithRoomDataInFightScence(LevelDevelopData_SO.levelData levelData) + { + isUse = levelData.isUse; + roomType = levelData.roomType; + switch (roomType) + { + case LevelDevelopManager.RoomType.monster: + roomText.text = "小怪"; + roomIcon.sprite = InFightMap.Instance.monsterIcon; + break; + case LevelDevelopManager.RoomType.eliteMonster: + roomText.text = "精英怪"; + roomIcon.sprite = InFightMap.Instance.eliteMonsterIcon; + break; + case LevelDevelopManager.RoomType.boss: + roomText.text = "Boss"; + roomIcon.sprite = InFightMap.Instance.bossIcon; + break; + case LevelDevelopManager.RoomType.shop: + roomText.text = "商店"; + roomIcon.sprite = InFightMap.Instance.shopIcon; + break; + case LevelDevelopManager.RoomType.incident: + roomText.text = "事件"; + roomIcon.sprite = InFightMap.Instance.incidentIcon; + break; + case LevelDevelopManager.RoomType.campfire: + roomText.text = "篝火"; + roomIcon.sprite = InFightMap.Instance.campfireIcon; + break; + case LevelDevelopManager.RoomType.treasure: + roomText.text = "宝箱"; + roomIcon.sprite = InFightMap.Instance.treasureIcon; + break; + } + + } + public void SetUpRoomLinkWithRoomDataInFightScence(LevelDevelopData_SO.levelData levelData) + { + foreach (var father in levelData.fatherLevelNodes) + { + fatherLevelNodes.Add(InFightMap.Instance.levelMap[(int)father.x].levelColumn[(int)father.y]); + } + foreach (var child in levelData.nextLevelNodes) + { + nextLevelNodes.Add(InFightMap.Instance.levelMap[(int)child.x].levelColumn[(int)child.y]); + } + } + + public void LineShowInFightScence() + { + for (int i = 0; i < nextLevelNodes.Count; i++) + { + var line = Instantiate(lineRenderer, transform); + line.transform.localPosition = new Vector3 (0,0,0); + line.transform.SetAsFirstSibling(); + //var line = Instantiate(lineRenderer, this.gameObject.transform.position, Quaternion.identity); + //line.transform.SetParent(this.transform); + + Vector3 direction = nextLevelNodes[i].transform.position - line.transform.position; + float angle = Vector3.SignedAngle(line.transform.up, direction, line.transform.forward); + line.transform.Rotate(0, 0, angle); + + //长度 + float distance = Vector3.Distance(nextLevelNodes[i].transform.localPosition ,transform.localPosition); + Debug.Log(distance ); + line.GetComponent().sizeDelta = new Vector2(line.GetComponent().sizeDelta.x, distance); + } + } }