diff --git a/Client/Assets/Resources/Audio.meta b/Client/Assets/Resources/Audio.meta new file mode 100644 index 0000000..dcf8efc --- /dev/null +++ b/Client/Assets/Resources/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 342041e4bfc22ae4ba9199554f7ab489 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Default/DefaultAudio.mp3 b/Client/Assets/Resources/Default/DefaultAudio.mp3 new file mode 100644 index 0000000..a8351b2 Binary files /dev/null and b/Client/Assets/Resources/Default/DefaultAudio.mp3 differ diff --git a/Client/Assets/Resources/Default/DefaultAudio.mp3.meta b/Client/Assets/Resources/Default/DefaultAudio.mp3.meta new file mode 100644 index 0000000..e855d0e --- /dev/null +++ b/Client/Assets/Resources/Default/DefaultAudio.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 79c8bcaaa43bb0a48ab60558de473015 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefab/Animation.prefab b/Client/Assets/Resources/Prefab/Animation.prefab index 5ee3c0a..0f51b4e 100644 --- a/Client/Assets/Resources/Prefab/Animation.prefab +++ b/Client/Assets/Resources/Prefab/Animation.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 5021031438404678310} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.6943, y: -0.3652, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Client/Assets/Resources/Prefab/Button3D.prefab b/Client/Assets/Resources/Prefab/Button3D.prefab new file mode 100644 index 0000000..4258aff --- /dev/null +++ b/Client/Assets/Resources/Prefab/Button3D.prefab @@ -0,0 +1,306 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2412502657045938467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 709533242955877997} + - component: {fileID: 5821092905185152964} + - component: {fileID: 3254240173477692892} + - component: {fileID: 2649725512596744611} + - component: {fileID: 8989378577537570065} + m_Layer: 0 + m_Name: Button3D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &709533242955877997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412502657045938467} + 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: + - {fileID: 7795760929196660143} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5821092905185152964 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412502657045938467} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3254240173477692892 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412502657045938467} + m_Enabled: 1 + m_CastShadows: 1 + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &2649725512596744611 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412502657045938467} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8989378577537570065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412502657045938467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d5e1709fa6d5c54f93ac068f067e20b, type: 3} + m_Name: + m_EditorClassIdentifier: + OnClick: + m_PersistentCalls: + m_Calls: [] + renderer: {fileID: 3254240173477692892} + outlineMaterial: {fileID: 2100000, guid: 7b32baf03e8f4bd448cf625f4299f5ce, type: 2} + text: {fileID: 3761108353443528858} +--- !u!1 &3805996714208757134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7795760929196660143} + - component: {fileID: 5919324744879230529} + - component: {fileID: 3761108353443528858} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7795760929196660143 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3805996714208757134} + 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: 709533242955877997} + 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: 2} + m_SizeDelta: {x: 5, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &5919324744879230529 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3805996714208757134} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1361428157011412921, guid: 317edb274e9c5144a9916937bdbf7716, 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!114 &3761108353443528858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3805996714208757134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 317edb274e9c5144a9916937bdbf7716, type: 2} + m_sharedMaterial: {fileID: -1361428157011412921, guid: 317edb274e9c5144a9916937bdbf7716, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 5 + m_fontSizeBase: 5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5919324744879230529} + m_maskType: 0 diff --git a/Client/Assets/Resources/Prefab/Button3D.prefab.meta b/Client/Assets/Resources/Prefab/Button3D.prefab.meta new file mode 100644 index 0000000..1e75d55 --- /dev/null +++ b/Client/Assets/Resources/Prefab/Button3D.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04bb56c29e3de4248a236f83c889ca7d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefab/ButtonTemplate.prefab b/Client/Assets/Resources/Prefab/ButtonTemplate.prefab index eff2288..30e364f 100644 --- a/Client/Assets/Resources/Prefab/ButtonTemplate.prefab +++ b/Client/Assets/Resources/Prefab/ButtonTemplate.prefab @@ -37,8 +37,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: -160.92151, y: -93.26492} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6659858081700418582 CanvasRenderer: @@ -228,8 +228,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 15 + m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Client/Assets/Resources/Prefab/Entity/EntityPrefab.prefab b/Client/Assets/Resources/Prefab/Entity/EntityPrefab.prefab index ebdbb2a..60cfcdb 100644 --- a/Client/Assets/Resources/Prefab/Entity/EntityPrefab.prefab +++ b/Client/Assets/Resources/Prefab/Entity/EntityPrefab.prefab @@ -124,6 +124,7 @@ Transform: - {fileID: 5549544358816209289} - {fileID: 1697214530303839877} - {fileID: 1404278780950315184} + - {fileID: 4504455988891581487} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3332598847335032684 @@ -364,3 +365,65 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 605f185650fe46d89a6e0d60fb8fb11c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &5211884413447499418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 697189026367054479} + m_Modifications: + - target: {fileID: 5021031438404678310, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_Name + value: WeaponTexture + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} +--- !u!4 &4504455988891581487 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8563418329714102965, guid: ea9af70ce0f4c8b4a9de58ac63074156, type: 3} + m_PrefabInstance: {fileID: 5211884413447499418} + m_PrefabAsset: {fileID: 0} diff --git a/Client/Assets/Resources/Prefab/Image.prefab b/Client/Assets/Resources/Prefab/Image.prefab index 88bd3ef..bba42ed 100644 --- a/Client/Assets/Resources/Prefab/Image.prefab +++ b/Client/Assets/Resources/Prefab/Image.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 5309816858037840717} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.781, y: -0.39, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Client/Assets/Resources/Prefab/RightMenu.prefab b/Client/Assets/Resources/Prefab/RightMenu.prefab index 7e343f7..534e09f 100644 --- a/Client/Assets/Resources/Prefab/RightMenu.prefab +++ b/Client/Assets/Resources/Prefab/RightMenu.prefab @@ -37,7 +37,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 342, y: -198} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.1, y: 0.9} --- !u!222 &6098472552964198111 diff --git a/Client/Assets/Resources/Prefab/TextTemplate.prefab b/Client/Assets/Resources/Prefab/TextTemplate.prefab index d2ebf03..110db59 100644 --- a/Client/Assets/Resources/Prefab/TextTemplate.prefab +++ b/Client/Assets/Resources/Prefab/TextTemplate.prefab @@ -35,8 +35,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: -1.0921326, y: -54.256577} - m_SizeDelta: {x: 200, y: 14.01} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 25} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6803973761688315705 CanvasRenderer: @@ -93,8 +93,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab b/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab new file mode 100644 index 0000000..680f73a --- /dev/null +++ b/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6060365352283784422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3192591419784585419} + - component: {fileID: 3481945618963852047} + - component: {fileID: 9180115334091918173} + - component: {fileID: 8174970956233947585} + m_Layer: 5 + m_Name: BuffIconUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3192591419784585419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060365352283784422} + 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: 3140503542561239742} + 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: 62.421, y: 43.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3481945618963852047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060365352283784422} + m_CullTransparentMesh: 1 +--- !u!114 &9180115334091918173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060365352283784422} + 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: 3286163911610860551, guid: fb99d95e0a6d23f4e9410d6c113af2bd, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8174970956233947585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6060365352283784422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17587b13f9d4467dbff77cf9762dc8fe, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 8897095238084646223} +--- !u!1001 &4221518541276266867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3192591419784585419} + m_Modifications: + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.x + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1665787281938857491, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Name + value: UIAnimator + objectReference: {fileID: 0} + - target: {fileID: 5156899681550006548, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} +--- !u!224 &3140503542561239742 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 4221518541276266867} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8897095238084646223 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4750466675787535420, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 4221518541276266867} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab.meta b/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab.meta new file mode 100644 index 0000000..bbd287a --- /dev/null +++ b/Client/Assets/Resources/Prefab/UI/BuffIconUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ca0674a45754094baf7e91a0869238f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefab/UI/DevMenu.prefab b/Client/Assets/Resources/Prefab/UI/DevMenu.prefab index e31c40e..142980e 100644 --- a/Client/Assets/Resources/Prefab/UI/DevMenu.prefab +++ b/Client/Assets/Resources/Prefab/UI/DevMenu.prefab @@ -68,10 +68,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4227482396833377269} 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: 800, y: 20} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6707957854610092783 CanvasRenderer: @@ -335,9 +335,9 @@ RectTransform: m_Father: {fileID: 4227482396833377269} 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: 800, y: 430} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: -30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6275009909671072884 CanvasRenderer: @@ -464,8 +464,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 1 - m_CellSize: {x: 100, y: 25} - m_Spacing: {x: 7, y: 1} + m_CellSize: {x: 200, y: 50} + m_Spacing: {x: 10, y: 1} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &753172512531292965 @@ -602,7 +602,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4227482396833377269} - - component: {fileID: 7986066519765048852} - component: {fileID: 7904664609186573076} m_Layer: 5 m_Name: DevMenu @@ -632,32 +631,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7986066519765048852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7588369677482817409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!114 &7904664609186573076 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefab/UI/Pause.prefab b/Client/Assets/Resources/Prefab/UI/Pause.prefab index af9ef76..2f98224 100644 --- a/Client/Assets/Resources/Prefab/UI/Pause.prefab +++ b/Client/Assets/Resources/Prefab/UI/Pause.prefab @@ -152,7 +152,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6806539210387795853 RectTransform: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab b/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab new file mode 100644 index 0000000..c28895f --- /dev/null +++ b/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1665787281938857491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1225146130447774669} + - component: {fileID: 8697738588197658250} + - component: {fileID: 5156899681550006548} + - component: {fileID: 4750466675787535420} + m_Layer: 5 + m_Name: UIAnimator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1225146130447774669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665787281938857491} + 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, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8697738588197658250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665787281938857491} + m_CullTransparentMesh: 1 +--- !u!114 &5156899681550006548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665787281938857491} + 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: 620e16cb0aec3684db9ef80bdcc85695, 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 &4750466675787535420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665787281938857491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: + _sprites: [] + _fps: 2 + _staticSprite: {fileID: 21300000, guid: 620e16cb0aec3684db9ef80bdcc85695, type: 3} diff --git a/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab.meta b/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab.meta new file mode 100644 index 0000000..351b477 --- /dev/null +++ b/Client/Assets/Resources/Prefab/UI/UIAnimator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e9ac5cdd8d06ee841931abb21e710490 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture.meta b/Client/Assets/Resources/Texture.meta new file mode 100644 index 0000000..e93695e --- /dev/null +++ b/Client/Assets/Resources/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cfd5bc87e1de064ab07a45959f28bd7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Bullet.meta b/Client/Assets/Resources/Texture/Bullet.meta new file mode 100644 index 0000000..7a6a13d --- /dev/null +++ b/Client/Assets/Resources/Texture/Bullet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2cd4580a8e904f48bcbd327b9f76ff1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Bullet/GenericBullet.png b/Client/Assets/Resources/Texture/Bullet/GenericBullet.png new file mode 100644 index 0000000..414671a Binary files /dev/null and b/Client/Assets/Resources/Texture/Bullet/GenericBullet.png differ diff --git a/Client/Assets/Resources/Texture/Bullet/GenericBullet.png.meta b/Client/Assets/Resources/Texture/Bullet/GenericBullet.png.meta new file mode 100644 index 0000000..3736c50 --- /dev/null +++ b/Client/Assets/Resources/Texture/Bullet/GenericBullet.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 1965411d3d414c04a93d367e71b6bd52 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster.meta b/Client/Assets/Resources/Texture/Monster.meta new file mode 100644 index 0000000..256b314 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b58553fcee30cb4ca6925fbd1a206ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械.meta b/Client/Assets/Resources/Texture/Monster/机械.meta new file mode 100644 index 0000000..e64369f --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce051dab221d8c74ea0c0447ae7111fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png b/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png new file mode 100644 index 0000000..6a55f3d Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png.meta new file mode 100644 index 0000000..d65f7a5 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/A怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 5fbeab3325dad434d9dfaf815bc137b0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png b/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png new file mode 100644 index 0000000..43d5ad9 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png.meta new file mode 100644 index 0000000..a237b73 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/A怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 16265f06a9accd54480e1b9ffda0e626 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png b/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png new file mode 100644 index 0000000..6e59f98 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png.meta new file mode 100644 index 0000000..ff07c72 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/B怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8b96d6bed6f79e942bd010e7db5e1094 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png b/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png new file mode 100644 index 0000000..15bbb85 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png.meta new file mode 100644 index 0000000..fa9939e --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/B怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 3b021492e5c0bfe4da2478734ae44f42 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png b/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png new file mode 100644 index 0000000..3ba79ef Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png.meta new file mode 100644 index 0000000..663db08 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/C怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 83863ce0158978d478594eef93efd4f5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png b/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png new file mode 100644 index 0000000..52eaad2 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png.meta new file mode 100644 index 0000000..6b7cd50 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/机械/C怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 73197ce4d70bc46478fa1c9d91bfdd97 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合.meta b/Client/Assets/Resources/Texture/Monster/混合.meta new file mode 100644 index 0000000..097dd71 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f832099c5135fef448eb0bc329b4637e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png b/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png new file mode 100644 index 0000000..3d22fcf Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png.meta new file mode 100644 index 0000000..2a6b2e4 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/D怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 7af0835ffb372a34eb602f207391ff7a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png b/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png new file mode 100644 index 0000000..ca33fe1 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png.meta new file mode 100644 index 0000000..ff1cd81 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/D怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: eda613128b8608842970562104c0ef8f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png b/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png new file mode 100644 index 0000000..2dca25b Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png.meta new file mode 100644 index 0000000..0424898 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/E怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 51adc7b5492a9f7448a480bd425a416d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png b/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png new file mode 100644 index 0000000..f36b02a Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png.meta new file mode 100644 index 0000000..bb4d315 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/E怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 32faa93a68a805a4c86f25fa43c6221b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png b/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png new file mode 100644 index 0000000..e5b7f19 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png.meta b/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png.meta new file mode 100644 index 0000000..3e627dc --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/F怪物1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 060a94f23bb5c634ca11ddb5a919904b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png b/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png new file mode 100644 index 0000000..a69b997 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png.meta b/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png.meta new file mode 100644 index 0000000..a186b06 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/混合/F怪物2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: ceb489a2d3d268f46827961d53d02e96 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3000 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物.meta b/Client/Assets/Resources/Texture/Monster/生物.meta new file mode 100644 index 0000000..6eaedc6 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37bedb0276b92cc4ab1a3433ac3fab4d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/全息1.png b/Client/Assets/Resources/Texture/Monster/生物/全息1.png new file mode 100644 index 0000000..a048c34 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/全息1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/全息1.png.meta b/Client/Assets/Resources/Texture/Monster/生物/全息1.png.meta new file mode 100644 index 0000000..5c37018 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/全息1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: c1359200fef94c54295e65eeebccad79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/全息2.png b/Client/Assets/Resources/Texture/Monster/生物/全息2.png new file mode 100644 index 0000000..2834b49 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/全息2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/全息2.png.meta b/Client/Assets/Resources/Texture/Monster/生物/全息2.png.meta new file mode 100644 index 0000000..51c9664 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/全息2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: bfcde0050094e5549b569003306333a2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇1.png b/Client/Assets/Resources/Texture/Monster/生物/蛇1.png new file mode 100644 index 0000000..9de40ea Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/蛇1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇1.png.meta b/Client/Assets/Resources/Texture/Monster/生物/蛇1.png.meta new file mode 100644 index 0000000..45a6047 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/蛇1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 78b6bf42c8c4e8f46a12f96dbbe2fa98 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇2.png b/Client/Assets/Resources/Texture/Monster/生物/蛇2.png new file mode 100644 index 0000000..dcfdc08 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/蛇2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇2.png.meta b/Client/Assets/Resources/Texture/Monster/生物/蛇2.png.meta new file mode 100644 index 0000000..f2ccc81 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/蛇2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 93a2509577f941945b7b11c284e36ca9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇3.png b/Client/Assets/Resources/Texture/Monster/生物/蛇3.png new file mode 100644 index 0000000..62d3406 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/蛇3.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/蛇3.png.meta b/Client/Assets/Resources/Texture/Monster/生物/蛇3.png.meta new file mode 100644 index 0000000..cbb156a --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/蛇3.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: a60844b8f5328444f9e493039a80e7c0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具1.png b/Client/Assets/Resources/Texture/Monster/生物/面具1.png new file mode 100644 index 0000000..2f09cf5 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/面具1.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具1.png.meta b/Client/Assets/Resources/Texture/Monster/生物/面具1.png.meta new file mode 100644 index 0000000..dac06d6 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/面具1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: ee01120d61fe1ea4bafe6aba53390389 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具2.png b/Client/Assets/Resources/Texture/Monster/生物/面具2.png new file mode 100644 index 0000000..d99cd98 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/面具2.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具2.png.meta b/Client/Assets/Resources/Texture/Monster/生物/面具2.png.meta new file mode 100644 index 0000000..e515eca --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/面具2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 702f70789104b3c4689aeaaa3b40f9a1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具3.png b/Client/Assets/Resources/Texture/Monster/生物/面具3.png new file mode 100644 index 0000000..c0614ce Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/面具3.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/面具3.png.meta b/Client/Assets/Resources/Texture/Monster/生物/面具3.png.meta new file mode 100644 index 0000000..a8d4f88 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/面具3.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 9467dfdc7fd629b428e736ff6efcb639 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png b/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png new file mode 100644 index 0000000..ee11287 Binary files /dev/null and b/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png differ diff --git a/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png.meta b/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png.meta new file mode 100644 index 0000000..ef07b32 --- /dev/null +++ b/Client/Assets/Resources/Texture/Monster/生物/鼠鼠.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 403c8e58e3c06624db6a33814abeed6e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 30 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI.meta b/Client/Assets/Resources/UI.meta new file mode 100644 index 0000000..25cd1ec --- /dev/null +++ b/Client/Assets/Resources/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f2b7ac503b3be64ea46fc40e1b5cfb2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/v1.png b/Client/Assets/Resources/UI/v1.png new file mode 100644 index 0000000..0fd1fbd Binary files /dev/null and b/Client/Assets/Resources/UI/v1.png differ diff --git a/Client/Assets/Resources/UI/v1.png.meta b/Client/Assets/Resources/UI/v1.png.meta new file mode 100644 index 0000000..9e09b01 --- /dev/null +++ b/Client/Assets/Resources/UI/v1.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c8fc712b914df11418f38f718750f99c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/其余杂项.meta b/Client/Assets/Resources/UI/其余杂项.meta new file mode 100644 index 0000000..1137774 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0235e00b79d8e2b49b8bded5ab65839f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/其余杂项/小地图背景.svg b/Client/Assets/Resources/UI/其余杂项/小地图背景.svg new file mode 100644 index 0000000..552cf23 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/小地图背景.svg @@ -0,0 +1,602 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/其余杂项/小地图背景.svg.meta b/Client/Assets/Resources/UI/其余杂项/小地图背景.svg.meta new file mode 100644 index 0000000..0bd2085 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/小地图背景.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 899963cf0e2bdb447a6ffc59bf5dadeb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: a321414884999e24a994cf0e3bb39506 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/其余杂项/局内金钱.svg b/Client/Assets/Resources/UI/其余杂项/局内金钱.svg new file mode 100644 index 0000000..2cc40e9 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/局内金钱.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/其余杂项/局内金钱.svg.meta b/Client/Assets/Resources/UI/其余杂项/局内金钱.svg.meta new file mode 100644 index 0000000..a4d8d10 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/局内金钱.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: d102f013c83999e4081e0c014bf2430a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: b541a5b5259afde4e9c7306f3da97ca4 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg b/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg new file mode 100644 index 0000000..7b8ac06 --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg.meta b/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg.meta new file mode 100644 index 0000000..c3394ca --- /dev/null +++ b/Client/Assets/Resources/UI/其余杂项/非当前层级-行为示意栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 54c0e08acbe0ac9468618f599293ce2c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: c3595dff73373c44d8ecaa0911cb1d78 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/增减益状态栏UI.meta b/Client/Assets/Resources/UI/增减益状态栏UI.meta new file mode 100644 index 0000000..4a6e444 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17b4c90b2bde48b45bf20e7af41378e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg new file mode 100644 index 0000000..c76723f --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg.meta b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg.meta new file mode 100644 index 0000000..c065a45 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级减益状态栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 07ef1a47e0caab340808a9098d5c1ff7 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 4499e16b44d401f41b9f63e3b3321ea6 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg new file mode 100644 index 0000000..a129015 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg.meta b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg.meta new file mode 100644 index 0000000..e115346 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/当前层级增益状态栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: fb99d95e0a6d23f4e9410d6c113af2bd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 7914fb98a7dd82f46b3f765345ee8ee4 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg new file mode 100644 index 0000000..58339fb --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg.meta b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg.meta new file mode 100644 index 0000000..1d004e4 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级减益状态栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 9975605dcc1c4f74b9bc49197f0239b2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: bd9daf534f34fde4a87f3fccdc2e7024 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg new file mode 100644 index 0000000..37754f1 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg.meta b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg.meta new file mode 100644 index 0000000..049dd11 --- /dev/null +++ b/Client/Assets/Resources/UI/增减益状态栏UI/非当前层级增益状态栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 4195586faba96a041a71527fa3df5274 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: aa8bac081468539419b3cc510ead7cfe + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/武器栏UI.meta b/Client/Assets/Resources/UI/武器栏UI.meta new file mode 100644 index 0000000..5dc3c19 --- /dev/null +++ b/Client/Assets/Resources/UI/武器栏UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06c1b677afb94ee4e8ab02849f646a65 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg b/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg new file mode 100644 index 0000000..f28c8f4 --- /dev/null +++ b/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg.meta b/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg.meta new file mode 100644 index 0000000..69369cb --- /dev/null +++ b/Client/Assets/Resources/UI/武器栏UI/当前武器栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 89c428aa91735ee48a38fff2a726dbd5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 1 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 0 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: d85d570b2429ec342bf83ecf3f35e740 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg b/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg new file mode 100644 index 0000000..948ddfa --- /dev/null +++ b/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg.meta b/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg.meta new file mode 100644 index 0000000..fc95234 --- /dev/null +++ b/Client/Assets/Resources/UI/武器栏UI/非当前武器栏.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 49574900b62cf8f4481e400bb87d8497 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 8fa813b05d5a429458634b3e34e499e6 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI.meta b/Client/Assets/Resources/UI/血条相关UI.meta new file mode 100644 index 0000000..eb59892 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aac80b09967838b46a4eba7a4bc7a37c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/UI/血条相关UI/基地血条.svg b/Client/Assets/Resources/UI/血条相关UI/基地血条.svg new file mode 100644 index 0000000..832708c --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/基地血条.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/基地血条.svg.meta b/Client/Assets/Resources/UI/血条相关UI/基地血条.svg.meta new file mode 100644 index 0000000..942a519 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/基地血条.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 5df876ecff4b36840bae2a82c52ddcda +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: b1519d90f236a9b4fb7ee6efb252e0d5 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg b/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg new file mode 100644 index 0000000..0ae3f3f --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg.meta b/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg.meta new file mode 100644 index 0000000..80f235e --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/基地血条底.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: eb5a094463dad0b468605645310d036e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: e98d52b7c0801b2489d9f5200a84737e + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg b/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg new file mode 100644 index 0000000..c9b6044 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg.meta b/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg.meta new file mode 100644 index 0000000..74f974d --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/当前层级血条.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 2d75b7f02ff03f946b5e2dbe410ee8bf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 512 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 0 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 833eb6b335d0baa4c8f444f5b1ab7095 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI/血条底.svg b/Client/Assets/Resources/UI/血条相关UI/血条底.svg new file mode 100644 index 0000000..59431a7 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/血条底.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/血条底.svg.meta b/Client/Assets/Resources/UI/血条相关UI/血条底.svg.meta new file mode 100644 index 0000000..9c4a0f7 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/血条底.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 9e8e5b8f16df1044bb4279fad7eec71d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 512 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 0 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 5afa0322bf417cd489688f861dd40469 + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg new file mode 100644 index 0000000..4ce7208 --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg.meta b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg.meta new file mode 100644 index 0000000..4d01d8d --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: eba9d05bb9d9e4240ac43a4fbcb0eca5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 512 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 0 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: b3fc6e378983d4e4fa657a926b6c853f + PhysicsOutlines: [] diff --git a/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg new file mode 100644 index 0000000..133c3be --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg.meta b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg.meta new file mode 100644 index 0000000..5c66e3a --- /dev/null +++ b/Client/Assets/Resources/UI/血条相关UI/非当前层级血条底.svg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 720f4776d5fb7b64f8ed70520112d072 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 1 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 512 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 0 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + customData: + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 4764d3e052abf3b45a46ab92044792c3 + PhysicsOutlines: [] diff --git a/Client/Assets/RunTimeResource/MiniMap.renderTexture b/Client/Assets/RunTimeResource/MiniMap.renderTexture index a1d56da..d675708 100644 --- a/Client/Assets/RunTimeResource/MiniMap.renderTexture +++ b/Client/Assets/RunTimeResource/MiniMap.renderTexture @@ -12,8 +12,8 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_IsAlphaChannelOptional: 0 serializedVersion: 6 - m_Width: 150 - m_Height: 150 + m_Width: 120 + m_Height: 120 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 90 diff --git a/Client/Assets/Scenes/Game.unity b/Client/Assets/Scenes/Game.unity index 07591cc..6460d39 100644 --- a/Client/Assets/Scenes/Game.unity +++ b/Client/Assets/Scenes/Game.unity @@ -119,6 +119,81 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &22205548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22205549} + - component: {fileID: 22205551} + - component: {fileID: 22205550} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &22205549 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22205548} + 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: 104508618} + 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 &22205550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22205548} + 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: 1, b: 0.9019608, 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: 3286163911610860551, guid: 5df876ecff4b36840bae2a82c52ddcda, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 0.547 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &22205551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22205548} + m_CullTransparentMesh: 1 --- !u!1 &29300414 GameObject: m_ObjectHideFlags: 0 @@ -307,6 +382,97 @@ Transform: m_Children: [] m_Father: {fileID: 2110038582} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &104508617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 104508618} + - component: {fileID: 104508620} + - component: {fileID: 104508619} + m_Layer: 5 + m_Name: BaseBuildingHPBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &104508618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104508617} + 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: 2141169989} + - {fileID: 22205549} + m_Father: {fileID: 2062509144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -230.19214, y: -53.597412} + m_SizeDelta: {x: 402.5165, y: 46.5413} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &104508619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104508617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5026699f3a94f029628af90ccd8fa8d, type: 3} + m_Name: + m_EditorClassIdentifier: + image: {fileID: 22205550} + progressGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.23137255, b: 0.2901961, a: 1} + key1: {r: 1, g: 0.98039216, b: 0.2627451, a: 1} + key2: {r: 0, g: 1, b: 0.9019608, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 16384 + ctime1: 32768 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + _editorProgressPreview: 0.547 +--- !u!222 &104508620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104508617} + m_CullTransparentMesh: 1 --- !u!1 &111982856 GameObject: m_ObjectHideFlags: 0 @@ -425,6 +591,7 @@ MonoBehaviour: m_EditorClassIdentifier: isGlobal: 1 characterPrefab: {fileID: 3420474218334607780, guid: 5218adfb8e855a9459df63de8b2f323c, type: 3} + monsterPrefab: {fileID: 0} buildingPrefab: {fileID: 5615006624229444611, guid: d7b9277d8e6ac4541800044bdb0da063, type: 3} bulletPrefab: {fileID: 8687677644466399534, guid: 29b2450a8636a104586e36333878f4d9, type: 3} pickupPrefab: {fileID: 1096543602564338806, guid: ec84100729cd1bd4699fc15b3a09134c, type: 3} @@ -616,7 +783,6 @@ GameObject: m_Component: - component: {fileID: 274529400} - component: {fileID: 274529403} - - component: {fileID: 274529402} - component: {fileID: 274529401} m_Layer: 5 m_Name: MainHPBar @@ -639,12 +805,12 @@ RectTransform: m_Children: - {fileID: 796630699} - {fileID: 1350296600} - m_Father: {fileID: 1890891271} + m_Father: {fileID: 2062509144} 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: 100, y: 100} + m_AnchoredPosition: {x: 90.0318, y: 177.83636} + m_SizeDelta: {x: 123.0923, y: 301.846} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &274529401 MonoBehaviour: @@ -659,36 +825,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: image: {fileID: 1350296601} ---- !u!114 &274529402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 274529399} - 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.745283, g: 0.42562896, b: 0.024608415, 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 + progressGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.23137255, b: 0.2901961, a: 1} + key1: {r: 1, g: 0.98039216, b: 0.2627451, a: 1} + key2: {r: 0, g: 1, b: 0.9019608, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 16384 + ctime1: 32768 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + _editorProgressPreview: 0.63 --- !u!222 &274529403 CanvasRenderer: m_ObjectHideFlags: 0 @@ -776,6 +943,57 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &455427351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 455427352} + - component: {fileID: 455427353} + m_Layer: 5 + m_Name: CoinUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &455427352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455427351} + 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: 896112297} + - {fileID: 854403366} + m_Father: {fileID: 2062509144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -110.76074, y: -99.95935} + m_SizeDelta: {x: 147.5416, y: 44.6209} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &455427353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455427351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 85cfb4a924a04c6e9f6f7801207dbee3, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 854403367} --- !u!1 &476295824 GameObject: m_ObjectHideFlags: 0 @@ -801,17 +1019,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476295824} - 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: [] - m_Father: {fileID: 1866986816} + m_Father: {fileID: 1107928324} 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: -10, y: -10} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &476295826 MonoBehaviour: @@ -826,7 +1044,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: 1, b: 1, a: 0.7490196} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -848,6 +1066,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476295824} m_CullTransparentMesh: 1 +--- !u!224 &538945756 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 6105138323762792695} + m_PrefabAsset: {fileID: 0} +--- !u!1 &551559132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 551559133} + - component: {fileID: 551559135} + - component: {fileID: 551559134} + m_Layer: 5 + m_Name: bk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &551559133 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551559132} + 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: 582436622} + 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 &551559134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551559132} + 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: 0.995283, b: 0.995283, 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: 3286163911610860551, guid: 720f4776d5fb7b64f8ed70520112d072, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.604 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &551559135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551559132} + m_CullTransparentMesh: 1 --- !u!1 &556535795 GameObject: m_ObjectHideFlags: 0 @@ -893,7 +1191,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!1 &629678389 +--- !u!1 &582436621 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -901,100 +1199,151 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 629678390} - - component: {fileID: 629678394} - - component: {fileID: 629678393} - - component: {fileID: 629678392} - - component: {fileID: 629678391} + - component: {fileID: 582436622} + - component: {fileID: 582436624} + - component: {fileID: 582436623} m_Layer: 5 - m_Name: EquipmentBar + m_Name: OtherHPBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &629678390 +--- !u!224 &582436622 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629678389} + m_GameObject: {fileID: 582436621} 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: 1890891271} + m_Children: + - {fileID: 551559133} + - {fileID: 923163877} + m_Father: {fileID: 2062509144} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -150} - m_SizeDelta: {x: 6, y: 50} - m_Pivot: {x: 0, y: 0} ---- !u!114 &629678391 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -86.66797, y: 177.8364} + m_SizeDelta: {x: 112.5331, y: 302.7567} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &582436623 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629678389} + m_GameObject: {fileID: 582436621} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Script: {fileID: 11500000, guid: a5026699f3a94f029628af90ccd8fa8d, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &629678392 + image: {fileID: 923163878} + progressGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.23137255, b: 0.2901961, a: 1} + key1: {r: 1, g: 0.98039216, b: 0.2627451, a: 1} + key2: {r: 0, g: 1, b: 0.9019608, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 16384 + ctime1: 32768 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + _editorProgressPreview: 0.576 +--- !u!222 &582436624 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582436621} + m_CullTransparentMesh: 1 +--- !u!1 &689340256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689340257} + - component: {fileID: 689340259} + - component: {fileID: 689340258} + - component: {fileID: 689340260} + m_Layer: 5 + m_Name: use + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &689340257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689340256} + 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: 538945756} + m_Father: {fileID: 1942077021} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 74.80589, y: 71.574394} + m_SizeDelta: {x: 144.0769, y: 143.1488} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &689340258 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629678389} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 5 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &629678393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629678389} + m_GameObject: {fileID: 689340256} 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.754717, g: 0.47987247, b: 0.26699895, a: 1} + 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_Sprite: {fileID: 3286163911610860551, guid: 89c428aa91735ee48a38fff2a726dbd5, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1002,19 +1351,145 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &629678394 +--- !u!222 &689340259 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629678389} + m_GameObject: {fileID: 689340256} m_CullTransparentMesh: 1 +--- !u!114 &689340260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689340256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d651a3517184abcb4aff78629eb7946, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 6105138323762792696} --- !u!224 &689345800 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2322698135530781468, guid: afbed11ea0c7e944aa36a71951b00ad6, type: 3} m_PrefabInstance: {fileID: 3215589691918074709} m_PrefabAsset: {fileID: 0} +--- !u!1001 &689521025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1535848048} + m_Modifications: + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.x + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1665787281938857491, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Name + value: UIAnimator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} +--- !u!224 &689521026 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 689521025} + m_PrefabAsset: {fileID: 0} +--- !u!114 &689521027 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4750466675787535420, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 689521025} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &719498455 GameObject: m_ObjectHideFlags: 0 @@ -1129,6 +1604,196 @@ MonoBehaviour: _dimensionId: mapGenerator: {fileID: 741561708} cameraPosition: {x: 0, y: 0, z: 0} +--- !u!1 &761473399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 761473400} + - component: {fileID: 761473401} + - component: {fileID: 761473402} + m_Layer: 5 + m_Name: otherBuff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &761473400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761473399} + 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: 2062509144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -958.37, y: 48.86328} + m_SizeDelta: {x: 1461.9, y: 43.8996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &761473401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761473399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 7 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 1 +--- !u!114 &761473402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761473399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f6f033d6fe84e769e101fb355ef3ffa, type: 3} + m_Name: + m_EditorClassIdentifier: + prefab: {fileID: 8174970956233947585, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + container: {fileID: 761473400} +--- !u!1001 &771334553 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1483441034} + m_Modifications: + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.x + value: -40.00006 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1665787281938857491, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Name + value: UIAnimator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} +--- !u!224 &771334554 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 771334553} + m_PrefabAsset: {fileID: 0} +--- !u!114 &771334555 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4750466675787535420, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 771334553} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &796630698 GameObject: m_ObjectHideFlags: 0 @@ -1179,16 +1844,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0.995283, b: 0.995283, 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 3286163911610860551, guid: 9e8e5b8f16df1044bb4279fad7eec71d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 1 m_FillAmount: 0.604 @@ -1366,6 +2031,292 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1 &854403365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 854403366} + - component: {fileID: 854403368} + - component: {fileID: 854403367} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &854403366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854403365} + 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: 455427352} + 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: -29.999996, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &854403367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854403365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 414444444425666666666666 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 317edb274e9c5144a9916937bdbf7716, type: 2} + m_sharedMaterial: {fileID: -1361428157011412921, guid: 317edb274e9c5144a9916937bdbf7716, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &854403368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854403365} + m_CullTransparentMesh: 1 +--- !u!1 &896112296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 896112297} + - component: {fileID: 896112299} + - component: {fileID: 896112298} + m_Layer: 5 + m_Name: bk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &896112297 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896112296} + 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: 455427352} + 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 &896112298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896112296} + 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: 3286163911610860551, guid: d102f013c83999e4081e0c014bf2430a, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &896112299 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896112296} + m_CullTransparentMesh: 1 +--- !u!1 &923163876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 923163877} + - component: {fileID: 923163879} + - component: {fileID: 923163878} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &923163877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923163876} + 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: 582436622} + 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 &923163878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923163876} + 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: 1, b: 0.9019608, 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: 3286163911610860551, guid: eba9d05bb9d9e4240ac43a4fbcb0eca5, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.576 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &923163879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923163876} + m_CullTransparentMesh: 1 --- !u!224 &981108095 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3161252966921572831, guid: 6846a4c7db6ab7e49812b377bdf8df7d, type: 3} @@ -1417,6 +2368,96 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: textureLevel: {fileID: 828003924} +--- !u!1 &1107928323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1107928324} + - component: {fileID: 1107928327} + - component: {fileID: 1107928326} + - component: {fileID: 1107928325} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1107928324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107928323} + 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: 476295825} + m_Father: {fileID: 1866986816} + 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: -14, y: -13.999996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1107928325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107928323} + 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.003921569} + 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: 3286163911610860551, guid: 899963cf0e2bdb447a6ffc59bf5dadeb, 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 &1107928326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107928323} + m_CullTransparentMesh: 1 +--- !u!114 &1107928327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107928323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &1204850182 GameObject: m_ObjectHideFlags: 0 @@ -1732,7 +2773,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -1775,7 +2816,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1866986816} - {fileID: 2062509144} - {fileID: 1892335252} - {fileID: 2068504032} @@ -1927,6 +2967,29 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1277422231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 509618438222383851} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1277422232 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 509618438222383851} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1277422235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277422231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17587b13f9d4467dbff77cf9762dc8fe, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 509618438222383852} --- !u!1 &1350296599 GameObject: m_ObjectHideFlags: 0 @@ -1977,19 +3040,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.023584902, b: 0.023584902, a: 1} + m_Color: {r: 0, g: 1, b: 0.9019608, 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 3286163911610860551, guid: 2d75b7f02ff03f946b5e2dbe410ee8bf, type: 3} m_Type: 3 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.556 + m_FillAmount: 0.63 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -2052,6 +3115,140 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1633840166558733415, guid: 97884168f61531647ba02870b2e2160f, type: 3} m_PrefabInstance: {fileID: 561707863834017811} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1408316568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1725111928} + m_Modifications: + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_SizeDelta.x + value: 62.421 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_SizeDelta.y + value: 43.9 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Name + value: Image (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1408316572} + m_SourcePrefab: {fileID: 100100000, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} +--- !u!224 &1408316569 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 1408316568} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1408316570 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8897095238084646223, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 1408316568} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1408316571 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 1408316568} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1408316572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408316571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17587b13f9d4467dbff77cf9762dc8fe, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 1408316570} --- !u!1 &1421953693 GameObject: m_ObjectHideFlags: 0 @@ -2265,6 +3462,186 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1483441033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1483441034} + - component: {fileID: 1483441036} + - component: {fileID: 1483441035} + - component: {fileID: 1483441037} + m_Layer: 5 + m_Name: otherMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1483441034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483441033} + 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: 771334554} + m_Father: {fileID: 2062509144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -161.8, y: 98.48938} + m_SizeDelta: {x: 144, y: 144} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1483441035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483441033} + 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: 3286163911610860551, guid: 54c0e08acbe0ac9468618f599293ce2c, 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 &1483441036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483441033} + m_CullTransparentMesh: 1 +--- !u!114 &1483441037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483441033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d81179f82c542edb275daabff5bfe12, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 771334555} +--- !u!1 &1535848047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1535848048} + - component: {fileID: 1535848050} + - component: {fileID: 1535848049} + - component: {fileID: 1535848051} + m_Layer: 5 + m_Name: 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1535848048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535848047} + 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: 689521026} + m_Father: {fileID: 1942077021} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 146.97313, y: 157.07912} + m_SizeDelta: {x: 98.2785, y: 97.6994} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1535848049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535848047} + 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: 3286163911610860551, guid: 49574900b62cf8f4481e400bb87d8497, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1535848050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535848047} + m_CullTransparentMesh: 1 +--- !u!114 &1535848051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535848047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d651a3517184abcb4aff78629eb7946, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 689521027} --- !u!1 &1585331067 GameObject: m_ObjectHideFlags: 0 @@ -2388,6 +3765,209 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1607044843 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1660284963} + m_Modifications: + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.x + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1665787281938857491, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Name + value: UIAnimator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} +--- !u!224 &1607044844 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 1607044843} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1607044845 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4750466675787535420, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 1607044843} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1660284962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1660284963} + - component: {fileID: 1660284965} + - component: {fileID: 1660284964} + - component: {fileID: 1660284966} + m_Layer: 5 + m_Name: 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1660284963 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660284962} + 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: 1607044844} + m_Father: {fileID: 1942077021} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 122.79912, y: 245.30267} + m_SizeDelta: {x: 97.8637, y: 97.2345} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1660284964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660284962} + 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: 3286163911610860551, guid: 49574900b62cf8f4481e400bb87d8497, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1660284965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660284962} + m_CullTransparentMesh: 1 +--- !u!114 &1660284966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660284962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d651a3517184abcb4aff78629eb7946, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 1607044845} --- !u!224 &1672332560 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8654739876786722101, guid: 1b140ccde6242874785fb30e18322eab, type: 3} @@ -2404,6 +3984,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 22c2554b0c0949aab37618f3a80ffe5a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1725111927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1725111928} + - component: {fileID: 1725111929} + - component: {fileID: 1725111930} + m_Layer: 5 + m_Name: MainBuff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1725111928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725111927} + 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: 1277422232} + - {fileID: 1408316569} + m_Father: {fileID: 2062509144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 261.91064, y: 48.86328} + m_SizeDelta: {x: 62.4213, y: 43.8996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1725111929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725111927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 7 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1725111930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725111927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f6f033d6fe84e769e101fb355ef3ffa, type: 3} + m_Name: + m_EditorClassIdentifier: + prefab: {fileID: 8174970956233947585, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + container: {fileID: 1725111928} --- !u!1 &1866986815 GameObject: m_ObjectHideFlags: 0 @@ -2430,18 +4089,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866986815} - 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: 476295825} - m_Father: {fileID: 1236970686} + - {fileID: 1107928324} + m_Father: {fileID: 2062509144} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -85, y: -85} - m_SizeDelta: {x: 160, y: 160} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.6211, y: -195.7778} + m_SizeDelta: {x: 294.493, y: 294.7475} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1866986817 MonoBehaviour: @@ -2463,9 +4122,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 3286163911610860551, guid: 899963cf0e2bdb447a6ffc59bf5dadeb, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2495,7 +4154,12 @@ MonoBehaviour: m_EditorClassIdentifier: background: {fileID: 1866986817} texture: {fileID: 476295826} ---- !u!1 &1890891270 +--- !u!224 &1892335252 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4227482396833377269, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + m_PrefabInstance: {fileID: 481559811017721991} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1942077020 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2503,97 +4167,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1890891271} - - component: {fileID: 1890891274} - - component: {fileID: 1890891273} - - component: {fileID: 1890891272} + - component: {fileID: 1942077021} + - component: {fileID: 1942077022} m_Layer: 5 - m_Name: FocuseEntityInf + m_Name: Equipment m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1890891271 +--- !u!224 &1942077021 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890891270} + m_GameObject: {fileID: 1942077020} 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: 274529400} - - {fileID: 629678390} + - {fileID: 689340257} + - {fileID: 1535848048} + - {fileID: 1660284963} m_Father: {fileID: 2062509144} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1890891272 + m_AnchoredPosition: {x: 192.80688, y: 177.84} + m_SizeDelta: {x: 205.5941, y: 301.85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1942077022 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890891270} + m_GameObject: {fileID: 1942077020} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4432817f903945648bdc0b3a4ba19adc, type: 3} m_Name: m_EditorClassIdentifier: - uiParent: {fileID: 629678389} - itemUIPrefab: {fileID: 39290904923667451, guid: d989d0eda9043f146bb606ec0fd32905, type: 3} ---- !u!114 &1890891273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890891270} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &1890891274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890891270} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 6 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!224 &1892335252 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4227482396833377269, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} - m_PrefabInstance: {fileID: 481559811017721991} - m_PrefabAsset: {fileID: 0} + currentUse: {fileID: 689340260} + two: {fileID: 1535848051} + three: {fileID: 1660284966} --- !u!1 &1980392309 GameObject: m_ObjectHideFlags: 0 @@ -3132,6 +4751,7 @@ GameObject: m_Component: - component: {fileID: 2062509144} - component: {fileID: 2062509145} + - component: {fileID: 2062509147} m_Layer: 5 m_Name: PlayerUI m_TagString: Untagged @@ -3151,8 +4771,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1176865964342248741} - - {fileID: 1890891271} + - {fileID: 274529400} + - {fileID: 582436622} + - {fileID: 104508618} + - {fileID: 455427352} + - {fileID: 1942077021} + - {fileID: 1725111928} + - {fileID: 761473400} + - {fileID: 1483441034} + - {fileID: 1866986816} m_Father: {fileID: 1236970686} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3173,7 +4800,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: focusedEntityHP: {fileID: 274529401} - lastEntityHP: {fileID: 1176865964342248742} + lastEntityHP: {fileID: 582436623} + BaseBuildingHP: {fileID: 104508619} + miniMap: {fileID: 1866986819} + equipmentUI: {fileID: 1942077022} + coinCountUI: {fileID: 455427353} + focuseEntityBuffIconList: {fileID: 1725111930} + lastEntityBuffIconList: {fileID: 761473402} + attackMode: {fileID: 1483441037} +--- !u!222 &2062509147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062509143} + m_CullTransparentMesh: 1 --- !u!224 &2068504032 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6806539210387795853, guid: 620f2670398686943a232c5a71a6f1d5, type: 3} @@ -3224,6 +4866,81 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 +--- !u!1 &2141169988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141169989} + - component: {fileID: 2141169991} + - component: {fileID: 2141169990} + m_Layer: 5 + m_Name: bk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2141169989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141169988} + 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: 104508618} + 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 &2141169990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141169988} + 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: 0.995283, b: 0.995283, 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: 3286163911610860551, guid: eb5a094463dad0b468605645310d036e, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.604 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2141169991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141169988} + m_CullTransparentMesh: 1 --- !u!1001 &481559811017721991 PrefabInstance: m_ObjectHideFlags: 0 @@ -3232,6 +4949,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1236970686} m_Modifications: + - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -3240,13 +4961,21 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchoredPosition.x - value: 400 + value: 0 objectReference: {fileID: 0} - target: {fileID: 318369690686405214, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchoredPosition.y - value: -10 + value: -15 objectReference: {fileID: 0} - target: {fileID: 1599592022407895033, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.x @@ -3258,7 +4987,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1929317511491337533, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.x - value: 0.99999994 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1929317511491337533, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.y @@ -3278,7 +5007,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3070964228632539618, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_SizeDelta.y - value: 4 + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_AnchorMax.x + value: 1 objectReference: {fileID: 0} - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.y @@ -3286,15 +5019,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_SizeDelta.y + value: -30 objectReference: {fileID: 0} - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchoredPosition.x - value: 400 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4028021113825693505, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchoredPosition.y - value: -235 + value: -15 objectReference: {fileID: 0} - target: {fileID: 4227482396833377269, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_Pivot.x @@ -3404,10 +5145,30 @@ PrefabInstance: propertyPath: actionButton value: 282 objectReference: {fileID: 0} + - target: {fileID: 7904664609186573076, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: isInputOccupied + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7904664609186573076, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: entityPlacementUI value: objectReference: {fileID: 1672332561} + - target: {fileID: 7986066519765048852, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986066519765048852, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_ChildScaleHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986066519765048852, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_ChildControlWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986066519765048852, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8099462081536526843, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -3424,11 +5185,123 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: -17 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7986066519765048852, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72cde32427f7d914692a7b0d22fb791d, type: 3} +--- !u!1001 &509618438222383851 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1725111928} + m_Modifications: + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_SizeDelta.x + value: 62.421 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_SizeDelta.y + value: 43.9 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3192591419784585419, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + propertyPath: m_Name + value: Image + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6060365352283784422, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1277422235} + m_SourcePrefab: {fileID: 100100000, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} +--- !u!114 &509618438222383852 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8897095238084646223, guid: 5ca0674a45754094baf7e91a0869238f, type: 3} + m_PrefabInstance: {fileID: 509618438222383851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &561707863834017811 PrefabInstance: m_ObjectHideFlags: 0 @@ -3594,119 +5467,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 97884168f61531647ba02870b2e2160f, type: 3} ---- !u!1001 &1176865964342248740 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2062509144} - m_Modifications: - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_SizeDelta.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchoredPosition.x - value: -9.999939 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_AnchoredPosition.y - value: 52 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7666974979659500467, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - propertyPath: m_Name - value: Bar - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} ---- !u!224 &1176865964342248741 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6633399472656308268, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - m_PrefabInstance: {fileID: 1176865964342248740} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1176865964342248742 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8924509912883067279, guid: 1b1aef36872c4f44a907f96bf813e8e5, type: 3} - m_PrefabInstance: {fileID: 1176865964342248740} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5026699f3a94f029628af90ccd8fa8d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &3215589691918074709 PrefabInstance: m_ObjectHideFlags: 0 @@ -3860,6 +5620,114 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afbed11ea0c7e944aa36a71951b00ad6, type: 3} +--- !u!1001 &6105138323762792695 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 689340257} + m_Modifications: + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.x + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_SizeDelta.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1225146130447774669, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1665787281938857491, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + propertyPath: m_Name + value: icon + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} +--- !u!114 &6105138323762792696 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4750466675787535420, guid: e9ac5cdd8d06ee841931abb21e710490, type: 3} + m_PrefabInstance: {fileID: 6105138323762792695} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6f899d1c5ef450bb6f3e670fa55cffd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6268679642209076924 PrefabInstance: m_ObjectHideFlags: 0 @@ -3952,6 +5820,10 @@ PrefabInstance: propertyPath: m_Name value: Pause objectReference: {fileID: 0} + - target: {fileID: 8396046402299122671, guid: 620f2670398686943a232c5a71a6f1d5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3965,6 +5837,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1236970686} m_Modifications: + - target: {fileID: 992367162028424711, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 1914629702951577723, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1914629702951577723, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_AnchoredPosition.x + value: 160 + objectReference: {fileID: 0} - target: {fileID: 2669798517361862450, guid: 1b140ccde6242874785fb30e18322eab, type: 3} propertyPath: m_Name value: EntityPlacementUI @@ -3973,10 +5857,42 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4475653812953191369, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSize + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4475653812953191369, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSizeBase + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4541848766221811720, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_text + value: "\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C\u8BF4\u660E\u6587\u672C" + objectReference: {fileID: 0} + - target: {fileID: 4541848766221811720, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4541848766221811720, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSizeBase + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5585349297193151846, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5585349297193151846, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_fontSizeBase + value: 16 + objectReference: {fileID: 0} - target: {fileID: 7402578691222625163, guid: 1b140ccde6242874785fb30e18322eab, type: 3} propertyPath: focusBox value: objectReference: {fileID: 111982856} + - target: {fileID: 7782696062465364445, guid: 1b140ccde6242874785fb30e18322eab, type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} - target: {fileID: 8654739876786722101, guid: 1b140ccde6242874785fb30e18322eab, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Client/Assets/Scenes/Initiate.unity b/Client/Assets/Scenes/Initiate.unity index b1ee7f1..873a70e 100644 --- a/Client/Assets/Scenes/Initiate.unity +++ b/Client/Assets/Scenes/Initiate.unity @@ -119,140 +119,41 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &114698586 -PrefabInstance: +--- !u!1 &117511564 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1482151278} - m_Modifications: - - target: {fileID: 190104900697248908, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Name - value: ButtonTemplate (2) - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5723833987058492246, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_text - value: "\u8BBE\u7F6E" - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 863426611} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SettingsButton - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UI.EscUI, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0afd08be12de0d43af753af4f618da4, type: 3} ---- !u!224 &114698587 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - m_PrefabInstance: {fileID: 114698586} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 117511565} + m_Layer: 0 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &117511565 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117511564} + 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: + - {fileID: 388897426} + - {fileID: 693329423} + - {fileID: 1141579898} + - {fileID: 1981008546} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &187000032 GameObject: m_ObjectHideFlags: 0 @@ -267,7 +168,7 @@ GameObject: - component: {fileID: 187000033} m_Layer: 0 m_Name: Camera - m_TagString: Untagged + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -384,7 +285,7 @@ Transform: m_GameObject: {fileID: 187000032} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0606768, y: 1.6407344, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -659,6 +560,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 97884168f61531647ba02870b2e2160f, type: 3} +--- !u!4 &388897426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + m_PrefabInstance: {fileID: 522222124029275044} + m_PrefabAsset: {fileID: 0} --- !u!1 &400281624 GameObject: m_ObjectHideFlags: 0 @@ -985,143 +891,90 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &682858363 +--- !u!1001 &693329422 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1482151278} + m_TransformParent: {fileID: 117511565} m_Modifications: - - target: {fileID: 190104900697248908, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Name - value: ButtonTemplate - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5723833987058492246, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_text - value: "\u5F00\u59CB" - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1848984429} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.x value: 2 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToScene + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.y + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Base.Launcher, Assembly-CSharp + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.z + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: Game + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.x + value: -2.93 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.y + value: -5.58 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.z + value: -3.82 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9508396 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15270276 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.26880196 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.z + value: -0.018206691 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.296 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 32.572 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.985 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2412502657045938467, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_Name + value: Saving + objectReference: {fileID: 0} + - target: {fileID: 3761108353443528858, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_text + value: "\u5B58\u6863" objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0afd08be12de0d43af753af4f618da4, type: 3} ---- !u!224 &682858364 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - m_PrefabInstance: {fileID: 682858363} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3805996714208757134, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} +--- !u!4 &693329423 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + m_PrefabInstance: {fileID: 693329422} m_PrefabAsset: {fileID: 0} --- !u!224 &862239518 stripped RectTransform: @@ -1133,150 +986,167 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1633840166558733415, guid: 97884168f61531647ba02870b2e2160f, type: 3} m_PrefabInstance: {fileID: 360627886} m_PrefabAsset: {fileID: 0} ---- !u!114 &863426611 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4955394867221047595, guid: 97884168f61531647ba02870b2e2160f, type: 3} - m_PrefabInstance: {fileID: 360627886} +--- !u!1 &911482831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 911482833} + - component: {fileID: 911482832} + m_Layer: 0 + m_Name: CameraControl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &911482832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911482831} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7eac7c56e1474c4ea646c0a408d293a3, type: 3} + m_Script: {fileID: 11500000, guid: f749a65b381541fab3f5dd5e487a457b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1130712157 + isGlobal: 1 + _zoomSpeed: 5 + _minZoom: 2 + _maxZoom: 20 + _focusLerpSpeed: 5 +--- !u!4 &911482833 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911482831} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1680.2731, y: 36.15279, 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} +--- !u!1001 &1141579897 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1482151278} + m_TransformParent: {fileID: 117511565} m_Modifications: - - target: {fileID: 190104900697248908, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Name - value: ButtonTemplate (3) - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5723833987058492246, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_text - value: "\u9000\u51FA" - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 863426611} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.x value: 2 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ExitButton + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.y + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.x + value: 3.29 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.y + value: -5.45 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.34 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9508396 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15270276 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.26880196 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.z + value: -0.018206691 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.296 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 32.572 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.985 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2412502657045938467, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_Name + value: Setting + objectReference: {fileID: 0} + - target: {fileID: 3761108353443528858, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_text + value: "\u8BBE\u7F6E" + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4955394867221047595, guid: 97884168f61531647ba02870b2e2160f, type: 3} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SettingsButton + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: UI.EscUI, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0afd08be12de0d43af753af4f618da4, type: 3} ---- !u!224 &1130712158 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - m_PrefabInstance: {fileID: 1130712157} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3805996714208757134, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} +--- !u!4 &1141579898 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + m_PrefabInstance: {fileID: 1141579897} m_PrefabAsset: {fileID: 0} --- !u!1 &1145531077 GameObject: @@ -1490,7 +1360,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 194192103} - - {fileID: 1482151278} m_Father: {fileID: 668892717} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1498,190 +1367,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1482151277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1482151278} - - component: {fileID: 1482151279} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1482151278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482151277} - 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: 682858364} - - {fileID: 1705599414} - - {fileID: 114698587} - - {fileID: 1130712158} - m_Father: {fileID: 1344781620} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: -200, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1482151279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482151277} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1001 &1705599413 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1482151278} - m_Modifications: - - target: {fileID: 190104900697248908, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Name - value: ButtonTemplate (1) - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5723833987058492246, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_text - value: "\u5B58\u6863" - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8827200521422920569, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0afd08be12de0d43af753af4f618da4, type: 3} ---- !u!224 &1705599414 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1690722858018107951, guid: f0afd08be12de0d43af753af4f618da4, type: 3} - m_PrefabInstance: {fileID: 1705599413} - m_PrefabAsset: {fileID: 0} --- !u!1 &1848984427 GameObject: m_ObjectHideFlags: 0 @@ -1731,6 +1416,119 @@ MonoBehaviour: describeText: {fileID: 1145531079} duration: 0 fadeDuration: 0 +--- !u!1001 &1981008545 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 117511565} + m_Modifications: + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.x + value: 8.95 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.y + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.z + value: -3.94 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9508396 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15270276 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.26880196 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.z + value: -0.018206691 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.296 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 32.572 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.985 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2412502657045938467, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_Name + value: Exit + objectReference: {fileID: 0} + - target: {fileID: 3761108353443528858, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_text + value: "\u9000\u51FA" + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4955394867221047595, guid: 97884168f61531647ba02870b2e2160f, type: 3} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ExitButton + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.EscUI, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3805996714208757134, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} +--- !u!4 &1981008546 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + m_PrefabInstance: {fileID: 1981008545} + m_PrefabAsset: {fileID: 0} --- !u!1 &1989361079 GameObject: m_ObjectHideFlags: 0 @@ -1819,6 +1617,118 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &522222124029275044 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 117511565} + m_Modifications: + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.x + value: -8.96 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.y + value: -5.49 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9508396 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15270276 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.26880196 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalRotation.z + value: -0.018206691 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.296 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 32.572 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.985 + objectReference: {fileID: 0} + - target: {fileID: 709533242955877997, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2412502657045938467, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_Name + value: Start + objectReference: {fileID: 0} + - target: {fileID: 3761108353443528858, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: m_text + value: "\u5F00\u59CB" + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1848984429} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ToScene + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Base.Launcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: Game + objectReference: {fileID: 0} + - target: {fileID: 8989378577537570065, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3805996714208757134, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 04bb56c29e3de4248a236f83c889ca7d, type: 3} --- !u!1001 &3159610982499366409 PrefabInstance: m_ObjectHideFlags: 0 @@ -2256,3 +2166,5 @@ SceneRoots: - {fileID: 336157946} - {fileID: 597126023} - {fileID: 1200712023} + - {fileID: 117511565} + - {fileID: 911482833} diff --git a/Client/Assets/Scripts/Base/Clock.cs b/Client/Assets/Scripts/Base/Clock.cs index 6ba6772..6c640c4 100644 --- a/Client/Assets/Scripts/Base/Clock.cs +++ b/Client/Assets/Scripts/Base/Clock.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -using Utils; +using Utils; // 假设此命名空间包含MonoSingleton namespace Base { @@ -25,120 +25,239 @@ namespace Base private bool _pause = false; public bool Pause { - get - { - return _pause; - } + get => _pause; set { - if (value) + if (value != _pause) // 逻辑修改说明：避免重复设置Time.timeScale { - Time.timeScale = 0; + Time.timeScale = value ? 0 : 1; + _pause = value; } - else - { - Time.timeScale = 1; - } - _pause = value; } } - public List tickPhysics = new(); - public List ticks = new(); - public List tickUIs = new(); + + // 修改点 1.1：主列表用于迭代 + private readonly List _ticks = new(); + private readonly List _tickPhysics = new(); + private readonly List _tickUIs = new(); + + // 修改点 1.1：缓冲列表用于添加 + private readonly HashSet _ticksToAdd = new(); // 逻辑修改说明：使用HashSet避免重复添加，提高查找效率 + private readonly HashSet _tickPhysicsToAdd = new(); + private readonly HashSet _tickUIsToAdd = new(); + + // 修改点 1.1：缓冲列表用于移除 + private readonly HashSet _ticksToRemove = new(); // 逻辑修改说明：使用HashSet避免重复移除，提高查找效率 + private readonly HashSet _tickPhysicsToRemove = new(); + private readonly HashSet _tickUIsToRemove = new(); private void Update() { + // 逻辑修改说明：UI部分的Tick不应受_pause影响 if (!_pause) - foreach (var tick in ticks) + { + // 逻辑修改说明：迭代时使用只读副本或确保不会被修改 + // 这里是直接迭代_ticks，确保_ticks在Update生命周期内不会被Add/Remove直接修改 + // 添加和移除操作通过缓冲区在LateUpdate处理 + foreach (var tick in _ticks) + { tick.Tick(); - - foreach (var uiTick in tickUIs) uiTick.TickUI(); - //if (timer > 1) - //{ - // timer -= 1; - // Debug.Log("滴答"); - //} - //timer += Time.deltaTime; + } + } + // UI更新通常不受游戏暂停影响（例如菜单动画、UI计时器等），除非UI本身也需要暂停逻辑。 + // 根据需求决定是否受_pause影响。此处假设UI不暂停。 + foreach (var uiTick in _tickUIs) + { + uiTick.TickUI(); + } } private void FixedUpdate() { if (!_pause) - foreach (var physicsTick in tickPhysics) + { + foreach (var physicsTick in _tickPhysics) + { physicsTick.TickPhysics(); + } + } } + // 修改点 1.4：在LateUpdate应用缓冲区的更改 + private void LateUpdate() + { + ApplyBufferedChanges(); + } + + // 修改点 3.1：OnDestroy保持不变，确保事件移除 private void OnDestroy() { - // 移除事件监听 SceneManager.sceneLoaded -= OnSceneLoaded; } - protected override void OnStart() + // 修改点 3.1：OnStart保持不变，负责事件注册和初始化 + protected override void OnStart() // MonoSingleton的Awake后调用 { - // 注册场景加载事件 SceneManager.sceneLoaded += OnSceneLoaded; - - // 初始化时调用一次 - Init(); + // 逻辑修改说明：Initial清理所有列表，而不是填充 + Init(); } private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { - // 场景加载完成后调用 Init 方法 Init(); } /// - /// 初始化方法 + /// 初始化/重置方法。清空所有注册列表和缓冲列表。 /// + // 修改点 2.1：Init() 方法不再负责FindObjectsByType public void Init() { - ticks.Clear(); - tickPhysics.Clear(); - tickUIs.Clear(); + _ticks.Clear(); + _tickPhysics.Clear(); + _tickUIs.Clear(); + _ticksToAdd.Clear(); + _tickPhysicsToAdd.Clear(); + _tickUIsToAdd.Clear(); + + _ticksToRemove.Clear(); + _tickPhysicsToRemove.Clear(); + _tickUIsToRemove.Clear(); + + // 逻辑修改说明：移除 FindObjectsByType 逻辑 + // 对象应通过其各自的 OnEnable/OnDisable 生命周期来注册/反注册 foreach (var obj in FindObjectsByType(FindObjectsSortMode.None)) { - if (obj is ITick tickObj) ticks.Add(tickObj); - if (obj is ITickPhysics physicsObj) tickPhysics.Add(physicsObj); - if (obj is ITickUI uiObj) tickUIs.Add(uiObj); + if (obj is ITick tickObj) _ticks.Add(tickObj); + if (obj is ITickPhysics physicsObj) _tickPhysics.Add(physicsObj); + if (obj is ITickUI uiObj) _tickUIs.Add(uiObj); } } + + // 修改点 1.2 & 1.3：将更改放入缓冲，并在LateUpdate统一处理 public static void AddTick(ITick tick) { - if (Instance != null && !Instance.ticks.Contains(tick)) - Instance.ticks.Add(tick); + if (Instance != null && tick != null) // 逻辑修改说明：添加null检查 + { + Instance._ticksToAdd.Add(tick); + Instance._ticksToRemove.Remove(tick); // 逻辑修改说明：如果在待移除列表，则先移除 + } } public static void RemoveTick(ITick tick) { - if (Instance != null) - Instance.ticks.Remove(tick); + if (Instance != null && tick != null) // 逻辑修改说明：添加null检查 + { + Instance._ticksToRemove.Add(tick); + Instance._ticksToAdd.Remove(tick); // 逻辑修改说明：如果在待添加列表，则先移除 + } } public static void AddTickPhysics(ITickPhysics physics) { - if (Instance != null && !Instance.tickPhysics.Contains(physics)) - Instance.tickPhysics.Add(physics); + if (Instance != null && physics != null) + { + Instance._tickPhysicsToAdd.Add(physics); + Instance._tickPhysicsToRemove.Remove(physics); + } } public static void RemoveTickPhysics(ITickPhysics physics) { - if (Instance != null) - Instance.tickPhysics.Remove(physics); + if (Instance != null && physics != null) + { + Instance._tickPhysicsToRemove.Add(physics); + Instance._tickPhysicsToAdd.Remove(physics); + } } public static void AddTickUI(ITickUI ui) { - if (Instance != null && !Instance.tickUIs.Contains(ui)) - Instance.tickUIs.Add(ui); + if (Instance != null && ui != null) + { + Instance._tickUIsToAdd.Add(ui); + Instance._tickUIsToRemove.Remove(ui); + } } public static void RemoveTickUI(ITickUI ui) { - if (Instance != null) - Instance.tickUIs.Remove(ui); + if (Instance != null && ui != null) + { + Instance._tickUIsToRemove.Add(ui); + Instance._tickUIsToAdd.Remove(ui); + } + } + + // 修改点 1.3：应用缓冲区的更改 + private void ApplyBufferedChanges() + { + // 先处理移除 + if (_ticksToRemove.Count > 0) + { + foreach (var tick in _ticksToRemove) + { + _ticks.Remove(tick); + } + _ticksToRemove.Clear(); + } + + if (_tickPhysicsToRemove.Count > 0) + { + foreach (var physicsTick in _tickPhysicsToRemove) + { + _tickPhysics.Remove(physicsTick); + } + _tickPhysicsToRemove.Clear(); + } + + if (_tickUIsToRemove.Count > 0) + { + foreach (var uiTick in _tickUIsToRemove) + { + _tickUIs.Remove(uiTick); + } + _tickUIsToRemove.Clear(); + } + + // 后处理添加 + if (_ticksToAdd.Count > 0) + { + foreach (var tick in _ticksToAdd) + { + if (!_ticks.Contains(tick)) // 逻辑修改说明：避免重复添加到主列表 + { + _ticks.Add(tick); + } + } + _ticksToAdd.Clear(); + } + + if (_tickPhysicsToAdd.Count > 0) + { + foreach (var physicsTick in _tickPhysicsToAdd) + { + if (!_tickPhysics.Contains(physicsTick)) + { + _tickPhysics.Add(physicsTick); + } + } + _tickPhysicsToAdd.Clear(); + } + + if (_tickUIsToAdd.Count > 0) + { + foreach (var uiTick in _tickUIsToAdd) + { + if (!_tickUIs.Contains(uiTick)) + { + _tickUIs.Add(uiTick); + } + } + _tickUIsToAdd.Clear(); + } } } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/Base/Launcher.cs b/Client/Assets/Scripts/Base/Launcher.cs index 52c3601..9d34ebb 100644 --- a/Client/Assets/Scripts/Base/Launcher.cs +++ b/Client/Assets/Scripts/Base/Launcher.cs @@ -1,42 +1,70 @@ -// C# -using Managers; // 确保日志命名空间正确 using System.Collections; -using System.Collections.Generic; // 新增，用于List -using TMPro; -using UnityEngine; -using UnityEngine.SceneManagement; +using System.Collections.Generic; // 提供List等通用集合类型 +using Logging; // 提供日志记录功能 +using Managers; // 提供管理器接口和实现 +using TMPro; // TextMeshPro文本组件命名空间 +using UnityEngine; // Unity引擎核心命名空间 +using UnityEngine.SceneManagement; // 场景管理命名空间 namespace Base { - // 请确保你在Unity Editor中将 'projectile' 的Inspector引用从 Gradient 更改为 CustomProgressBar - // 或者替换为你实际的进度条组件类型。 - // 如果你没有 CustomProgressBar，而想用 Image 或者别的，这些 Progress/Opacity 属性需要大幅修改。 - + /// + /// Launcher 类负责管理游戏的初始化加载流程，包括管理器加载、进度条显示和场景切换。 + /// + /// + /// 请注意：虽然此处的 progressBar 变量类型被声明为 Gradient， + /// 但其在代码中的使用方式（如访问 color1, color2 属性和调用 Refresh() 方法） + /// 强烈暗示它应引用一个具有类似 API 的自定义进度条组件，例如 CustomProgressBar。 + /// 如果您使用的是标准 UnityEngine.UI.Image 或其他组件来显示进度， + /// 则 Progress 和 Opacity 属性的实现逻辑需要根据实际组件的 API 进行大幅修改。 + /// public class Launcher : MonoBehaviour { + /// + /// 加载界面UI的根游戏对象。 + /// public GameObject loadingUI; - // 假设 CustomProgressBar 是一个自定义组件，其 API 与原代码使用方式一致 - // 如果这里是 UnityEngine.UI.Image，需要完全改变 Progress 和 Opacity 的实现 - public Gradient progressBar; // 自定义进度条组件 - public TMP_Text describeText; // 描述文本 - public float duration = 0.5f; // 每个步骤的过渡时间 - public float fadeDuration = 2f; // 不透明度渐隐的时间 + /// + /// 用于显示加载进度的自定义进度条组件。 + /// 请参阅类注释以了解其声明类型与预期API的差异。 + /// + public Gradient progressBar; - private float _currentProgressValue = 0f; // 实际的当前进度值（0-1） - private Color _initialTextColor; // 原始文本颜色，用于渐隐 - private Color _initialProgressBarColor1; // 原始进度条颜色1 - private Color _initialProgressBarColor2; // 原始进度条颜色2 + /// + /// 用于显示当前加载步骤描述的文本组件。 + /// + public TMP_Text describeText; - // 存储所有需要加载和清理的管理器 + /// + /// 进度条每个加载步骤的平滑过渡时间（秒）。 + /// + public float duration = 0.5f; + + /// + /// 加载完成后UI元素渐隐的时间（秒）。 + /// + public float fadeDuration = 2f; + + private float _currentProgressValue = 0f; // 实际的当前进度值（在0到1之间） + private Color _initialTextColor; // 描述文本的原始颜色，用于渐隐效果 + private Color _initialProgressBarColor1; // 进度条颜色1的原始值，用于渐变 + private Color _initialProgressBarColor2; // 进度条颜色2的原始值，用于渐变 + + /// + /// 存储所有需要在启动时加载和在重载时清理的管理器实例列表。 + /// private List _managersToLoad; - // Progress 属性，更新进度条和颜色 + /// + /// 获取或设置加载进度值，范围为0到1。 + /// 设置此属性将更新进度条的视觉显示和颜色。 + /// public float Progress { set { - // 确保进度值在0到1之间，提高健壮性 + // 确保进度值在0到1之间，提高系统健壮性 _currentProgressValue = Mathf.Clamp01(value); if (progressBar) @@ -49,17 +77,23 @@ namespace Base } else { - // 后半段：color2 保持白色，color1 从初始色渐变到白色 progressBar.color2 = Color.white; + // 后半段：color2 保持白色，color1 从初始色渐变到白色 progressBar.color1 = Color.Lerp(_initialProgressBarColor1, Color.white, (_currentProgressValue - 0.5f) * 2); } - progressBar.Refresh(); // 通知自定义进度条组件更新显示 + // 通知自定义进度条组件更新显示。 + // 注意：UnityEngine.Gradient 作为数据结构没有 Refresh() 方法， + // 此调用表明 progressBar 实际上预期是一个具有此方法的自定义组件。 + progressBar.Refresh(); } } get => _currentProgressValue; } - // Opacity 属性，更新 UI 元素的透明度 + /// + /// 获取或设置UI元素的整体不透明度，范围0（完全透明）到1（完全不透明）。 + /// 设置此属性将更新进度条和描述文本的透明度。 + /// public float Opacity { set @@ -77,38 +111,44 @@ namespace Base c2.a = alpha; progressBar.color2 = c2; + // 通知自定义进度条组件更新显示。 + // 注意：UnityEngine.Gradient 作为数据结构没有 Refresh() 方法， + // 此调用表明 progressBar 实际上预期是一个具有此方法的自定义组件。 progressBar.Refresh(); } if (describeText) { // 更新描述文本颜色的透明度 - // 渐隐时，描述文本的透明度在 Opacity > 0.5f 时才开始渐变可见 + // 渐隐时，描述文本的透明度在 Opacity > 0.5f 时才开始从0渐变到其原始透明度 var textAlpha = alpha > 0.5f ? Mathf.Lerp(0f, _initialTextColor.a, (alpha - 0.5f) * 2) : 0f; describeText.color = new Color(_initialTextColor.r, _initialTextColor.g, _initialTextColor.b, textAlpha); } } } + /// + /// 当脚本实例被启用时调用一次。 + /// 用于初始化管理器列表并缓存UI元素的初始颜色。 + /// private void Awake() { - // 在 Awake 中初始化管理器列表并注册，确保在 Start 之前完成 + // 在 Awake 中初始化管理器列表，确保在 Start 之前完成所有管理器实例的注册 _managersToLoad = new List { - Logging.UnityLogger.Instance, // UnityLogger的包装器 - Managers.DefineManager.Instance, - Managers.PackagesImageManager.Instance, - Managers.TileManager.Instance, - Managers.AffiliationManager.Instance, - Managers.ItemResourceManager.Instance - // 当未来有新的管理器时，只需在这里添加 Managers.NewManager.Instance + new LoggerManagerWrapper(), // Unity日志的包装器 + DefineManager.Instance, + PackagesImageManager.Instance, + TileManager.Instance, + AffiliationManager.Instance, + ItemResourceManager.Instance, + EventManager.Instance, + AudioManager.Instance, }; - // 缓存UI的初始颜色，以便后续操作或重置 - if (describeText != null) - { - _initialTextColor = describeText.color; - } + // 缓存UI的初始颜色，以便后续操作（如渐隐）或重置 + _initialTextColor = describeText != null ? describeText.color : Color.white; // 如果为空，则使用默认值 + if (progressBar != null) { _initialProgressBarColor1 = progressBar.color1; @@ -116,61 +156,66 @@ namespace Base } else { - Debug.LogWarning("CustomProgressBar component not assigned to Launcher. Progress bar display may not work."); + // 警告日志：自定义进度条组件未赋值给启动器。 + Debug.LogWarning("自定义进度条组件未赋值给启动器，进度条可能无法正常显示。"); } } + /// + /// 在Awake方法之后、首次帧更新之前调用。 + /// 用于判断是否需要执行完整的加载流程，并根据需要启动加载或隐藏加载UI。 + /// private void Start() { - // 如果 Program.Instance.needLoad 为 true，表示需要完整的（重新）加载流程 - // 否则，如果不需要加载，直接禁用UI并返回 + // 如果 Program.Instance.needLoad 为 false，表示游戏已加载或不需要重新加载，直接隐藏加载UI if (!Program.Instance.needLoad) { loadingUI.SetActive(false); return; } - // 根据 Program.Instance.needLoad 的含义（需要重载）， - // 在开始新的加载流程之前，先清理所有可能存在的旧管理器状态。 - // 这确保了每次需要加载时，系统都处于一个干净的初始状态。 - ClearAllManagers(); // <--- 关键修改：在Load()之前调用ClearAllManagers() + // 如果需要加载，则先清理所有管理器（用于重载或确保干净启动），再启动加载流程 + ClearAllManagers(); + + // 初始化游戏设置 + Setting.Instance.Init(); - // 初始化设置 - Base.Setting.Instance.Init(); #if !DEBUG - // 在非DEBUG模式下，从设置中获取过渡时间 - duration = Base.Setting.Instance.CurrentSettings.progressStepDuration; - fadeDuration = Base.Setting.Instance.CurrentSettings.exitAnimationDuration; + // 在非DEBUG模式下，从游戏设置中获取加载和渐隐的持续时间 + duration = Base.Setting.Instance.CurrentSettings.progressStepDuration; + fadeDuration = Base.Setting.Instance.CurrentSettings.exitAnimationDuration; #endif Load(); // 启动加载流程（内部会调用LoadAllManagers） - Program.Instance.needLoad = false; // 加载完成后重置标志 + Program.Instance.needLoad = false; // 加载完成后重置加载标志 } - /// /// 启动游戏的加载流程。 + /// 该方法会激活加载UI，重置进度与透明度，并启动所有管理器的异步加载协程。 /// public void Load() { loadingUI.SetActive(true); // 激活加载UI - Progress = 0f; // 重置进度 - Opacity = 1f; // 重置透明度为完全不透明 + Progress = 0f; // 将进度重置为0 + Opacity = 1f; // 将UI透明度重置为完全不透明 StartCoroutine(LoadAllManagers()); } /// - /// 清理所有管理器，然后重新加载。用于游戏重载或场景切换后需要重新初始化所有数据的情况。 + /// 清理所有管理器，然后重新加载游戏数据。 + /// 此方法适用于游戏重载、场景切换后需要重新初始化所有数据的情况。 /// public void Reload() { - Debug.Log("Performing a full reload of all managers..."); + // 日志：正在执行所有管理器的完整重新加载... + Debug.Log("正在执行所有管理器的完整重新加载..."); StopAllCoroutines(); // 停止当前所有正在运行的加载协程，避免冲突 - ClearAllManagers(); // 清理所有管理器 + ClearAllManagers(); // 清理所有管理器数据 Load(); // 重新加载游戏数据 } /// - /// 遍历所有已注册的管理器并调用它们的 Clear 方法。 + /// 遍历所有已注册的管理器，并安全地调用它们的 Clear 方法以释放资源或重置状态。 /// private void ClearAllManagers() { @@ -182,37 +227,39 @@ namespace Base } catch (System.Exception ex) { - Debug.LogError($"Error clearing manager {manager.StepDescription}: {ex.Message}\n{ex.StackTrace}"); + // 错误日志：清理管理器时发生异常。 + Debug.LogError($"清理管理器 '{manager.StepDescription}' 时出错: {ex.Message}\n{ex.StackTrace}"); } } } /// - /// 协程：按顺序加载所有管理器。 + /// 协程：按顺序加载所有注册的管理器。 + /// 该方法会在加载过程中更新描述文本、平滑过渡进度条，并安全初始化每个管理器。 /// + /// 一个 ，用于协程。 private IEnumerator LoadAllManagers() { for (var i = 0; i < _managersToLoad.Count; i++) { var manager = _managersToLoad[i]; - // 更新描述文本，从管理器实例中获取 + // 更新描述文本，显示当前正在加载的管理器步骤描述 if (describeText != null) { describeText.text = manager.StepDescription; } - // 计算当前阶段的目标进度 + // 计算当前阶段的目标进度值 var targetProgress = (float)(i + 1) / _managersToLoad.Count; // 平滑过渡进度条到下一个目标进度 yield return SmoothTransitionTo(targetProgress); - // 初始化对应的管理器，并进行异常处理 + // 初始化对应的管理器，并处理可能发生的异常 yield return InitializeManagerSafely(manager); - // 模拟耗时，如果管理器Init方法本身很快，可以 uncomment - // yield return new WaitForSeconds(0.1f); + // yield return new WaitForSeconds(0.1f); // 此行代码可用于模拟每个管理器加载的耗时，默认不启用。 } // 所有管理器加载完成后的处理 @@ -220,19 +267,22 @@ namespace Base { describeText.text = "加载完成！"; } - Progress = 1f; // 确保进度条最终达到100% + // 确保进度条最终达到100% + Progress = 1f; - // 开始渐隐效果 + // 启动加载UI的渐隐效果 yield return FadeOutProgressBar(); // 所有加载和动画结束后，可以考虑卸载加载UI，或跳转到主场景 - // ToScene("MainGameScene"); // 如果有需要，在这里跳转到主游戏场景 + // ToScene("MainGameScene"); // 如果有需要，可以在此处调用静态方法跳转到主游戏场景 } /// - /// 尝试安全地初始化单个管理器，并捕获任何异常。 + /// 尝试安全地初始化单个管理器实例，并捕获任何可能发生的异常。 + /// 如果初始化失败，将记录错误日志并更新UI提示。 /// /// 要初始化的管理器实例。 + /// 一个 ，用于协程。 private IEnumerator InitializeManagerSafely(ILaunchManager manager) { var initSuccess = false; @@ -240,36 +290,38 @@ namespace Base try { - manager.Init(); // 调用管理器的 Init 方法 + manager.Init(); // 调用管理器的 Init 方法进行初始化 initSuccess = true; } catch (System.Exception ex) { - initException = ex; // 捕获异常 + initException = ex; // 捕获初始化过程中抛出的异常 } if (!initSuccess && initException != null) { - // 记录错误日志 + // 记录错误日志：初始化管理器时出现错误。 Debug.LogError($"初始化管理器 '{manager.StepDescription}' 时出错: {initException.Message}\n{initException.StackTrace}"); if (describeText != null) { - describeText.text = $"{manager.StepDescription} (初始化失败)"; + describeText.text = $"{manager.StepDescription} (初始化失败)"; // 更新UI显示失败信息 } - // 这里可以添加更复杂的错误处理，例如显示错误弹窗，或者重试逻辑 - // yield break; // 如果错误严重，可以选择停止后续加载 + // 这里可以添加更复杂的错误处理逻辑，例如显示错误弹窗、记录到特定日志文件或允许用户选择重试。 + // yield break; // 如果错误严重到无法继续，可以选择停止后续加载流程。 } - yield return null; // 确保协程继续执行，即使没有做任何事 + yield return null; // 确保协程继续执行，无论初始化成功与否 } /// - /// 协程：平滑过渡进度条到指定的目标进度。 + /// 协程：平滑地过渡进度条的当前值到指定的目标进度。 + /// 使用 Mathf.SmoothStep 实现自然加速和减速的过渡效果。 /// - /// 目标进度值 (0-1)。 + /// 目标进度值 (0到1之间)。 + /// 一个 ，用于协程。 private IEnumerator SmoothTransitionTo(float targetProgress) { - var startProgress = _currentProgressValue; // 获取当前进度作为起始点 + var startProgress = _currentProgressValue; // 获取当前进度作为过渡的起始点 var elapsedTime = 0f; while (elapsedTime < duration) @@ -277,7 +329,7 @@ namespace Base elapsedTime += Time.deltaTime; // 使用 SmoothStep 实现更自然的加速和减速过渡效果 var t = Mathf.SmoothStep(0f, 1f, elapsedTime / duration); - Progress = Mathf.Lerp(startProgress, targetProgress, t); + Progress = Mathf.Lerp(startProgress, targetProgress, t); // 在起始和目标进度之间插值 yield return null; } @@ -285,8 +337,9 @@ namespace Base } /// - /// 协程：渐隐加载UI的透明度。 + /// 协程：平滑渐隐加载UI的所有元素，使其透明度从完全不透明过渡到完全透明。 /// + /// 一个 ，用于协程。 private IEnumerator FadeOutProgressBar() { var elapsedTime = 0f; @@ -305,7 +358,7 @@ namespace Base } /// - /// 静态方法：加载指定名称的场景。 + /// 静态方法：加载指定名称的Unity场景。 /// /// 要加载的场景名称。 public static void ToScene(string scene) @@ -313,7 +366,4 @@ namespace Base SceneManager.LoadScene(scene); } } - } - - diff --git a/Client/Assets/Scripts/Base/Setting.cs b/Client/Assets/Scripts/Base/Setting.cs index 8dca221..5746541 100644 --- a/Client/Assets/Scripts/Base/Setting.cs +++ b/Client/Assets/Scripts/Base/Setting.cs @@ -19,11 +19,13 @@ namespace Base public float globalVolume = 1.0f; public WindowMode currentWindowMode = WindowMode.Fullscreen; public Vector2Int windowResolution = new(1920, 1080); + + public string[] loadOrder; } // 当前游戏设置 public GameSettings CurrentSettings = new(); - + // 窗口模式枚举 public enum WindowMode { Fullscreen, Windowed, Borderless } diff --git a/Client/Assets/Scripts/Base/UIInputControl.cs b/Client/Assets/Scripts/Base/UIInputControl.cs index 7612dca..114351f 100644 --- a/Client/Assets/Scripts/Base/UIInputControl.cs +++ b/Client/Assets/Scripts/Base/UIInputControl.cs @@ -1,3 +1,4 @@ +using System; // Added for Action using System.Collections.Generic; using System.Linq; using UI; @@ -7,7 +8,7 @@ using UnityEngine.SceneManagement; namespace Base { /// - /// UI窗口输入控制和管理类 + /// UI窗口输入控制和管理类。 /// 负责根据输入显示/隐藏UI，并根据UI状态管理游戏暂停。 /// public class UIInputControl : Utils.MonoSingleton, ITickUI @@ -18,8 +19,59 @@ namespace Base private readonly List _visibleWindows = new List(); private bool needUpdate = false; + /// - /// 查找并注册场景中所有的UI窗口，包括非激活状态的 + /// 当UI窗口的可见性状态发生改变时触发的事件。 + /// 参数1: 发生改变的UIBase实例。 + /// 参数2: 窗口的新可见状态 (true为显示，false为隐藏)。 + /// + public event Action OnWindowVisibilityChanged; // <--- 新增 + + /// + /// 获取所有已注册的UI窗口的总数量。 + /// + public int AllWindowCount => _allWindows.Count; + + /// + /// 获取当前可见的UI窗口的数量。 + /// + public int VisibleWindowCount => _visibleWindows.Count; + + /// + /// 查询指定名称的UI窗口是否当前可见。 + /// + /// UI窗口的名称。 + /// 如果窗口可见则返回true，否则返回false。 + public bool IsWindowVisible(string uiName) + { + // 使用 Any() 方法检查 _visibleWindows 列表中是否存在名称匹配且可见的窗口 + return _visibleWindows.Any(window => window != null && window.name == uiName && window.IsVisible); + } + + /// + /// 查询指定名称的UI窗口是否当前处于可见状态且占用了输入。 + /// + /// UI窗口的名称。 + /// 如果窗口可见且占用了输入则返回true，否则返回false。 + public bool IsWindowInputOccupied(string uiName) + { + // 检查 _visibleWindows 列表中是否存在名称匹配且同时占用输入的窗口 + return _visibleWindows.Any(window => window != null && window.name == uiName && window.IsVisible && window.isInputOccupied); + } + + /// + /// 根据名称获取已注册的UI窗口实例。 + /// + /// UI窗口的名称。 + /// 匹配的UIBase实例，如果未找到则返回null。 + public UIBase GetWindow(string uiName) + { + // 从 _allWindows 列表中查找第一个名称匹配的窗口 + return _allWindows.FirstOrDefault(window => window != null && window.name == uiName); + } + + /// + /// 查找并注册场景中所有的UI窗口，包括非激活状态的。 /// private void RegisterAllWindows() { @@ -29,7 +81,7 @@ namespace Base var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene(); if (!activeScene.isLoaded) { - Debug.LogWarning("当前场景未加载，无法注册窗口！"); + Debug.LogWarning("[UIInputControl] 当前场景未加载，无法注册窗口！"); return; } @@ -46,22 +98,22 @@ namespace Base // 初始化所有窗口为隐藏状态 foreach (var window in _allWindows) { + // 确保窗口不为空且其GameObject未被销毁 if (window != null && window.gameObject != null) { - window.Hide(); + window.Hide(); // 隐藏操作会触发 OnWindowVisibilityChanged 事件 } } needUpdate = true; - Debug.Log($"窗口数量{_allWindows.Count}"); } /// - /// UI逻辑更新循环，需要被外部的某个管理器在Update中调用 + /// UI逻辑更新循环，需要被外部的某个管理器在Update中调用。 /// public void TickUI() { - //使用这个是为了让输入独占窗口关闭自己后不会立即激活其他窗口的按键，延迟一帧 + // 使用这个是为了让输入独占窗口关闭自己后不会立即激活其他窗口的按键，延迟一帧 if (needUpdate) { // 更新可见窗口缓存和暂停状态 @@ -70,12 +122,19 @@ namespace Base needUpdate = false; return; } - if (_visibleWindows.Any(window => window.isInputOccupied)) + + // 如果有任何可见窗口占用了输入，则阻止其他窗口通过按键进行操作 + if(_visibleWindows.Any(window => window && window.isInputOccupied)) return; + foreach (var window in _allWindows) { + // 确保窗口不为空且其GameObject未被销毁 + if (!window || !window.gameObject) continue; + // 检查窗口是否设置了有效的激活按键，并且该按键在本帧被按下 if (window.actionButton == KeyCode.None || !Input.GetKeyDown(window.actionButton)) continue; + if (window.IsVisible) { // 如果窗口当前是可见的，且未占用输入，则通过按键隐藏它 @@ -93,20 +152,26 @@ namespace Base } /// - /// 公开的显示窗口方法 + /// 公开的显示窗口方法。 /// - /// 要显示的窗口 + /// 要显示的窗口。 public void Show(UIBase windowToShow) { - if (!windowToShow || windowToShow.IsVisible) return; + // 确保窗口不为空且未被销毁，并且当前不可见 + if (!windowToShow || !windowToShow.gameObject || windowToShow.IsVisible) return; // 如果窗口是独占的，隐藏所有其他窗口 if (windowToShow.exclusive) { - var windowsToHide = new List(_visibleWindows); + // 创建一个副本进行迭代，防止在 Hide() 调用中修改 _visibleWindows 导致迭代器失效 + var windowsToHide = _visibleWindows.ToList(); foreach (var visibleWindow in windowsToHide) { - Hide(visibleWindow); + // 确保窗口不是要显示的窗口本身，且仍然可见 + if (visibleWindow && visibleWindow != windowToShow && visibleWindow.IsVisible) + { + Hide(visibleWindow); + } } } @@ -115,62 +180,93 @@ namespace Base var itick = windowToShow as ITickUI; if (itick != null) Base.Clock.AddTickUI(itick); + + // 触发事件通知窗口可见性已改变 + OnWindowVisibilityChanged?.Invoke(windowToShow, true); // <--- 修改点 2 needUpdate = true; } + /// + /// 根据名称显示UI窗口。 + /// + /// 要显示的UI窗口名称。 public void Show(string uiName) { - foreach (var window in _allWindows) + // 使用 GetWindow 方法获取窗口实例 + var window = GetWindow(uiName); + if (window != null) { - if (window.name == uiName) - { - Show(window); - return; - } + Show(window); + return; } - Debug.LogWarning($"未找到窗口{uiName}"); + Debug.LogWarning($"[UIInputControl] 未找到名称为 '{uiName}' 的窗口来显示。"); } - - + /// - /// 公开的隐藏窗口方法 + /// 公开的隐藏窗口方法。 /// - /// 要隐藏的窗口 + /// 要隐藏的窗口。 public void Hide(UIBase windowToHide) { - if (!windowToHide || !windowToHide.IsVisible) return; + // 确保窗口不为空且未被销毁，并且当前可见 + if (!windowToHide || !windowToHide.gameObject || !windowToHide.IsVisible) return; - // 隐藏目标窗口并更新缓存与暂停状态 + // 隐藏目标窗口 windowToHide.Hide(); + // 当UI窗口被隐藏时，如果它实现了ITickUI接口，则必须将其从Clock中移除。 + // 这防止了隐藏窗口继续被Tick，避免性能开销和潜在的NullReferenceException。 + if (windowToHide is ITickUI iTick) + Base.Clock.RemoveTickUI(iTick); + + // 触发事件通知窗口可见性已改变 + OnWindowVisibilityChanged?.Invoke(windowToHide, false); // <--- 修改点 3 + needUpdate = true; } + + /// + /// 根据名称隐藏UI窗口。 + /// + /// 要隐藏的UI窗口名称。 public void Hide(string uiName) { - foreach (var visibleWindow in _visibleWindows) + // 仅在可见窗口中查找并隐藏，更符合HideByName的即时操作期望 + // 如果需要隐藏所有名称匹配的窗口（包括隐藏的），则需要遍历 _allWindows + var visibleWindowToHide = _visibleWindows.FirstOrDefault(window => window != null && window.name == uiName && window.IsVisible); + if (visibleWindowToHide != null) { - if (visibleWindow.name == uiName) + Hide(visibleWindowToHide); + return; + } + Debug.LogWarning($"[UIInputControl] 未找到名称为 '{uiName}' 且当前可见的窗口来隐藏。"); + } + + /// + /// 隐藏所有当前可见的UI窗口。 + /// + public void HideAll() + { + // 创建 _visibleWindows 的一个副本进行迭代，以避免在循环中修改原列表导致迭代器失效 + var windowsToHide = _visibleWindows.ToList(); + foreach (var visibleWindow in windowsToHide) + { + // 再次检查窗口是否仍然可见，因为其他操作可能已经隐藏了它 + if (visibleWindow != null && visibleWindow.IsVisible) { - Hide(visibleWindow); - break; + Hide(visibleWindow); // Hide() 方法会触发 OnWindowVisibilityChanged 事件 } } } - public void HideAll() - { - foreach (var visibleWindow in _visibleWindows) - { - Hide(visibleWindow); - } - } /// - /// 根据当前所有可见窗口的 needPause 属性来更新游戏时钟的暂停状态 + /// 根据当前所有可见窗口的 needPause 属性来更新游戏时钟的暂停状态。 /// private void UpdatePauseState() { - var shouldPause = _visibleWindows.Any(w => w.needPause); + // 确保 _visibleWindows 中的窗口都有效 + var shouldPause = _visibleWindows.Any(w => w && w.needPause); if (Base.Clock.Instance.Pause != shouldPause) { Base.Clock.Instance.Pause = shouldPause; @@ -178,35 +274,55 @@ namespace Base } /// - /// 更新当前可见窗口的缓存列表 + /// 更新当前可见窗口的缓存列表。 /// private void UpdateVisibleWindowsCache() { _visibleWindows.Clear(); foreach (var window in _allWindows) { - if (window.IsVisible) + if (window && window.IsVisible) // 确保窗口有效且可见 { _visibleWindows.Add(window); } } } + /// + /// 当脚本实例被销毁时调用。 + /// 用于在销毁时取消订阅场景加载事件，防止内存泄漏。 + /// private void OnDestroy() { SceneManager.sceneLoaded -= OnSceneLoaded; + // 在销毁时清空所有订阅者，防止因MonoSingleton持久化导致下一场景重新加载时出现旧的订阅者（如果单例不销毁，事件本身也不会自动清空订阅） + // 如果 UIInputControl 是一个会随场景销毁的普通 MonoBehaviour 而不是持久化的 MonoSingleton, 某些情况下清除订阅者可以防止跨场景的引用问题。 + // 但对于 MonoSingleton，它通常是持久化的，所以事件在重新加载场景后仍然保留。明确清空可以避免不必要的资源占用，虽然在应用程序关闭时会自动释放。 + // OnWindowVisibilityChanged = null; // 谨慎使用，如果外部有长期订阅的需求，清空可能导致问题。通常更推荐外部在OnDestroy中取消订阅。 } + /// + /// MonoSingleton 的 OnStart 方法，在单例首次创建并激活时调用，早于普通的 Start 方法。 + /// 用于订阅场景加载事件并在首次启动时注册UI窗口。 + /// protected override void OnStart() { + // 订阅场景加载事件，以便在新场景加载后重新注册UI窗口 SceneManager.sceneLoaded += OnSceneLoaded; - + // 首次启动时也注册一次窗口（例如在进入第一个场景时）。 RegisterAllWindows(); } + /// + /// 当场景加载完成时调用。 + /// 用于在场景加载后重新查找并注册所有UI窗口。 + /// + /// 已加载的场景。 + /// 场景加载模式。 private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { + // 当场景加载时，重新查找并注册所有UI窗口 RegisterAllWindows(); } } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/CameraControl/CameraControl.cs b/Client/Assets/Scripts/CameraControl/CameraControl.cs index 22eb500..fd085e1 100644 --- a/Client/Assets/Scripts/CameraControl/CameraControl.cs +++ b/Client/Assets/Scripts/CameraControl/CameraControl.cs @@ -1,233 +1,288 @@ using Base; +using Map; using UnityEngine; -using UnityEngine.SceneManagement; namespace CameraControl { - public class CameraControl : Utils.MonoSingleton, ITick, ITickUI + /// + /// 控制游戏摄像机的移动、缩放和维度切换。 + /// 继承自 MonoSingleton 以确保场景中只有一个实例，并实现 ITick 接口以在游戏循环中更新。 + /// + public class CameraControl : Utils.MonoSingleton, ITick { - // Camera movement variables - [SerializeField] private float _zoomSpeed = 5f; - [SerializeField] private float _minZoom = 2f; - [SerializeField] private float _maxZoom = 20f; - [SerializeField] private float _focusLerpSpeed = 5f; + // 摄像机移动相关变量 + [SerializeField] private float _zoomSpeed = 5f; // 摄像机缩放速度 + [SerializeField] private float _minZoom = 2f; // 摄像机最小缩放级别（正交摄像机的 orthographicSize） + [SerializeField] private float _maxZoom = 20f; // 摄像机最大缩放级别 + [SerializeField] private float _focusLerpSpeed = 5f; // 摄像机跟随目标时的平滑插值速度 - private Vector3 _dragOrigin; - private bool _isDragging = false; + private Vector3 _dragOrigin; // 拖拽操作的起始世界坐标 + private bool _isDragging; // 标记摄像机是否正在被拖拽 - private Camera _camera; + private Camera _cachedCamera; // 缓存的场景摄像机引用 - private int dimensionId; - private string[] dimensionList; - - - private void OnDestroy() + /// + /// 获取当前生效的场景摄像机。懒加载并缓存。 + /// + public Camera CurrentCamera { - // 移除事件监听 - SceneManager.sceneLoaded -= OnSceneLoaded; + get + { + if (!_cachedCamera) + { + _cachedCamera = Camera.main; // 尝试获取主摄像机 + if (!_cachedCamera) // 如果主摄像机不存在或未标记，则尝试查找场景中的第一个摄像机 + { + Debug.LogWarning("[CameraControl] 未找到主摄像机，正在尝试查找场景中第一个Camera类型的对象。"); + _cachedCamera = FindFirstObjectByType(); + } + + if (!_cachedCamera) + { + Debug.LogError("[CameraControl] 场景中未找到可用的摄像机！摄像机控制功能将受限。"); + } + } + + return _cachedCamera; + } } + private int dimensionId; // 当前摄像机控制器关注的维度索引 + private string[] dimensionList; // 维度名称列表 + + /// + /// MonoSingleton 的 OnStart 方法，在单例首次创建并激活时调用，早于普通的 Start 方法。 + /// 用于初始化摄像机缓存。 + /// protected override void OnStart() { - // 注册场景加载事件。请注意，MonoSingleton中的OnStart通常由Awake调用。 - // 真正的Init调用已移至Start方法，以确保Program.Instance已完成其Awake阶段的初始化。 - SceneManager.sceneLoaded += OnSceneLoaded; + Program.Instance.OnFocusedDimensionChanged += Init; } - private void Start() + /// + /// 当脚本实例被销毁时调用。 + /// 用于取消订阅 Program.Instance 的事件，防止内存泄漏。 + /// + private void OnDestroy() { - // 在Start中调用Init，确保所有依赖的单例（如Program.Instance）已完成Awake阶段的初始化。 - Init(); - } - - private void OnSceneLoaded(Scene scene, LoadSceneMode mode) - { - // 场景加载完成后调用 Init 方法，重新获取相机引用并初始化维度状态。 - // 这确保了如果CameraControl是DontDestroyOnLoad，在切换场景后也能正确工作。 - Init(); + Program.Instance.OnFocusedDimensionChanged -= Init; } - private void Init() + /// + /// 根据指定的维度对象初始化摄像机控制器。 + /// 主要用于在聚焦维度改变时更新摄像机状态和内部的维度ID。 + /// + /// 当前聚焦的维度对象。 + private void Init(Dimension obj) { - // 确保相机引用有效 - if (_camera == null) - { - _camera = Camera.main; - if (_camera == null) - { - _camera = FindFirstObjectByType(); - } - } - - if (_camera == null) - { - Debug.LogError("No Camera found in the scene! CameraControl functionalities will be limited."); - return; // 如果没有相机，则无法进行后续初始化 - } - - // 初始化维度数据 (假设 Program.Instance 总是已初始化) - dimensionId = 0; // 默认从第一个维度开始 dimensionList = Program.Instance.Dimensions; - if (dimensionList != null && dimensionList.Length > 0) + + if (!CurrentCamera) // 如果摄像机仍未找到，记录错误并返回 { - SetCameraPositionForDimension(0); + Debug.LogError("[CameraControl] 未找到摄像机！摄像机控制功能将无法完全初始化。"); + return; + } + + // 处理 obj 为 null 的情况 - 此时 dimensionList 已更新 + if (!obj) + { + Debug.LogWarning("[CameraControl] Init方法在聚焦维度为空时调用。维度列表已更新，但摄像机状态未基于特定维度设置。"); + return; + } + + // 根据当前聚焦维度同步 CameraControl 内部的 dimensionId + int focusedIndex = System.Array.IndexOf(dimensionList, obj.name); + if (focusedIndex != -1) + { + dimensionId = focusedIndex; } else { - Debug.LogWarning("Dimension list is empty or null from Program.Instance. Cannot set initial camera position for dimensions."); + Debug.LogWarning($"[CameraControl] 聚焦维度 '{obj.name}' 未在维度列表中找到。回退到ID 0。"); + dimensionId = 0; // 找不到时，回退到第一个维度，避免数组越界 + } + + // 设置摄像机位置到当前聚焦维度的位置 + if (Program.Instance.FocusedDimension != null) + { + CurrentCamera.transform.position = Program.Instance.FocusedDimension.cameraPosition; + } + else + { + Debug.LogWarning("[CameraControl] 尝试设置摄像机位置时，聚焦维度为空。摄像机位置未明确根据维度更新。"); } } + /// + /// 调用带参数的 Init 方法，使用 Program.Instance 中当前聚焦的维度。 + /// + private void Init() + { + Init(Program.Instance.FocusedDimension); + } + + /// + /// 切换到下一个维度。 + /// 会保存当前摄像机位置到当前维度，然后加载下一个维度的摄像机位置。 + /// public void NextDimension() { - if (_camera == null) + if (!CurrentCamera) { - Debug.LogWarning("Camera reference is null, cannot switch dimensions."); - return; - } - if (dimensionList == null || dimensionList.Length == 0) - { - Debug.LogWarning("Dimension list is empty."); + Debug.LogWarning("[CameraControl] 摄像机引用为空，无法切换维度。"); return; } - // 1. 保存当前相机的真实位置到当前维度 (假设 Program.Instance 总是已初始化) - // 维度ID范围检查仍然保留，因为这是数组访问的安全保障 + if (dimensionList == null || dimensionList.Length == 0) + { + Debug.LogWarning("[CameraControl] 维度列表为空或未初始化，无法切换维度。"); + return; + } + + // 1. 保存当前摄像机的实际位置到当前维度 if (dimensionId >= 0 && dimensionId < dimensionList.Length) { - // Program.Instance 假设不会为 null var currentDimension = Program.Instance.GetDimension(dimensionList[dimensionId]); if (currentDimension != null) { - currentDimension.cameraPosition = _camera.transform.position; - // Debug.Log($"Saved camera position {currentDimension.cameraPosition} for dimension {dimensionList[dimensionId]} (ID: {dimensionId})"); + currentDimension.cameraPosition = CurrentCamera.transform.position; } else { - Debug.LogWarning($"Could not find dimension object for ID {dimensionId} ({dimensionList[dimensionId]}) to save camera position."); + Debug.LogWarning( + $"[CameraControl] 无法找到ID为 {dimensionId} ({dimensionList[dimensionId]}) 的维度对象，无法保存摄像机位置。"); } } else { - Debug.LogWarning($"Current dimensionId ({dimensionId}) is out of bounds for saving camera position (dimensionList length: {dimensionList.Length})."); + Debug.LogWarning( + $"[CameraControl] 当前维度ID ({dimensionId}) 超出范围，无法保存摄像机位置（维度列表长度: {dimensionList.Length}）。"); } - // 2. 更新 dimensionId，形成循环 + // 2. 更新 dimensionId, 形成循环切换 dimensionId = (dimensionId + 1) % dimensionList.Length; - // 3. 更新相机位置到新维度 - SetCameraPositionForDimension(dimensionId); + // 3. 更新聚焦维度，摄像机位置的更新将由事件触发的 Init 方法处理 + SetFocusedDimensionById(dimensionId); } - private void SetCameraPositionForDimension(int id) + /// + /// 设置 Program.Instance 中聚焦的维度。 + /// 摄像机位置的实际更新将通过 Program.Instance.OnFocusedDimensionChanged 事件在 Init(Dimension obj) 方法中处理。 + /// + /// 要设置的维度ID。 + private void SetFocusedDimensionById(int id) { - if (_camera == null) + if (!CurrentCamera) { - Debug.LogWarning("Camera reference is null, cannot set camera position."); + Debug.LogWarning("[CameraControl] 摄像机引用为空，无法设置摄像机位置。"); return; } + if (dimensionList == null || id < 0 || id >= dimensionList.Length) { - Debug.LogWarning($"Dimension ID {id} is out of bounds or dimension list is null/empty."); + Debug.LogWarning($"[CameraControl] 维度ID {id} 超出范围或维度列表为空，无法设置聚焦维度。"); return; } - // Program.Instance 假设不会为 null - // 确保获取到的 Dimension 对象不为 null - var dimension = Program.Instance.GetDimension(dimensionList[id]); - if (dimension) - { - Vector3 cameraPosition = dimension.cameraPosition; - _camera.transform.position = cameraPosition; - } - else - { - Debug.LogWarning($"Dimension object for ID {id} ({dimensionList[id]}) is null. Cannot set camera position."); - } + Program.Instance.SetFocusedDimension(dimensionList[id]); } + /// + /// 在游戏循环中每帧调用，用于处理摄像机跟随聚焦实体和维度切换。 + /// public void Tick() { - if (_camera == null) return; // 确保相机存在 + if (!CurrentCamera) return; // 确保相机存在 - // 假设 Program.Instance 总是已初始化 - if (Program.Instance.FocusedEntity) + // 当没有拖拽且存在聚焦实体时，摄像机跟随聚焦实体 + if (!_isDragging && Program.Instance.FocusedEntity) { var targetPosition = new Vector3( Program.Instance.FocusedEntity.Position.x, Program.Instance.FocusedEntity.Position.y, - _camera.transform.position.z); + CurrentCamera.transform.position.z); - // 使用 deltaTime 进行平滑的相机跟随 - _camera.transform.position = Vector3.Lerp( - _camera.transform.position, + // 使用 deltaTime 进行平滑的摄像机跟随 + CurrentCamera.transform.position = Vector3.Lerp( + CurrentCamera.transform.position, targetPosition, Time.deltaTime * _focusLerpSpeed); } - + HandleMiddleMouseDrag(); // 处理鼠标中键拖拽 + // HandleMouseZoom(); // 处理鼠标滚轮缩放 + // 按下 Tab 键时切换到下一个维度 if (Input.GetKeyDown(KeyCode.Tab)) { NextDimension(); } + } + - public void TickUI() - { - if (!_camera) // 确保相机存在 - return; - - HandleMiddleMouseDrag(); - // HandleMouseZoom(); - } - + /// + /// 设置摄像机的世界坐标位置。 + /// + /// 要设置的摄像机位置。 public void SetPosition(Vector3 position) { - if (_camera) - _camera.transform.position = position; + if (CurrentCamera) + { + CurrentCamera.transform.position = position; + } else - Debug.LogWarning("Camera reference is null, cannot set position."); + { + Debug.LogWarning("[CameraControl] 摄像机引用为空，无法设置位置。"); + } } + /// + /// 处理鼠标中键拖拽摄像机的逻辑。 + /// private void HandleMiddleMouseDrag() { - if (_camera == null) return; // 确保相机存在 + if (!CurrentCamera) return; // 确保相机存在 - // Start drag - if (Input.GetMouseButtonDown(2)) // Middle mouse button + // 开始拖拽：检测鼠标中键按下 + if (Input.GetMouseButtonDown(2)) // 鼠标中键 { - _dragOrigin = _camera.ScreenToWorldPoint(Input.mousePosition); + _dragOrigin = CurrentCamera.ScreenToWorldPoint(Input.mousePosition); _isDragging = true; - // 假设 Program.Instance 总是已初始化 + // 如果有聚焦实体，则在开始拖拽时取消聚焦，暂停跟随 if (Program.Instance.FocusedEntity) { - Program.Instance.FocusedEntity.PlayerControlled = false; Program.Instance.SetFocusedEntity(null); } } - // During drag + // 拖拽中：根据鼠标移动更新摄像机位置 if (Input.GetMouseButton(2) && _isDragging) { - var difference = _dragOrigin - _camera.ScreenToWorldPoint(Input.mousePosition); - _camera.transform.position += difference; + var difference = _dragOrigin - CurrentCamera.ScreenToWorldPoint(Input.mousePosition); + CurrentCamera.transform.position += difference; } - // End drag + // 结束拖拽：检测鼠标中键抬起 if (Input.GetMouseButtonUp(2)) { _isDragging = false; } } + /// + /// 处理鼠标滚轮缩放摄像机的逻辑。 + /// private void HandleMouseZoom() { - if (_camera == null) return; // 确保相机存在 + if (!CurrentCamera) return; // 确保相机存在 var scroll = Input.GetAxis("Mouse ScrollWheel"); - if (scroll == 0) return; - var newSize = _camera.orthographicSize - scroll * _zoomSpeed; - _camera.orthographicSize = Mathf.Clamp(newSize, _minZoom, _maxZoom); + if (scroll == 0) return; // 没有滚轮滚动，则返回 + + // 根据滚轮输入调整正交摄像机的尺寸，并限制在最小和最大缩放之间 + var newSize = CurrentCamera.orthographicSize - scroll * _zoomSpeed; + CurrentCamera.orthographicSize = Mathf.Clamp(newSize, _minZoom, _maxZoom); } } -} +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Configs/ConfigProcessor.cs b/Client/Assets/Scripts/Configs/ConfigProcessor.cs index 17747ff..f978ea3 100644 --- a/Client/Assets/Scripts/Configs/ConfigProcessor.cs +++ b/Client/Assets/Scripts/Configs/ConfigProcessor.cs @@ -3,152 +3,22 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Threading.Tasks; +// 未在提供代码段中使用，但保留以便与原始上下文保持一致 +// 未在提供代码段中使用，但保留以便与原始上下文保持一致 using System.Xml.Linq; +// 未在提供代码段中使用，但保留以便与原始上下文保持一致 using UnityEngine; -using Formatting = Newtonsoft.Json.Formatting; +using UnityEngine.Networking; + +// 未在提供代码段中使用，但保留以便与原始上下文保持一致 + +// 未在提供代码段中使用，但保留以便与原始上下文保持一致 namespace Configs { public static class ConfigProcessor { - // 保存文件的默认文件夹路径 - private const string FolderPath = "save"; - - /// - /// 初始化文件夹 - /// - static ConfigProcessor() - { - if (!Directory.Exists(FolderPath)) Directory.CreateDirectory(FolderPath); - } - - /// - /// 保存单个类为 JSON 文件 - /// - /// 要保存的类对象 - /// 可选的文件名（不包括扩展名） - public static bool SaveFile(T obj, string fileName = null) - { - try - { - // 如果未提供文件名，则使用类名作为文件名 - if (string.IsNullOrEmpty(fileName)) fileName = typeof(T).Name; - - // 构建完整的文件路径 - var filePath = Path.Combine(FolderPath, fileName + ".json"); - - // 将对象序列化为 JSON 字符串 - var jsonContent = JsonConvert.SerializeObject(obj, Formatting.Indented); - - // 写入文件 - File.WriteAllText(filePath, jsonContent); - - Debug.Log($"Saved file: {filePath}"); - - return true; - } - catch (Exception ex) - { - Debug.LogError($"Failed to save file: {ex.Message}"); - return false; - } - } - - /// - /// 从 JSON 文件读取单个类 - /// - /// 文件名（不包括扩展名） - public static T LoadFile(string fileName) - { - try - { - // 构建完整的文件路径 - var filePath = Path.Combine(FolderPath, fileName + ".json"); - - // 检查文件是否存在 - if (!File.Exists(filePath)) - { - Debug.LogError($"File not found: {filePath}"); - return default; - } - - // 读取文件内容 - var jsonContent = File.ReadAllText(filePath); - - // 反序列化为指定类型的对象 - var obj = JsonConvert.DeserializeObject(jsonContent); - - Debug.Log($"Loaded file: {filePath}"); - return obj; - } - catch (Exception ex) - { - Debug.LogError($"Failed to load file: {ex.Message}"); - return default; - } - } - - /// - /// 打包多个类并保存为一个存档文件 - /// - /// 存档文件名（不包括扩展名） - /// 要保存的类对象字典 - public static bool SaveArchive(string archiveName, Dictionary objects) - { - try - { - // 构建完整的文件路径 - var filePath = Path.Combine(FolderPath, archiveName + ".archive.json"); - - // 将字典中的对象序列化为 JSON - var jsonContent = JsonConvert.SerializeObject(objects, Formatting.Indented); - - // 写入文件 - File.WriteAllText(filePath, jsonContent); - - Debug.Log($"Saved archive: {filePath}"); - return true; - } - catch (Exception ex) - { - Debug.LogError($"Failed to save archive: {ex.Message}"); - return false; - } - } - - /// - /// 从存档文件中读取多个类 - /// - /// 存档文件名（不包括扩展名） - public static Dictionary LoadArchive(string archiveName) - { - try - { - // 构建完整的文件路径 - var filePath = Path.Combine(FolderPath, archiveName + ".archive.json"); - - // 检查文件是否存在 - if (!File.Exists(filePath)) - { - Debug.LogError($"Archive not found: {filePath}"); - return null; - } - - // 读取文件内容 - var jsonContent = File.ReadAllText(filePath); - - // 反序列化为字典 - var objects = JsonConvert.DeserializeObject>(jsonContent); - - Debug.Log($"Loaded archive: {filePath}"); - return objects; - } - catch (Exception ex) - { - Debug.LogError($"Failed to load archive: {ex.Message}"); - return null; - } - } /// /// 获取指定路径下的所有xml文件 @@ -161,29 +31,25 @@ namespace Configs foreach (var path in paths) { - try { // 检查目录是否存在 if (!Directory.Exists(path)) { + // **逻辑修改 1.1**: 将静默跳过改为记录警告，提供更友好的提示。 + Debug.LogWarning($"警告: 指定路径不存在或无法访问 - {path}"); continue; } - // 获取目录下的所有子文件夹 - var subDirectories = Directory.GetDirectories(path); - - // 遍历并收集每个子文件夹中的 XML 文件 - foreach (var dir in subDirectories) - { - var xmlFiles = Directory.GetFiles(dir, "*.xml", SearchOption.AllDirectories); - xmlFilePaths.AddRange(xmlFiles); - } - + // **逻辑修改 1.2**: 原始逻辑仅遍历子文件夹，导致根路径下的XML文件被忽略。 + // 现修改为直接获取当前路径及其所有子目录中的 XML 文件。 + var xmlFiles = Directory.GetFiles(path, "*.xml", SearchOption.AllDirectories); + xmlFilePaths.AddRange(xmlFiles); } catch (Exception ex) { - Debug.LogError($"加载文件时发生错误: {ex.Message}"); + // 优化错误信息，明确是哪个路径出现问题 + Debug.LogError($"获取路径 '{path}' 下的XML文件时发生错误: {ex.Message}"); } } @@ -300,20 +166,19 @@ namespace Configs } // 检查文件是否存在 - if (!System.IO.File.Exists(filePath)) + if (!File.Exists(filePath)) { Debug.LogError($"文件不存在: {filePath}"); return null; } - byte[] bytes = null; + byte[] bytes; try { // 使用 using 自动管理 FileStream 的生命周期 using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read)) { - fs.Seek(0, SeekOrigin.Begin); // 将游标移动到文件开头（可选） bytes = new byte[fs.Length]; // 创建一个字节数组来存储文件内容 fs.Read(bytes, 0, bytes.Length); // 读取文件内容到字节数组 } @@ -383,11 +248,93 @@ namespace Configs } catch (UnauthorizedAccessException ex) { - // 可选：记录日志或忽略无权限目录 - Console.WriteLine($"访问被拒绝: {ex.Message}"); + // **逻辑修改 3**: 在 Unity 环境中，应使用 Debug.LogError 而非 Console.WriteLine 记录错误。 + Debug.LogError($"访问目录 '{directoryPath}' 被拒绝: {ex.Message}"); } return result; } + /// + /// 根据文件路径推断音频类型。 + /// + /// 音频文件的完整路径。 + /// 推断出的 AudioType，如果无法推断则返回 AudioType.UNKNOWN。 + private static AudioType GetAudioTypeFromFilePath(string filePath) + { + string ext = Path.GetExtension(filePath)?.ToLower(); // 获取扩展名并转小写 + switch (ext) + { + case ".wav": return AudioType.WAV; + case ".mp3": return AudioType.MPEG; + case ".ogg": return AudioType.OGGVORBIS; + case ".aiff": return AudioType.AIFF; + // 可以根据需要添加更多常见的音频类型 + default: + Debug.LogWarning($"警告: 未知音频文件类型 '{ext}' for file '{filePath}'. 尝试使用 AudioType.UNKNOWN."); + return AudioType.UNKNOWN; // 让Unity尝试自动检测，但成功率可能不如指定类型高 + } + } + /// + /// 从外部指定文件中异步加载音频。 + /// 注意：此方法是异步的，需要使用 await 调用。在Unity主线程中调用以避免潜在的线程问题。 + /// + /// 音频文件的完整路径。 + /// Task，其结果为加载成功的 AudioClip 对象，或加载失败时返回 null。 + public static async Task LoadAudioByIO(string filePath) + { + if (string.IsNullOrEmpty(filePath)) + { + Debug.LogError("音频文件路径为空，请检查输入！"); + return null; + } + + if (!File.Exists(filePath)) + { + Debug.LogError($"音频文件不存在: {filePath}"); + return null; + } + + // UnityWebRequest需要使用file://协议来访问本地文件 + string uri = "file://" + Path.GetFullPath(filePath); + // 根据文件扩展名推断音频类型 + AudioType audioType = GetAudioTypeFromFilePath(filePath); + + using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(uri, audioType)) + { + try + { + // 发送请求并等待完成 + // await www.SendWebRequest(); 是核心，它会异步执行网络请求。 + // 如果在Unity Editor中遇到“You are trying to load data from a www stream that had a non-OK status”等错误， + // 可以检查文件路径和文件权限。 + await www.SendWebRequest(); + + // 检查请求结果 + // www.isNetworkError 或 www.isHttpError 在较新的Unity版本中已弃用， + // 推荐使用 www.result。 + if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError) + { + Debug.LogError($"加载音频文件 '{filePath}' 失败: {www.error}"); + return null; + } + else + { + // 获取下载的AudioClip + AudioClip clip = DownloadHandlerAudioClip.GetContent(www); + if (clip == null) + { + Debug.LogError($"未能从文件 '{filePath}' 获取 AudioClip 内容，请检查文件是否损坏或格式是否支持 ({audioType} 类型)."); + } + return clip; + } + } + catch (Exception e) + { + Debug.LogError($"处理音频文件 '{filePath}' 时发生异常: {e.Message}"); + return null; + } + } + } + } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/Data/AttributesDef.cs b/Client/Assets/Scripts/Data/AttributesDef.cs index e5524b6..694728e 100644 --- a/Client/Assets/Scripts/Data/AttributesDef.cs +++ b/Client/Assets/Scripts/Data/AttributesDef.cs @@ -8,8 +8,8 @@ namespace Data public float moveSpeed = 1; public int attack = 1; public int defense = 0; - public int attackSpeed = 2; - public int attackRange = 3; + public float attackSpeed = 2; + public float attackRange = 3; public int attackTargetCount = 1; } } \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/AttributesOffsetDef.cs b/Client/Assets/Scripts/Data/AttributesOffsetDef.cs new file mode 100644 index 0000000..e60108f --- /dev/null +++ b/Client/Assets/Scripts/Data/AttributesOffsetDef.cs @@ -0,0 +1,65 @@ +using Entity; + +namespace Data +{ + public class AttributesOffsetDef : Define + { + // ====================================================================== + // 绝对值偏移 (Added/Subtracted directly) + // ====================================================================== + public float healthOffset = 0f; + public float moveSpeedOffset = 0f; + public float attackOffset = 0f; + public float defenseOffset = 0f; + public float attackSpeedOffset = 0f; + public float attackRangeOffset = 0f; + + public float attackTargetCountOffset = 0f; + + // ====================================================================== + // 百分比偏移 (Multiplied as a factor, e.g., 0.1 for +10%) + // ====================================================================== + public float healthPercentOffset = 0f; // 例如 0.1 表示 +10% + public float moveSpeedPercentOffset = 0f; + public float attackPercentOffset = 0f; + public float defensePercentOffset = 0f; + public float attackSpeedPercentOffset = 0f; + public float attackRangePercentOffset = 0f; + + public float attackTargetCountPercentOffset = 0f; + + /// + /// 重载 + 操作符，用于合并两个 AttributesOffsetDef 实例。 + /// + /// 第一个属性修正定义。 + /// 第二个属性修正定义。 + /// 一个新的 AttributesOffsetDef 实例，包含两个输入的累加值。 + public static AttributesOffsetDef operator +(AttributesOffsetDef a, AttributesOffsetDef b) + { + // 处理 null 情况，如果其中一个为 null，则返回另一个的副本（或一个空实例如果两者都为 null）。 + if (a == null && b == null) return new AttributesOffsetDef(); + if (a == null) return b; // 如果 a 是 null，返回 b 的值 + if (b == null) return a; // 如果 b 是 null，返回 a 的值 + var combined = new AttributesOffsetDef + { + // 绝对值偏移累加 + healthOffset = a.healthOffset + b.healthOffset, + moveSpeedOffset = a.moveSpeedOffset + b.moveSpeedOffset, + attackOffset = a.attackOffset + b.attackOffset, + defenseOffset = a.defenseOffset + b.defenseOffset, + attackSpeedOffset = a.attackSpeedOffset + b.attackSpeedOffset, + attackRangeOffset = a.attackRangeOffset + b.attackRangeOffset, + attackTargetCountOffset = a.attackTargetCountOffset + b.attackTargetCountOffset, + // 百分比偏移累加 + healthPercentOffset = a.healthPercentOffset + b.healthPercentOffset, + moveSpeedPercentOffset = a.moveSpeedPercentOffset + b.moveSpeedPercentOffset, + attackPercentOffset = a.attackPercentOffset + b.attackPercentOffset, + defensePercentOffset = a.defensePercentOffset + b.defensePercentOffset, + attackSpeedPercentOffset = a.attackSpeedPercentOffset + b.attackSpeedPercentOffset, + attackRangePercentOffset = a.attackRangePercentOffset + b.attackRangePercentOffset, + attackTargetCountPercentOffset = a.attackTargetCountPercentOffset + b.attackTargetCountPercentOffset + }; + return combined; + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/AttributesOffsetDef.cs.meta b/Client/Assets/Scripts/Data/AttributesOffsetDef.cs.meta new file mode 100644 index 0000000..41c2a9a --- /dev/null +++ b/Client/Assets/Scripts/Data/AttributesOffsetDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fb6190c213d44e04946784c3a5063e83 +timeCreated: 1756302637 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/AudioDef.cs b/Client/Assets/Scripts/Data/AudioDef.cs new file mode 100644 index 0000000..35d5460 --- /dev/null +++ b/Client/Assets/Scripts/Data/AudioDef.cs @@ -0,0 +1,7 @@ +namespace Data +{ + public class AudioDef:Define + { + public string path; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/AudioDef.cs.meta b/Client/Assets/Scripts/Data/AudioDef.cs.meta new file mode 100644 index 0000000..e63dd23 --- /dev/null +++ b/Client/Assets/Scripts/Data/AudioDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea58fdcb622943429532fd1b9d264340 +timeCreated: 1756397633 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/DefinePack.cs b/Client/Assets/Scripts/Data/DefinePack.cs index 6444a57..c425e02 100644 --- a/Client/Assets/Scripts/Data/DefinePack.cs +++ b/Client/Assets/Scripts/Data/DefinePack.cs @@ -149,6 +149,8 @@ namespace Data public string packID; public string packRootPath; + public int priority = -1; + public string Name { get diff --git a/Client/Assets/Scripts/Data/DrawingOrderDef.cs b/Client/Assets/Scripts/Data/DrawingOrderDef.cs index 4b54e11..3eb45c1 100644 --- a/Client/Assets/Scripts/Data/DrawingOrderDef.cs +++ b/Client/Assets/Scripts/Data/DrawingOrderDef.cs @@ -231,7 +231,7 @@ namespace Data public List nodes = new(); public string nodeName; public Vector2 position = new(0, 0); - public float FPS = 0.5f; + public float FPS = 1f; public override bool Init(XElement xmlDef) { diff --git a/Client/Assets/Scripts/Data/EntityDef.cs b/Client/Assets/Scripts/Data/EntityDef.cs index 347d092..438e2b7 100644 --- a/Client/Assets/Scripts/Data/EntityDef.cs +++ b/Client/Assets/Scripts/Data/EntityDef.cs @@ -7,8 +7,9 @@ namespace Data public BehaviorTreeDef behaviorTree; public AffiliationDef affiliation; - - + + public DrawNodeDef deathAnimation; + public EventDef[] deathEffects; } diff --git a/Client/Assets/Scripts/Data/EventDef.cs b/Client/Assets/Scripts/Data/EventDef.cs index ed1d4b4..597e96d 100644 --- a/Client/Assets/Scripts/Data/EventDef.cs +++ b/Client/Assets/Scripts/Data/EventDef.cs @@ -1,21 +1,8 @@ namespace Data { - public enum EventType - { - None, - SpawnCharacter, - SpawnBuilding, - SpawnBullet, - SpawnPickup, - SpawnDefaultEntity, - } public class EventDef : Define { - public EventType eventType = EventType.None; - public EntityDef entityDef_Character; // 用于 EventType.SpawnCharacter - public BuildingDef entityDef_Building; // 用于 EventType.SpawnBuilding - public BulletDef entityDef_Bullet; // 用于 EventType.SpawnBullet - public ItemDef entityDef_Pickup; // 用于 EventType.SpawnPickup - public EventDef() { } + public string workClass; + public string value; } } \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffCompDef.cs b/Client/Assets/Scripts/Data/HediffCompDef.cs new file mode 100644 index 0000000..66b187b --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffCompDef.cs @@ -0,0 +1,17 @@ +using System; +using System.Xml.Linq; + +namespace Data +{ + public class HediffCompDef:Define + { + public Type compClass; + public override bool Init(XElement xmlDef) + { + base.Init(xmlDef); + var name = xmlDef.Attribute("class")?.Value??""; + compClass=Type.GetType(name); + return true; + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffCompDef.cs.meta b/Client/Assets/Scripts/Data/HediffCompDef.cs.meta new file mode 100644 index 0000000..56664f5 --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffCompDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 92779af4b74648a99930c10376760af6 +timeCreated: 1756303386 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffDef.cs b/Client/Assets/Scripts/Data/HediffDef.cs new file mode 100644 index 0000000..6b966e8 --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffDef.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace Data +{ + public class HediffDef:Define + { + public float time = -1; + // Hediff的发展阶段列表 + public List stages = new List(); + // 附加的组件列表 + public List comps = new List(); + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffDef.cs.meta b/Client/Assets/Scripts/Data/HediffDef.cs.meta new file mode 100644 index 0000000..9c662c1 --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a4311115be2f4da8a5a27e1bb298928e +timeCreated: 1756303757 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffStageDef.cs b/Client/Assets/Scripts/Data/HediffStageDef.cs new file mode 100644 index 0000000..c15d4ba --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffStageDef.cs @@ -0,0 +1,8 @@ +namespace Data +{ + public class HediffStageDef:Define + { + public float start; + public AttributesOffsetDef attributesOffset = new(); + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/HediffStageDef.cs.meta b/Client/Assets/Scripts/Data/HediffStageDef.cs.meta new file mode 100644 index 0000000..728e8f6 --- /dev/null +++ b/Client/Assets/Scripts/Data/HediffStageDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 59d3b562e68e40fdaa65e5e6431c58e0 +timeCreated: 1756304101 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/ImageDef.cs b/Client/Assets/Scripts/Data/ImageDef.cs index 72ab58c..70cc7b2 100644 --- a/Client/Assets/Scripts/Data/ImageDef.cs +++ b/Client/Assets/Scripts/Data/ImageDef.cs @@ -4,7 +4,6 @@ namespace Data { public class ImageDef : Define { - public string name; public string path; public int wCount; public int hCount; @@ -13,7 +12,6 @@ namespace Data public override bool Init(XElement xmlDef) { base.Init(xmlDef); - name = defName; return false; } } diff --git a/Client/Assets/Scripts/Data/MessageDef.cs b/Client/Assets/Scripts/Data/MessageDef.cs new file mode 100644 index 0000000..0807518 --- /dev/null +++ b/Client/Assets/Scripts/Data/MessageDef.cs @@ -0,0 +1,47 @@ +namespace Data +{ + /// + /// 定义提示文本在游戏或应用中显示方式的类别。 + /// Defines categories for how prompt text is displayed in a game or application. + /// + public enum PromptDisplayCategory + { + /// + /// 默认或未分类的显示方式。 + /// Default or uncategorized display method. + /// + Default = 0, + + /// + /// 显示在玩家当前焦点实体（例如NPC或交互物）上方，以聊天气泡的形式呈现。 + /// Displayed as a chat bubble above the player's currently focused entity (e.g., NPC, interactive object). + /// + FocusedEntityChatBubble, + + /// + /// 显示在玩家当前焦点实体（例如NPC或交互物）的头顶，通常是简短的状态、名称或互动提示。 + /// Displayed as text above the player's currently focused entity (e.g., NPC, interactive object), typically for short status, names, or interaction prompts. + /// + FocusedEntityOverheadText, + + /// + /// 大型文本显示在屏幕中央，通常用于重要通知、标题或剧情提示，需要玩家立即注意。 + /// Large text displayed in the center of the screen, typically for important announcements, titles, or narrative prompts that demand immediate player attention. + /// + ScreenCenterLargeText, + + /// + /// 非焦点提示，通常以不易干扰的方式（如屏幕边缘、HUD小字或右下角浮动）显示，提供辅助信息、次要指引或环境提示。 + /// Non-focused hint, typically displayed in a non-intrusive way (e.g., screen corner, small HUD text, or bottom-right floating message) to provide auxiliary information, minor guidance, or environmental cues. + /// + PassiveHint, + + } + + public class MessageDef : Define + { + public PromptDisplayCategory type; + public string text; + public string color; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/MessageDef.cs.meta b/Client/Assets/Scripts/Data/MessageDef.cs.meta new file mode 100644 index 0000000..5bd3a04 --- /dev/null +++ b/Client/Assets/Scripts/Data/MessageDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8df8531d3d53412e8c299262aeea6f57 +timeCreated: 1756860490 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/SkillTreeDef.cs b/Client/Assets/Scripts/Data/SkillTreeDef.cs new file mode 100644 index 0000000..6f29de9 --- /dev/null +++ b/Client/Assets/Scripts/Data/SkillTreeDef.cs @@ -0,0 +1,11 @@ +namespace Data +{ + public class SkillTreeDef:Define + { + public string tag="Default"; + public AffiliationDef faction; + public SkillTreeDef[] prerequisites; + public WeaponDef[] unlockedWeapons; + public HediffDef[] unlockedHediffs; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/SkillTreeDef.cs.meta b/Client/Assets/Scripts/Data/SkillTreeDef.cs.meta new file mode 100644 index 0000000..0075e6f --- /dev/null +++ b/Client/Assets/Scripts/Data/SkillTreeDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 08ca1b39c5b342ceb23bd565d433ac66 +timeCreated: 1756705012 \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/StoryDef.cs b/Client/Assets/Scripts/Data/StoryDef.cs new file mode 100644 index 0000000..62a7ce6 --- /dev/null +++ b/Client/Assets/Scripts/Data/StoryDef.cs @@ -0,0 +1,14 @@ +namespace Data +{ + public class StoryStageDef : Define + { + public float lastWaitTime = 0; + public float nextWaitTime = 0; + public EventDef eventDef; + public MessageDef messageDef; + } + public class StoryDef:Define + { + public StoryStageDef[] storyStage; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/StoryDef.cs.meta b/Client/Assets/Scripts/Data/StoryDef.cs.meta new file mode 100644 index 0000000..6923dcd --- /dev/null +++ b/Client/Assets/Scripts/Data/StoryDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e11d701b7d8b4af0a947d630884bfeab +timeCreated: 1756306428 \ No newline at end of file diff --git a/Client/Assets/Scripts/Entity/Attributes.cs b/Client/Assets/Scripts/Entity/Attributes.cs index cf88bb7..c6510e9 100644 --- a/Client/Assets/Scripts/Entity/Attributes.cs +++ b/Client/Assets/Scripts/Entity/Attributes.cs @@ -1,3 +1,4 @@ +using System; using Data; namespace Entity @@ -8,9 +9,10 @@ namespace Entity public float moveSpeed = 1; public int attack = 1; public int defense = 0; - public int attackSpeed = 2; - public int attackRange = 3; + public float attackSpeed = 2; + public float attackRange = 3; public int attackTargetCount = 1; + public Attributes(AttributesDef def) { health = def.health; @@ -21,7 +23,108 @@ namespace Entity attackRange = def.attackRange; attackTargetCount = def.attackTargetCount; } + + public Attributes(Attributes other) + { + health = other.health; + moveSpeed = other.moveSpeed; + attack = other.attack; + defense = other.defense; + attackSpeed = other.attackSpeed; + attackRange = other.attackRange; + attackTargetCount = other.attackTargetCount; + } + public Attributes() - { } + { + } + + /// + /// 根据给定的属性偏移，生成一个新的 Attributes 实例。 + /// 原有的 Attributes 实例保持不变。 + /// + /// 要应用的属性偏移定义。 + /// 一个新的 Attributes 实例，包含了应用偏移后的值。 + public Attributes GetModifiedAttributes(AttributesOffsetDef offset) + { + // 1. 创建当前 Attributes 实例的一个副本 + var newAttributes = new Attributes(this); + + if (offset == null) + { + return newAttributes; // 如果没有偏移，直接返回副本 + } + + // 2. 在副本上应用绝对值偏移 + newAttributes.health += (int)offset.healthOffset; + newAttributes.moveSpeed += offset.moveSpeedOffset; + newAttributes.attack += (int)offset.attackOffset; + newAttributes.defense += (int)offset.defenseOffset; + + // 修正: attackSpeed 和 attackRange 是 float，不应强制转换为 int + newAttributes.attackSpeed += offset.attackSpeedOffset; + newAttributes.attackRange += offset.attackRangeOffset; + + newAttributes.attackTargetCount += (int)offset.attackTargetCountOffset; + + // 3. 在副本上应用百分比偏移 (基于应用绝对值偏移后的结果) + newAttributes.health = (int)(newAttributes.health * (1 + offset.healthPercentOffset)); + newAttributes.moveSpeed *= (1 + offset.moveSpeedPercentOffset); + newAttributes.attack = (int)(newAttributes.attack * (1 + offset.attackPercentOffset)); + newAttributes.defense = (int)(newAttributes.defense * (1 + offset.defensePercentOffset)); + + // 修正: attackSpeed 和 attackRange 是 float，不应强制转换为 int + newAttributes.attackSpeed *= (1 + offset.attackSpeedPercentOffset); + newAttributes.attackRange *= (1 + offset.attackRangePercentOffset); + + newAttributes.attackTargetCount = + (int)(newAttributes.attackTargetCount * (1 + offset.attackTargetCountPercentOffset)); + + // 4. 确保属性不低于最小值 + newAttributes.health = Math.Max(0, newAttributes.health); + newAttributes.moveSpeed = Math.Max(0f, newAttributes.moveSpeed); + newAttributes.attack = Math.Max(0, newAttributes.attack); + newAttributes.defense = Math.Max(0, newAttributes.defense); + + // 修正: Math.Max 期望相同类型，0f 对于 float 类型更准确 + newAttributes.attackSpeed = Math.Max(0f, newAttributes.attackSpeed); + newAttributes.attackRange = Math.Max(0f, newAttributes.attackRange); + + newAttributes.attackTargetCount = Math.Max(1, newAttributes.attackTargetCount); + + // 5. 返回修改后的新 Attributes 实例 + return newAttributes; + } + + /// + /// 合并两个 Attributes 实例，生成一个新的 Attributes 实例， + /// 其中每个属性值都取自传入两个实例中对应属性的最小值。 + /// 这对于应用属性上限或限制非常有用。 + /// + /// 第一个 Attributes 实例。 + /// 第二个 Attributes 实例。 + /// 一个新的 Attributes 实例，其属性是输入实例中对应属性的最小值。 + public static Attributes Min(Attributes a, Attributes b) + { + // 处理 null 情况 + if (a == null && b == null) return new Attributes(); // 两者都为null，返回默认空属性 + if (a == null) return new Attributes(b); // a为null，返回b的副本 + if (b == null) return new Attributes(a); // b为null，返回a的副本 + + // 创建一个新的 Attributes 实例来存储结果 + var result = new Attributes + { + health = Math.Min(a.health, b.health), + moveSpeed = Math.Min(a.moveSpeed, b.moveSpeed), + attack = Math.Min(a.attack, b.attack), + defense = Math.Min(a.defense, b.defense), + attackSpeed = Math.Min(a.attackSpeed, b.attackSpeed), + attackRange = Math.Min(a.attackRange, b.attackRange), + attackTargetCount = Math.Min(a.attackTargetCount, b.attackTargetCount) + }; + + return result; + } + } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/Entity/Character.cs b/Client/Assets/Scripts/Entity/Character.cs index 7987031..ca480a7 100644 --- a/Client/Assets/Scripts/Entity/Character.cs +++ b/Client/Assets/Scripts/Entity/Character.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Entity { - public class Character : Entity + public class Character : LivingEntity { private int _currentSelected; // 私有字段用于存储实际值 @@ -21,6 +21,7 @@ namespace Entity var maxIndex = Inventory != null && Inventory.Capacity > 0 ? Inventory.Capacity - 1 : 0; var clampedValue = Mathf.Clamp(value, 0, maxIndex); _currentSelected = clampedValue; + InitWeaponAnimator(); } } @@ -64,29 +65,6 @@ namespace Entity return remainingQuantity; } - // public override void TryAttack() - // { - // if (IsAttacking) - // return; - // if (!DefineManager.Instance.defines.TryGetValue(nameof(BulletDef), out var def)) - // return; - // // 修正：First() 可能会在一个空的 Values 集合上抛出异常。 - // // 更好的做法是使用 TryGetValue 或 FirstOrDefault 并检查结果。 - // // 这里假设至少有一个 BulletDef 存在，如果不是，需要更复杂的错误处理。 - // var bulletDefEntry = def.Values.FirstOrDefault(); - // if (bulletDefEntry == null) - // { - // Debug.LogError("No BulletDef found in DefineManager. Cannot attack."); - // return; - // } - // - // var bulletDef = (BulletDef)bulletDefEntry; - // - // Vector3 dir = MousePosition.GetWorldPosition(); - // EntityManage.Instance.GenerateBulletEntity(Program.Instance.FocusedDimensionId, bulletDef, Position, - // dir - Position, this); - // } - public override WeaponResource GetCurrentWeapon() { var currentSelectItem = Inventory.GetSlot(CurrentSelected); diff --git a/Client/Assets/Scripts/Entity/Entity.cs b/Client/Assets/Scripts/Entity/Entity.cs index 716eb7b..595c09b 100644 --- a/Client/Assets/Scripts/Entity/Entity.cs +++ b/Client/Assets/Scripts/Entity/Entity.cs @@ -32,6 +32,12 @@ namespace Entity public EntityPrefab entityPrefab; public EntityDef entityDef; + /// + /// 手上拿着显示的贴图 + /// + public GameObject weaponAnimator; + + public ITick[] weaponAnimatorNodeList; /// /// 人工智能行为树，定义实体的行为逻辑。 @@ -46,7 +52,13 @@ namespace Entity /// /// 实体的属性定义，包括生命值、攻击力、防御力等。 /// - public Attributes attributes = new(); + public virtual Attributes attributes { get; protected set; } + + private Attributes _baseAttributes; + public virtual Attributes baseAttributes + { + get { return _baseAttributes ??= new Attributes(entityDef.attributes); } + } /// /// 实体当前的移动方向。 @@ -164,7 +176,6 @@ namespace Entity private Coroutine _attackCoroutine; - [SerializeField] private float _hitBarUIShowTime = 5; private float _hitBarUIShowTimer = 0; private int _walkingTimer = 0; @@ -183,13 +194,34 @@ namespace Entity this.entityDef = entityDef; HideHealthBar(); + InitWeaponAnimator(); + } + + protected virtual void InitWeaponAnimator() + { + if (!weaponAnimator) + return; + for (var i = 0; i < weaponAnimator.transform.childCount; i++) + { + Destroy(weaponAnimator.transform.GetChild(i).gameObject); + weaponAnimatorNodeList = null; + } + var weapon = GetCurrentWeapon(); + if (weapon == null) + { + weaponAnimator.SetActive(false); + return; + } + + var weaponAnimation = weapon.InstantiateAttackAnimation(weaponAnimator.transform); + weaponAnimatorNodeList = weaponAnimation.animationComponents; } /// /// 初始化实体的身体部分，包括不同朝向下的绘图节点。 /// /// 绘制顺序定义。 - public virtual void InitBody(DrawingOrderDef drawingOrder) + protected virtual void InitBody(DrawingOrderDef drawingOrder) { // 预缓存枚举值（避免每次循环重复调用 Enum.GetValues） var states = Enum.GetValues(typeof(EntityState)).Cast().ToArray(); @@ -295,7 +327,7 @@ namespace Entity /// 绘图节点定义。 /// 父节点对象。 /// 创建的GameObject，如果失败则返回null - public virtual GameObject InitBodyPart(DrawNodeDef drawNode, GameObject parent) + protected virtual GameObject InitBodyPart(DrawNodeDef drawNode, GameObject parent) { try { @@ -434,7 +466,7 @@ namespace Entity /// /// 更新实体的逻辑，包括玩家控制和自动行为。 /// - public void Tick() + public virtual void Tick() { if (_walkingTimer > 0) { @@ -470,6 +502,13 @@ namespace Entity } } + if (weaponAnimatorNodeList != null) + { + foreach (var tick in weaponAnimatorNodeList) + { + tick.Tick(); + } + } if (IsShowingHealthBarUI) { _hitBarUIShowTimer -= Time.deltaTime; @@ -488,14 +527,12 @@ namespace Entity if (IsAttacking || IsDead) return; // 死亡时无法攻击 // 尝试获取当前武器 - WeaponResource currentWeapon = GetCurrentWeapon(); + var currentWeapon = GetCurrentWeapon(); // 如果没有武器，可以选择进行徒手攻击或者直接返回 // 暂时设定为：如果没有武器，则不进行攻击 if (currentWeapon == null) { - // 可以在这里添加一个默认的徒手攻击逻辑，或者播放一个“不能攻击”的提示 - Debug.Log($"{name} 没有装备武器，无法攻击。"); return; } @@ -744,7 +781,7 @@ namespace Entity } // STEP 4: 等待到攻击判定时间 - float elapsedTime = 0f; + var elapsedTime = 0f; while (elapsedTime < weapon.AttackDetectionTime) { if (IsDead) @@ -766,7 +803,7 @@ namespace Entity ExecuteWeaponAction(weapon); - float remainingAnimationTime = weapon.AttackAnimationTime - elapsedTime; + var remainingAnimationTime = weapon.AttackAnimationTime - elapsedTime; if (remainingAnimationTime > 0) { yield return new WaitForSeconds(remainingAnimationTime); @@ -851,10 +888,10 @@ namespace Entity // 获取子弹方向。这里使用实体当前的移动方向作为子弹发射方向 // 更复杂的逻辑可能根据鼠标位置、目标位置等确定 - Vector3 bulletDirection = direction; // 实体当前的朝向 + var bulletDirection = direction; // 实体当前的朝向 if (PlayerControlled && Input.GetMouseButton(0)) // 玩家控制时，如果鼠标按下，尝试朝鼠标方向发射 { - Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + var mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition); mouseWorldPos.z = transform.position.z; // 保持Z轴一致 bulletDirection = (mouseWorldPos - transform.position).normalized; } diff --git a/Client/Assets/Scripts/Entity/Hediff.cs b/Client/Assets/Scripts/Entity/Hediff.cs new file mode 100644 index 0000000..a97edc1 --- /dev/null +++ b/Client/Assets/Scripts/Entity/Hediff.cs @@ -0,0 +1,276 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Data; +using UnityEngine; + +namespace Entity +{ + /// + /// 定义一个接口，用于提供属性偏移量。 + /// 任何实现此接口的组件都可以贡献实体的属性修正。 + /// + public interface IAttributesOffsetProvider + { + /// + /// 获取此提供者当前的属性偏移量定义。 + /// + /// 此提供者所带来的属性偏移量。 + AttributesOffsetDef GetAttributesOffset(); + } + + /// + /// 表示一个实体上运行时存在的健康状态（Hediff）。 + /// Hediff 可以是疾病、增益、减益、伤口等，它们会影响实体的属性、行为或状态。 + /// + public class Hediff + { + /// + /// 此 Hediff 的定义数据。 + /// + public HediffDef def { get; private set; } + /// + /// 此 Hediff 附加到的活体实体。 + /// + public LivingEntity parent { get; internal set; } + + /// + /// 此 Hediff 存在的当前年龄（以秒为单位）。 + /// + public float Age { get; private set; } = 0f; + /// + /// 当前激活的 Hediff 阶段的索引。 + /// + private int _currentStageIndex = -1; + + /// + /// 附加到此 Hediff 上的所有组件列表。 + /// + public List Comps { get; private set; } = new List(); + + /// + /// 标志，指示此 Hediff 是否应该被父实体移除。 + /// + public bool ShouldRemove { get; private set; } = false; + + /// + /// 内部缓存，用于存储计算出的总属性偏移量。 + /// + private AttributesOffsetDef _cachedTotalAttributesOffset; + /// + /// 标志，指示 Hediff 的属性偏移量是否需要重新计算。 + /// + private bool _attribsDirty = true; + + /// + /// 构造函数，创建一个新的运行时 Hediff 实例。 + /// + /// 此 Hediff 的定义。 + /// 如果传入的定义为空。 + public Hediff(HediffDef definition) + { + if (definition == null) + { + throw new ArgumentNullException(nameof(definition), "Hediff 定义不能为空。"); + } + + this.def = definition; + this._attribsDirty = true; // 构造时标记需要计算属性 + + // 确保阶段列表按开始时间排序，以便正确判断当前阶段。 + if (this.def.stages == null) this.def.stages = new List(); + this.def.stages = this.def.stages.OrderBy(s => s.start).ToList(); + + // 实例化所有定义的组件。 + if (def.comps != null) + { + foreach (var compDef in def.comps) + { + if (compDef.compClass != null && typeof(HediffComp).IsAssignableFrom(compDef.compClass)) + { + try + { + // 使用 Activator.CreateInstance 动态创建组件实例，并传入构造函数参数。 + // HediffComp 的构造函数需要接受 Hediff parentHediff 和 HediffCompDef def。 + var comp = (HediffComp)Activator.CreateInstance(compDef.compClass, this, compDef); + Comps.Add(comp); + comp.Initialize(); // 初始化组件 + } + catch (Exception ex) + { + Debug.LogError( + $"实例化健康状态组件 '{compDef.compClass?.Name ?? "空"}' 失败，所属健康状态 '{def.defName ?? def.GetType().Name}'：{ex.Message}"); + } + } + else + { + Debug.LogWarning( + $"警告：健康状态组件定义 '{compDef.compClass?.Name ?? "空"}' 无效或未继承自 HediffComp，所属健康状态 '{def.defName ?? def.GetType().Name}'。"); + } + } + } + + // 初始化时确定第一个阶段，这会触发 SetDirty()。 + UpdateStageIndex(); + } + + /// + /// 获取此 Hediff 当前激活的阶段定义。 + /// 如果没有激活的阶段或阶段列表为空，则返回 null。 + /// + public HediffStageDef CurrentStage + { + get + { + if (_currentStageIndex >= 0 && _currentStageIndex < def.stages.Count) + { + return def.stages[_currentStageIndex]; + } + return null; + } + } + + /// + /// 获取此 Hediff 当前累计的总属性偏移量。 + /// 只有当属性被标记为“脏”时才重新计算，否则返回缓存值。 + /// + public AttributesOffsetDef CurrentTotalAttributesOffset + { + get + { + // 只有当属性需要更新时才重新计算。 + if (_attribsDirty || _cachedTotalAttributesOffset == null) + { + _cachedTotalAttributesOffset = CalculateTotalAttributesOffset(); + _attribsDirty = false; // 计算完成后重置标志。 + } + return _cachedTotalAttributesOffset; + } + } + + /// + /// 内部方法，用于实际计算 Hediff 的所有总属性偏移量。 + /// 这包括当前阶段的偏移量和所有组件提供的偏移量。 + /// + /// 此 Hediff 当前的总属性偏移量。 + private AttributesOffsetDef CalculateTotalAttributesOffset() + { + var totalOffset = new AttributesOffsetDef(); + if (CurrentStage != null) + { + totalOffset += CurrentStage.attributesOffset; + } + + // 累加来自组件的属性偏移。 + foreach (var comp in Comps) + { + if (comp is IAttributesOffsetProvider attributesOffsetProvider) + { + totalOffset += attributesOffsetProvider.GetAttributesOffset(); + } + } + return totalOffset; + } + + /// + /// 标记 Hediff 的属性偏移量需要重新计算。 + /// 当 Hediff 的内部状态改变并可能影响属性时调用。 + /// 同时会通知其父 LivingEntity，使其也更新属性缓存。 + /// + internal void SetDirty() + { + _attribsDirty = true; + // 如果此 Hediff 附加到了一个 LivingEntity 上，也通知 LivingEntity 属性可能改变。 + if (parent) + { + parent.SetAttribsDirty(); + } + } + + /// + /// 更新 Hediff 的年龄，检查阶段变化并更新所有组件。 + /// + /// 自上次更新以来的时间（秒）。 + public void Tick(float deltaTime) + { + if (ShouldRemove) + return; // 已经标记为移除，无需继续更新。 + + Age += deltaTime; // 增加 Hediff 的年龄。 + + UpdateStageIndex(); // 检查是否有阶段变化（此方法内部会调用 SetDirty）。 + + // 更新所有组件。 + foreach (var comp in Comps) + { + comp.Tick(deltaTime); + } + + // 检查 Hediff 是否到期（如果 def.time > 0 表示有时限，否则为永久）。 + if (def.time > 0 && Age >= def.time) + { + ShouldRemove = true; + SetDirty(); // Hediff 将被移除，其贡献的属性将不再有效，标记为脏。 + } + } + + /// + /// 根据当前年龄更新阶段索引。 + /// 如果阶段发生变化，会调用 SetDirty()。 + /// + private void UpdateStageIndex() + { + var originalStageIndex = _currentStageIndex; // 获取当前阶段索引。 + var newStageIndex = _currentStageIndex; + + // 从后往前遍历阶段，找到当前年龄所属的最高阶段。 + for (var i = def.stages.Count - 1; i >= 0; i--) + { + if (def.stages[i].start <= Age) + { + newStageIndex = i; + break; + } + } + + // 如果阶段发生变化，则标记为脏。 + if (newStageIndex != originalStageIndex) + { + _currentStageIndex = newStageIndex; + // 阶段发生变化，属性偏移可能改变，标记为脏。 + SetDirty(); + } + } + + /// + /// 当此 Hediff 被添加到实体时调用。 + /// 进行初始化设置，如存储父实体引用，并标记属性为脏以强制重新计算。 + /// + /// 此 Hediff 附加到的 LivingEntity 实例。 + internal void OnAdded(LivingEntity entity) + { + this.parent = entity; // 存储父实体引用。 + SetDirty(); // 刚添加也需要标记为脏以确保属性在下次计算时被纳入。 + + foreach (var comp in Comps) + { + comp.OnAdded(); + } + } + + /// + /// 当此 Hediff 从实体移除时调用。 + /// 进行清理操作，如清除父实体引用，并标记属性为脏以强制重新计算。 + /// + /// 此 Hediff 从中移除的 LivingEntity 实例。 + internal void OnRemoved(LivingEntity entity) + { + foreach (var comp in Comps) + { + comp.OnRemoved(); + } + this.parent = null; // 清除对父实体的引用。 + SetDirty(); // 移除后也需要标记为脏，确保属性计算考虑去除此Hediff。 + } + } +} diff --git a/Client/Assets/Scripts/Entity/Hediff.cs.meta b/Client/Assets/Scripts/Entity/Hediff.cs.meta new file mode 100644 index 0000000..45e7348 --- /dev/null +++ b/Client/Assets/Scripts/Entity/Hediff.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: afec36ba23b944cf94ca944a8f8f35f4 +timeCreated: 1756308924 \ No newline at end of file diff --git a/Client/Assets/Scripts/Entity/HediffComp.cs b/Client/Assets/Scripts/Entity/HediffComp.cs new file mode 100644 index 0000000..be11ab5 --- /dev/null +++ b/Client/Assets/Scripts/Entity/HediffComp.cs @@ -0,0 +1,47 @@ +using Data; + +namespace Entity +{ + // 运行时健康状态组件的抽象基类 + public abstract class HediffComp + { + protected Hediff parentHediff; // 对父 Hediff 的引用 + protected HediffCompDef def; // 对组件定义的引用 + + public HediffComp(Hediff parentHediff, HediffCompDef def) + { + this.parentHediff = parentHediff; + this.def = def; + } + + /// + /// 组件初始化时调用，在构造函数之后。 + /// + public virtual void Initialize() + { + } + + /// + /// 每帧更新时调用。 + /// + /// 自上次更新以来的时间（秒）。 + public virtual void Tick(float deltaTime) + { + } + + /// + /// 当其父 Hediff 被添加到实体时调用。 + /// + public virtual void OnAdded() + { + } + + /// + /// 当其父 Hediff 从实体移除时调用。 + /// + public virtual void OnRemoved() + { + } + } + +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Entity/HediffComp.cs.meta b/Client/Assets/Scripts/Entity/HediffComp.cs.meta new file mode 100644 index 0000000..803c3b1 --- /dev/null +++ b/Client/Assets/Scripts/Entity/HediffComp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f3f6a16d500840bea821c21ea612a5c6 +timeCreated: 1756612166 \ No newline at end of file diff --git a/Client/Assets/Scripts/Entity/LivingEntity.cs b/Client/Assets/Scripts/Entity/LivingEntity.cs new file mode 100644 index 0000000..630b534 --- /dev/null +++ b/Client/Assets/Scripts/Entity/LivingEntity.cs @@ -0,0 +1,162 @@ +using System; +using System.Collections.Generic; +using Data; +using Managers; +using UnityEngine; + +namespace Entity +{ + // 假设 Entity 基类如下结构 + // public abstract class Entity + // { + // public virtual Attributes baseAttributes { get; protected set; } = new Attributes(); + // public virtual Attributes attributes { get; protected set; } = new Attributes(); + // public virtual void Tick(float deltaTime) { /* Base entity update logic */ } + // } + + /// + /// 表示一个具有生命周期、属性和可受健康状态（Hediff）影响的实体。 + /// + public class LivingEntity : Entity + { + // 存储应用于此实体的所有健康状态（Hediff）列表。 + protected List hediffs = new List(); + // 标记实体属性是否需要重新计算。当Hediff发生变化时，此标记会被设置为true。 + private bool _needUpdateAttributes = true; + + // 缓存实体的基础属性，这些属性不受动态Hediff影响，但可能受基类或Def影响。 + private Attributes _cachedBaseAttributes; + /// + /// 获取实体的基础属性。这些属性通常来源于实体的定义（Def），并可能受到常驻的基础健康状态（Base Hediffs）影响。 + /// + public override Attributes baseAttributes + { + get + { + // 仅在 _cachedBaseAttributes 为 null 时计算一次 + if(_cachedBaseAttributes == null) + { + var defAttributes = base.baseAttributes; + var hediffOffset = new AttributesOffsetDef(); + + // 这里假设 SaveManager.Instance.baseHediffs 指的是“所有实体共通的基础Hediff” + // 并且这些基础 Hediff 也会影响 baseAttributes + foreach (var hediff in SaveManager.Instance.baseHediffs) + { + hediffOffset += hediff.CurrentTotalAttributesOffset; + } + _cachedBaseAttributes = defAttributes.GetModifiedAttributes(hediffOffset); + } + return _cachedBaseAttributes; + } + } + + // 缓存实体当前的最终属性，该属性是基础属性加上所有健康状态（Hediff）修正后的结果。 + private Attributes _cachedAttributes; + /// + /// 获取实体当前的最终属性，包括所有健康状态（Hediff）的修正。 + /// + public override Attributes attributes + { + get + { + if (_needUpdateAttributes || _cachedAttributes == null) + { + // 1. 获取旧的属性值（在重新计算之前，也就是当前的缓存值） + // 仅用于需要与“当前值”进行比较或钳制的情况，例如最大生命值Buff移除时 + var oldCachedAttributes = _cachedAttributes; + if (oldCachedAttributes == null) // 如果是第一次计算，初始化一个默认值或者使用baseAttributes + { + oldCachedAttributes = baseAttributes; + } + + // 2. 计算完全修正后的“理论”最大属性值（基于 baseAttributes 和所有 Hediff 偏移） + var totalModifiedAttributes = baseAttributes; + + var hediffOffset = new AttributesOffsetDef(); + foreach (var hediff in hediffs) + { + hediffOffset += hediff.CurrentTotalAttributesOffset; + } + + // 应用所有 hediff 的偏移到 totalModifiedAttributes + totalModifiedAttributes = totalModifiedAttributes.GetModifiedAttributes(hediffOffset); + _cachedAttributes = Attributes.Min(oldCachedAttributes, totalModifiedAttributes); + // 标记为已更新 + _needUpdateAttributes = false; + } + return _cachedAttributes; + } + protected set => _cachedAttributes = value; + } + + + /// + /// 供内部使用的属性标记方法。当 Hediff 自身状态改变并影响属性时，通过此方法通知 LivingEntity。 + /// + internal void SetAttribsDirty() + { + _needUpdateAttributes = true; + } + + /// + /// 每帧调用的更新函数，传入时间增量。 + /// + public override void Tick() + { + base.Tick(); // 调用基类的Tick方法 + + // 遍历并更新所有健康状态，从后向前循环以安全地移除已完成的Hediff + for (var i = hediffs.Count - 1; i >= 0; i--) + { + var hediff = hediffs[i]; + hediff.Tick(Time.deltaTime); // 调用单个Hediff的Tick方法 + + // 检查Hediff是否已达到移除条件 + if (hediff.ShouldRemove) + { + RemoveHediff(hediff); // 使用RemoveHediff方法确保OnRemoved被调用并设置_needUpdateAttributes + } + } + } + + /// + /// 添加一个新的健康状态到实体上。 + /// + /// 要添加的 Hediff 实例。 + public void AddHediff(Hediff hediff) + { + if (hediff == null) + { + Debug.LogWarning("尝试向活体实体添加一个空的健康状态（Hediff）。"); + return; + } + + hediffs.Add(hediff); + // 通知Hediff它被添加到一个实体上，进行初始化等操作，并传入自身引用 + hediff.OnAdded(this); + _needUpdateAttributes = true; // 添加新Hediff，需要更新属性缓存 + } + + /// + /// 移除一个特定的健康状态。 + /// + /// 要移除的 Hediff 实例。 + public void RemoveHediff(Hediff hediff) + { + if (hediff == null) + { + Debug.LogWarning("尝试从活体实体移除一个空的健康状态（Hediff）。"); + return; + } + + // 尝试从列表中移除Hediff + if (hediffs.Remove(hediff)) + { + // 通知Hediff它被从实体上移除，进行清理等操作，并传入自身引用 + hediff.OnRemoved(this); + _needUpdateAttributes = true; // 移除Hediff，需要更新属性缓存 + } + } + } +} diff --git a/Client/Assets/Scripts/Entity/LivingEntity.cs.meta b/Client/Assets/Scripts/Entity/LivingEntity.cs.meta new file mode 100644 index 0000000..4392946 --- /dev/null +++ b/Client/Assets/Scripts/Entity/LivingEntity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 440140899cba41b3a023f86e27e69909 +timeCreated: 1756632414 \ No newline at end of file diff --git a/Client/Assets/Scripts/Entity/Monster.cs b/Client/Assets/Scripts/Entity/Monster.cs index 2301565..2af1763 100644 --- a/Client/Assets/Scripts/Entity/Monster.cs +++ b/Client/Assets/Scripts/Entity/Monster.cs @@ -4,7 +4,7 @@ using Managers; namespace Entity { - public class Monster : Entity + public class Monster:LivingEntity { private WeaponResource weapon; public override void Init(EntityDef entityDef) diff --git a/Client/Assets/Scripts/EventWorkClass.meta b/Client/Assets/Scripts/EventWorkClass.meta new file mode 100644 index 0000000..6753b41 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3747df4a5ee84ed5b9d4241f240af67a +timeCreated: 1756786716 \ No newline at end of file diff --git a/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs b/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs new file mode 100644 index 0000000..759e5bd --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs @@ -0,0 +1,12 @@ +using Base; +using UnityEngine; + +namespace EventWorkClass +{ + public abstract class EventWorkClassBase + { + public abstract void Init(string value); + + public abstract void Run(string dimensionID); + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs.meta b/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs.meta new file mode 100644 index 0000000..bd901d1 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/EventWorkClassBase.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1258c84f5c82460ead132b62741c0be3 +timeCreated: 1756786734 \ No newline at end of file diff --git a/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs b/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs new file mode 100644 index 0000000..c1004e2 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs @@ -0,0 +1,305 @@ +using System; +using Data; +using Managers; +using UnityEngine; +using Random = UnityEngine.Random; + +namespace EventWorkClass +{ + /// + /// Event_EntityGenerater 事件的配置数据结构。 + /// + [Serializable] + public class EntityGenerateConfig + { + /// + /// 要生成的实体定义名 (defName)。 + /// + public string EntityDefName; + /// + /// 要生成的实体定义的具体类型名，例如 "CharacterDef" 或 "MonsterDef"。 + /// 用于 DefineManager 的严格类型查找。 + /// + public string EntityDefTypeName; + /// + /// 生成位置类型。 + /// + public EntitySpawnLocationType LocationType; + // 以下是各种LocationType可能需要的配置参数 + /// + /// 用于 AroundSpecificCoordinates 类型：生成中心坐标。 + /// + public Vector3 CenterCoordinates; + /// + /// 用于 AroundSpecificCoordinates 或 AroundTargetEntity 类型：生成半径。 + /// + public float Radius = 10f; // 默认半径 + /// + /// 用于 InsideSpecificBuildingType 类型：目标建筑的类型ID。 + /// + public string BuildingTypeId; + /// + /// 用于 AroundTargetEntity 类型：目标派系的定义名 (factionDefName)。 + /// + public string TargetFactionDefName; + /// + /// 用于 AtPredefinedSpawnPoint 类型：预定义生成点的ID。 + /// + public string SpawnPointId; + /// + /// 用于 OffMap 类型：距离地图边界的额外偏移量。 + /// + public float OffMapOffset = 5f; + } + /// + /// 定义生成器生成地图实体的可能位置类型。 + /// + public enum EntitySpawnLocationType + { + /// + /// 未指定或无效的生成位置类型。 + /// + None = 0, + /// + /// 在地图的可玩区域边界之外生成实体。 + /// 例如：用于在地图边缘或不可见区域生成物体，然后开始移动进入地图。 + /// + OffMap, + /// + /// 在指定类型建筑的内部或附近生成实体。 + /// 例如：在 "工厂"、"商店"、"居住区" 等建筑内或其出入口。 + /// 需要一个标识符来指定建筑类型。 + /// + InsideSpecificBuildingType, + /// + /// 在指定坐标点的周围区域内生成实体。 + /// 需要额外的坐标参数和半径/范围参数。 + /// + AroundSpecificCoordinates, + /// + /// 在特定派系（或其他指定目标实体，例如NPC或特定对象）的周围区域内生成实体。 + /// 需要一个标识符来指定目标派系的定义名，以及一个半径/范围参数。 + /// + AroundTargetEntity, + /// + /// 在地图上的随机可生成点生成实体。 + /// + RandomlyOnMap, + /// + /// 在预定义的生成点（Spawn Point）生成实体。 + /// 这些点通常由地图设计者放置，并带有唯一的ID或名称。 + /// + AtPredefinedSpawnPoint + } + public class Event_EntityGenerater : EventWorkClassBase + { + private EntityGenerateConfig _config; + private EntityDef _aimEntity; + + /// + /// 初始化实体生成器事件。 + /// + /// 包含事件配置的JSON字符串。 + public override void Init(string value) + { + if (string.IsNullOrEmpty(value)) + { + Debug.LogError("初始化值为空或null。请提供一个JSON配置字符串。"); + return; + } + try + { + _config = JsonUtility.FromJson(value); + if (_config == null) + { + Debug.LogError($"无法解析配置JSON: {value}"); + return; + } + if (string.IsNullOrEmpty(_config.EntityDefTypeName)) + { + Debug.LogError($"实体定义类型名为空或null (实体定义名: '{_config.EntityDefName}')。无法查找实体定义。"); + return; + } + _aimEntity = (EntityDef)DefineManager.Instance.FindDefine(_config.EntityDefTypeName,_config.EntityDefName); + if (_aimEntity == null) + { + Debug.LogError($"未找到实体定义 (名称: '{_config.EntityDefName}', 类型: '{_config.EntityDefTypeName}')。请检查配置。"); + } + } + catch (Exception ex) + { + Debug.LogError($"解析配置JSON时出错: {value}。异常信息: {ex.Message}"); + } + } + + /// + /// 运行实体生成器事件，在指定维度生成实体。 + /// + /// 要生成实体的维度ID。 + public override void Run(string dimensionID) + { + if (_config == null) + { + Debug.LogError("事件配置(_config)为空。Init()可能失败了。"); + return; + } + if (_aimEntity == null) + { + Debug.LogError($"目标实体定义为空 (名称: {_config.EntityDefName}, 类型: {_config.EntityDefTypeName})。无法生成实体。"); + return; + } + var position = GetPosition(dimensionID); + // 检查 GetPosition 是否返回了有效的非零位置，除非它是 AroundSpecificCoordinates 且中心点就是 Vector3.zero + if (position == Vector3.zero && (_config.LocationType != EntitySpawnLocationType.AroundSpecificCoordinates || _config.CenterCoordinates != Vector3.zero)) + { + Debug.LogWarning($"未能为类型 {_config.LocationType} 获取有效的生成位置。实体可能在原点 (0,0,0) 生成。"); + } + + if (_aimEntity is CharacterDef characterDef) + { + EntityManage.Instance.GenerateEntity(dimensionID, characterDef, position); + Debug.Log($"已在维度 {dimensionID} 的 {position} 位置生成角色 '{characterDef.defName}'。"); + return; + } + + if (_aimEntity is MonsterDef monsterDef) + { + EntityManage.Instance.GenerateMonsterEntity(dimensionID, monsterDef, position); + Debug.Log($"已在维度 {dimensionID} 的 {position} 位置生成怪物 '{monsterDef.defName}'。"); + return; + } + Debug.LogWarning($"目标实体 '{_aimEntity.defName}' (类型: {_aimEntity.GetType().Name}) 既不是 CharacterDef 也不是 MonsterDef。" + + $"如果你想生成其他类型，EntityManage需要一个通用的生成实体方法。没有生成任何实体。"); + } + + /// + /// 根据配置获取实体生成位置。 + /// + /// 要获取位置的维度ID。 + /// 计算出的生成位置，如果失败则返回 Vector3.zero。 + private Vector3 GetPosition(string dimensionID) + { + if (_config == null) + { + Debug.LogError("获取位置时配置为空。返回 Vector3.zero。"); + return Vector3.zero; + } + var dimension = Program.Instance.GetDimension(dimensionID); + if (dimension == null) + { + Debug.LogError($"未找到维度 '{dimensionID}'。无法确定生成位置。"); + return Vector3.zero; + } + var mapGenerator = dimension.mapGenerator; + if (mapGenerator == null) + { + Debug.LogError($"维度 '{dimensionID}' 的地图生成器为空。无法确定生成位置。"); + return Vector3.zero; + } + switch (_config.LocationType) + { + case EntitySpawnLocationType.OffMap: + { + var size = mapGenerator.GetSize(); + var dir = Random.Range(0, 4); // 0:上, 1:下, 2:左, 3:右 + Vector2Int gridCoord; // 地图网格坐标 + Vector2Int worldCoord2D; // GetWorldCoordinates 返回的 Vector2Int + Vector3 worldPos3D; // 最终的 Vector3 世界坐标 + var offset = _config.OffMapOffset; + switch (dir) + { + case 0: // Top border (max Y) + gridCoord = new Vector2Int(Random.Range(0, size.x), size.y); + worldCoord2D = mapGenerator.GetWorldCoordinates(gridCoord); + worldPos3D = new Vector3(worldCoord2D.x, worldCoord2D.y, 0f); // 转换为 Vector3 + worldPos3D.y += offset; + break; + case 1: // Bottom border (min Y) + gridCoord = new Vector2Int(Random.Range(0, size.x), 0); + worldCoord2D = mapGenerator.GetWorldCoordinates(gridCoord); + worldPos3D = new Vector3(worldCoord2D.x, worldCoord2D.y, 0f); // 转换为 Vector3 + worldPos3D.y -= offset; + break; + case 2: // Left border (min X) + gridCoord = new Vector2Int(0, Random.Range(0, size.y)); + worldCoord2D = mapGenerator.GetWorldCoordinates(gridCoord); + worldPos3D = new Vector3(worldCoord2D.x, worldCoord2D.y, 0f); // 转换为 Vector3 + worldPos3D.x -= offset; + break; + case 3: // Right border (max X) + gridCoord = new Vector2Int(size.x, Random.Range(0, size.y)); + worldCoord2D = mapGenerator.GetWorldCoordinates(gridCoord); + worldPos3D = new Vector3(worldCoord2D.x, worldCoord2D.y, 0f); // 转换为 Vector3 + worldPos3D.x += offset; + break; + default: + Debug.LogError("OffMap 生成方向无效。不应该发生此情况。"); + return Vector3.zero; + } + worldPos3D.x += Random.Range(-offset / 2f, offset / 2f); + worldPos3D.y += Random.Range(-offset / 2f, offset / 2f); + return worldPos3D; + } + case EntitySpawnLocationType.AroundSpecificCoordinates: + { + var center = _config.CenterCoordinates; + var radius = _config.Radius; + var randomOffset = Random.insideUnitCircle * radius; + return new Vector3(center.x + randomOffset.x, center.y + randomOffset.y, center.z); + } + case EntitySpawnLocationType.AroundTargetEntity: + { + if (string.IsNullOrEmpty(_config.TargetFactionDefName)) + { + Debug.LogWarning($"配置了 'AroundTargetEntity'，但 'TargetFactionDefName' 为空或null。无法找到派系实体。将在原点生成。"); + return Vector3.zero; + } + var factionEntities = EntityManage.Instance.FindEntitiesByFaction(dimensionID, _config.TargetFactionDefName); + if (factionEntities == null || factionEntities.Length == 0) + { + Debug.LogWarning($"在维度 '{dimensionID}' 中未找到派系 '{_config.TargetFactionDefName}' 的任何实体。将在原点生成。"); + return Vector3.zero; + } + var randomIndex = Random.Range(0, factionEntities.Length); + var targetEntityPrefab = factionEntities[randomIndex]; + if (targetEntityPrefab == null || targetEntityPrefab.transform == null) + { + Debug.LogWarning($"从派系 '{_config.TargetFactionDefName}' 中随机选择的实体为空或没有Transform组件。将在原点生成。"); + return Vector3.zero; + } + var center = targetEntityPrefab.transform.position; + var radius = _config.Radius; + var randomOffset = Random.insideUnitCircle * radius; + + Debug.Log($"围绕派系 '{_config.TargetFactionDefName}' 的实体 (世界坐标: {center}) 生成。生成的偏移量: {randomOffset}。"); + return new Vector3(center.x + randomOffset.x, center.y + randomOffset.y, center.z); + } + case EntitySpawnLocationType.RandomlyOnMap: + { + var size = mapGenerator.GetSize(); + var randomGridPos = new Vector2Int(Random.Range(0, size.x), Random.Range(0, size.y)); + + var worldCoord2D = mapGenerator.GetWorldCoordinates(randomGridPos); + var worldPos3D = new Vector3(worldCoord2D.x, worldCoord2D.y, 0f); + + Debug.Log($"随机地图生成位置: {worldPos3D} (网格坐标: {randomGridPos})。"); + return worldPos3D; + } + case EntitySpawnLocationType.InsideSpecificBuildingType: + { + Debug.LogWarning($"类型为 'InsideSpecificBuildingType' ({_config.BuildingTypeId}) 的生成逻辑尚未实现。返回 Vector3.zero。"); + return Vector3.zero; + } + case EntitySpawnLocationType.AtPredefinedSpawnPoint: + { + Debug.LogWarning($"类型为 'AtPredefinedSpawnPoint' ({_config.SpawnPointId}) 的生成逻辑尚未实现。返回 Vector3.zero。"); + return Vector3.zero; + } + case EntitySpawnLocationType.None: + default: + Debug.LogWarning($"未知或不支持的生成位置类型: {_config.LocationType}。返回 Vector3.zero。"); + return Vector3.zero; + } + } + } +} diff --git a/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs.meta b/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs.meta new file mode 100644 index 0000000..241a6a8 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/Event_EntityGenerater.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aea1fb7d2e1c45e4ac62da4ae8f81393 +timeCreated: 1756789875 \ No newline at end of file diff --git a/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs b/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs new file mode 100644 index 0000000..793e428 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs @@ -0,0 +1,273 @@ +using System; +using System.Collections.Generic; +using Data; +using Managers; +using UnityEngine; +using System.Linq; +using Entity; +using Map; // 用于 LINQ + +namespace EventWorkClass +{ + /// + /// Event_GiveHediff 事件的配置数据结构。 + /// + [Serializable] + public class GiveHediffConfig + { + /// + /// 要添加或移除的 Hediff 的定义名 (defName)。 + /// + public string HediffDefName; + /// + /// 要添加或移除的 Hediff 定义的具体类型名，例如 "HediffDef" 或其子类名。 + /// 用于 DefineManager 的严格类型查找。 + /// + public string HediffDefTypeName; + /// + /// 要执行的操作类型：添加或移除 Hediff。 + /// + public HediffActionType ActionType; + /// + /// 目标实体选择类型。 + /// + public TargetEntitySelectionType TargetSelectionType; + // 以下是各种 TargetSelectionType 可能需要的配置参数 + + /// + /// 用于 SpecificEntityById 类型：目标实体的唯一ID。 + /// + public string TargetEntityId; + /// + /// 用于 AllEntitiesInFaction 或 TargetSpecificFactionLeader 类型：目标派系的定义名 (factionDefName)。 + /// + public string TargetFactionDefName; + /// + /// 用于 AroundSpecificCoordinates 类型：生成中心坐标。 + /// + public Vector3 CenterCoordinates; + /// + /// 用于 AroundSpecificCoordinates 类型：搜索半径。 + /// + public float Radius = 10f; // 默认半径 + } + + /// + /// 定义针对 Hediff 的操作类型。 + /// + public enum HediffActionType + { + /// + /// 添加 Hediff。 + /// + Add, + /// + /// 移除 Hediff。 + /// + Remove + } + + /// + /// 定义目标实体选择的类型。 + /// + public enum TargetEntitySelectionType + { + /// + /// 未指定或无效的目标选择类型。 + /// + None = 0, + /// + /// 目标是当前玩家（如果存在）。 + /// + Player, + /// + /// 目标是指定派系的所有活动实体。 + /// + AllEntitiesInFaction, + /// + /// 目标是指定坐标周围半径内的所有生物。 + /// + AroundSpecificCoordinates + } + + /// + /// Event_GiveHediff 事件类：用于给予或移除健康状态 (Hediff)。 + /// + public class Event_GiveHediff : EventWorkClassBase + { + private GiveHediffConfig _config; + private HediffDef _aimHediffDef; + + /// + /// 初始化 Hediff 给予/移除事件。 + /// + /// 包含事件配置的JSON字符串。 + public override void Init(string value) + { + if (string.IsNullOrEmpty(value)) + { + Debug.LogError("Event_GiveHediff: 初始化值为空或null。请提供一个JSON配置字符串。"); + return; + } + try + { + _config = JsonUtility.FromJson(value); + if (_config == null) + { + Debug.LogError($"Event_GiveHediff: 无法解析配置JSON: {value}"); + return; + } + + if (string.IsNullOrEmpty(_config.HediffDefTypeName) || string.IsNullOrEmpty(_config.HediffDefName)) + { + Debug.LogError($"Event_GiveHediff: Hediff定义类型名或名称为空或null (名称: '{_config.HediffDefName}', 类型: '{_config.HediffDefTypeName}')。无法查找Hediff定义。"); + return; + } + + _aimHediffDef = (HediffDef)DefineManager.Instance.FindDefine(_config.HediffDefTypeName, _config.HediffDefName); + if (_aimHediffDef == null) + { + Debug.LogError($"Event_GiveHediff: 未找到Hediff定义 (名称: '{_config.HediffDefName}', 类型: '{_config.HediffDefTypeName}')。请检查配置。"); + } + } + catch (Exception ex) + { + Debug.LogError($"Event_GiveHediff: 解析配置JSON时出错: {value}。异常信息: {ex.Message}"); + } + } + + /// + /// 运行 Hediff 给予/移除事件。 + /// + /// 目标实体所在的维度ID。 + public override void Run(string dimensionID) + { + if (_config == null) + { + Debug.LogError("Event_GiveHediff: 事件配置(_config)为空。Init()可能失败了。"); + return; + } + if (_aimHediffDef == null) + { + Debug.LogError($"Event_GiveHediff: 目标Hediff定义为空 (名称: {_config.HediffDefName}, 类型: {_config.HediffDefTypeName})。无法执行操作。"); + return; + } + + var targetEntities = GetTargetEntities(dimensionID); + if (targetEntities == null || targetEntities.Count == 0) + { + Debug.LogWarning($"Event_GiveHediff: 在维度 '{dimensionID}' 中未找到符合条件的目标实体 (选择类型: {_config.TargetSelectionType})。"); + return; + } + + var successCount = 0; + var failedCount = 0; + var hediffInstance = new Hediff(_aimHediffDef); // 创建 Hediff 实例 + + foreach (var entity in targetEntities) + { + if (entity is LivingEntity livingEntity) + { + try + { + if (_config.ActionType == HediffActionType.Add) + { + livingEntity.AddHediff(hediffInstance); + Debug.Log($"Event_GiveHediff: 已向实体 '{livingEntity.name}' 添加 Hediff '{_aimHediffDef.defName}'。"); + successCount++; + } + else if (_config.ActionType == HediffActionType.Remove) + { + livingEntity.RemoveHediff(hediffInstance); + Debug.Log($"Event_GiveHediff: 已从实体 '{livingEntity.name}' 移除 Hediff '{_aimHediffDef.defName}'。"); + successCount++; + } + } + catch (Exception ex) + { + Debug.LogError($"Event_GiveHediff: 对实体 '{entity.name}' 执行 Hediff 操作时出错: {ex.Message}"); + failedCount++; + } + } + else + { + Debug.LogWarning($"Event_GiveHediff: 实体 '{entity.name}' (类型: {entity.GetType().Name}) 不是 LivingEntity，无法添加/移除 Hediff。"); + failedCount++; + } + } + Debug.Log($"Event_GiveHediff: 完成操作。成功: {successCount}，失败: {failedCount} (Hediff: {_aimHediffDef.defName}, 操作: {_config.ActionType})。"); + } + + /// + /// 根据配置获取目标实体列表。 + /// + /// 维度ID。 + /// 符合条件的目标实体列表。 + private List GetTargetEntities(string dimensionID) + { + var entities = new List(); + var dimension = Program.Instance.GetDimension(dimensionID); + + if (dimension == null) + { + Debug.LogError($"Event_GiveHediff: 未找到维度 '{dimensionID}'。无法获取目标实体。"); + return entities; + } + + switch (_config.TargetSelectionType) + { + case TargetEntitySelectionType.Player: + // 假设 PlayerManager.Instance.GetPlayerEntity(dimensionID) 返回 LivingEntity + // 或者你的玩家实体本身就是 LivingEntity + var player = dimension.focusEntity as LivingEntity; // 假设玩家是维度的一部分且是LivingEntity + if (player != null) + { + entities.Add(player); + } + else + { + Debug.LogWarning($"Event_GiveHediff: 未能找到维度 '{dimensionID}' 中的玩家实体或玩家不是 LivingEntity。"); + } + break; + + case TargetEntitySelectionType.AllEntitiesInFaction: + if (string.IsNullOrEmpty(_config.TargetFactionDefName)) + { + Debug.LogWarning("Event_GiveHediff: 配置了 'AllEntitiesInFaction'，但 'TargetFactionDefName' 为空。"); + return entities; + } + + entities.AddRange(EntityManage.Instance + .FindEntitiesByFaction(dimensionID, _config.TargetFactionDefName) + .Select(item => item.entity)); + break; + + case TargetEntitySelectionType.AroundSpecificCoordinates: + // 假设 EntityManage 提供了根据位置和半径查找实体的方法 + // 或者可以直接通过场景查询（例如 Physics.OverlapSphere 或者自定义管理系统） + // 为了简化，我将假设 EntityManage 提供 FindEntitiesAroundRadius 方法 + var allEntitiesInDimension = EntityManage.Instance.GetAllEntities(dimensionID) + .Select(item => item.entity); + var center = _config.CenterCoordinates; + var radius = _config.Radius; + + foreach (var ent in allEntitiesInDimension) + { + // 确保实体有 Transform 且在半径内 + if (ent != null && ent.transform != null && Vector3.Distance(ent.transform.position, center) <= radius) + { + entities.Add(ent); + } + } + break; + + case TargetEntitySelectionType.None: + default: + Debug.LogWarning($"Event_GiveHediff: 未知或不支持的目标实体选择类型: {_config.TargetSelectionType}。"); + break; + } + + return entities; + } + } +} diff --git a/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs.meta b/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs.meta new file mode 100644 index 0000000..f873a67 --- /dev/null +++ b/Client/Assets/Scripts/EventWorkClass/Event_GiveHediff.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2e8b013e0825473e9dbba1f7f393e66f +timeCreated: 1756860849 \ No newline at end of file diff --git a/Client/Assets/Scripts/Item/ItemBase.cs b/Client/Assets/Scripts/Item/ItemBase.cs deleted file mode 100644 index e51160a..0000000 --- a/Client/Assets/Scripts/Item/ItemBase.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Item -{ - public class ItemBase - { - public ItemResource resource; - - public int count = 0; - - } -} \ No newline at end of file diff --git a/Client/Assets/Scripts/Item/ItemBase.cs.meta b/Client/Assets/Scripts/Item/ItemBase.cs.meta deleted file mode 100644 index 2033845..0000000 --- a/Client/Assets/Scripts/Item/ItemBase.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 01a2843d5856483fa5b6967e2e01db62 -timeCreated: 1755061705 \ No newline at end of file diff --git a/Client/Assets/Scripts/Item/ItemResource.cs b/Client/Assets/Scripts/Item/ItemResource.cs index 0cc10ef..4f0827f 100644 --- a/Client/Assets/Scripts/Item/ItemResource.cs +++ b/Client/Assets/Scripts/Item/ItemResource.cs @@ -49,13 +49,6 @@ namespace Item $"ItemResource: Failed to load sprite for texture '{texture}' for item '{def.defName}'."); } } - else - { - // 仅当 textures 为 null 时警告，因为它可能是预期的数据状态（无图标） - Debug.LogWarning( - $"ItemResource: ItemDef '{def.defName}' has a null textures array. No icons will be loaded."); - } - // 逻辑修改：Icon 属性现在是 IReadOnlyList 类型，确保外部只读访问 Icon = sprites.AsReadOnly(); // 使用 AsReadOnly() 获得一个只读包装器 } diff --git a/Client/Assets/Scripts/Logging/LogCapturer.cs b/Client/Assets/Scripts/Logging/LogCapturer.cs index edbadba..fcc0c0c 100644 --- a/Client/Assets/Scripts/Logging/LogCapturer.cs +++ b/Client/Assets/Scripts/Logging/LogCapturer.cs @@ -14,14 +14,21 @@ namespace Logging public string Message; public string StackTrace; - public override string ToString() => - $"[{Timestamp:HH:mm:ss}] [{Type}] {Message}" + - (Type == LogType.Exception ? $"\n{StackTrace}" : ""); + public override string ToString() + { + // 逻辑修改：扩展条件，使LogType.Error和LogType.Assert也能显示堆栈信息 + if (Type == LogType.Exception || Type == LogType.Error || Type == LogType.Assert) + { + return $"[{Timestamp:HH:mm:ss}] [{Type}] {Message}\n{StackTrace}"; + } + return $"[{Timestamp:HH:mm:ss}] [{Type}] {Message}"; + } } private static readonly Queue _logs = new Queue(); private static readonly object _lock = new object(); // 线程锁 private static int _maxLogs = 1000; // 默认容量 + private static bool _isInitialized = false; // 逻辑修改：添加一个私有标志来跟踪是否已初始化 // 最大日志容量属性 public static int MaxLogs @@ -37,10 +44,40 @@ namespace Logging } } - static LogCapturer() + // 逻辑修改：添加 [RuntimeInitializeOnLoadMethod] 特性，确保 Init() 方法在 Unity 启动时自动执行 + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)] + public static void Init() { - // 注册全局日志回调 - Application.logMessageReceivedThreaded += HandleLog; + // 确保线程安全地检查和设置初始化状态 + lock (_lock) + { + if (_isInitialized) + { + Debug.LogWarning("[LogCapturer] Init() called multiple times. LogCapturer is already initialized."); + return; + } + + Application.logMessageReceivedThreaded += HandleLog; + _isInitialized = true; + } + } + + // 逻辑修改：添加一个 Shutdown 方法来解除事件注册和清理 + public static void Shutdown() + { + // 确保线程安全地检查和解除注册 + lock (_lock) + { + if (!_isInitialized) + { + Debug.LogWarning("[LogCapturer] Shutdown() called but LogCapturer was not initialized."); + return; + } + + Application.logMessageReceivedThreaded -= HandleLog; + _isInitialized = false; + _logs.Clear(); // 逻辑修改：在关闭时清空所有捕获的日志，确保下次启用时是全新状态。 + } } // 日志处理回调 @@ -90,4 +127,4 @@ namespace Logging } } } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/Managers/AudioManager.cs b/Client/Assets/Scripts/Managers/AudioManager.cs new file mode 100644 index 0000000..c6e9626 --- /dev/null +++ b/Client/Assets/Scripts/Managers/AudioManager.cs @@ -0,0 +1,232 @@ + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Data; +using UnityEngine; + +namespace Managers +{ + /// + /// 音频管理器，负责加载、管理和提供从定义数据中解析出的音频剪辑。 + /// + /// + /// 该管理器是一个单例，并在启动过程中实现 ILaunchManager 接口， + /// 用于处理游戏或应用启动时音频资源的加载和初始化。 + /// + public class AudioManager : Utils.Singleton, ILaunchManager + { + /// + /// 默认音频剪辑，在找不到对应音频时返回。 + /// + public AudioClip defaultAudioClip; + + /// + /// 存储所有已加载的音频剪辑，按音频名称（全局唯一的DefName）索引。 + /// + public Dictionary audioClips = new(); + + /// + /// 获取当前启动步骤的描述。 + /// + public string StepDescription { get; private set; } = "音频管理器正在准备中..."; + + /// + /// 初始化音频管理器，加载默认音频剪辑并处理所有 AudioDef 定义。 + /// + public void Init() + { + if (audioClips.Count > 0) + { + // 如果已经有数据，则跳过初始化，防止重复加载。 + return; + } + defaultAudioClip = Resources.Load("Default/DefaultAudio"); // 假设存在一个默认音频路径 + if (defaultAudioClip == null) + { + Debug.LogWarning("AudioManager: 无法加载默认音频 'Resources/Default/DefaultAudio'。请确保文件存在。"); + } + InitAudioDef(); + } + + /// + /// 根据 AudioDef 定义初始化并加载所有音频剪辑。 + /// + public void InitAudioDef() + { + // 缓存已加载的物理文件路径对应的 AudioClip，避免重复加载 + var audioCache = new Dictionary(); + var audioDefs = Managers.DefineManager.Instance.QueryDefinesByType(); + + if (audioDefs == null || !audioDefs.Any()) + { + Debug.Log($"AudioManager: 在定义管理器中未找到任何音频定义。({nameof(AudioDef)})"); + return; + } + + foreach (var audioDef in audioDefs) + { + if (string.IsNullOrEmpty(audioDef.path) || string.IsNullOrEmpty(audioDef.defName)) + { + Debug.LogWarning($"AudioManager: 跳过音频定义 (DefName: '{audioDef?.defName ?? "未知"}')，因为它包含空路径或DefName。(路径: '{audioDef?.path ?? ""}')"); + continue; + } + + try + { + string cacheKey; + AudioClip audioClip = null; + + if (audioDef.path.StartsWith("res:")) + { + // 处理 Unity Resources 路径 + var resPath = audioDef.path.Substring(4).Replace('\\', '/').TrimStart('/'); + cacheKey = "res://" + resPath.ToLower(); // 缓存键使用小写路径 + + // 检查音频缓存 + if (!audioCache.TryGetValue(cacheKey, out audioClip)) + { + var cleanPath = Path.ChangeExtension(resPath, null); // 去掉扩展名 + audioClip = Resources.Load(cleanPath); + if (audioClip) + audioCache[cacheKey] = audioClip; + } + } + else if (audioDef.path.Contains(':')) // 包含 PackageID:Path 或其他自定义前缀 + { + var splitIndex = audioDef.path.IndexOf(':'); + var packageID = audioDef.path.Substring(0, splitIndex); + var relativePath = audioDef.path.Substring(splitIndex + 1); + + var packageRoot = Managers.DefineManager.Instance.GetPackagePath(packageID); + if (string.IsNullOrEmpty(packageRoot)) + { + Debug.LogWarning($"AudioManager: 音频定义 '{audioDef.defName}' (路径: '{audioDef.path}'): 引用的包ID '{packageID}' 未找到或没有根路径。跳过音频加载。"); + continue; + } + + var fullPath = Path.Combine(packageRoot, relativePath).Replace('\\', '/'); + cacheKey = "file://" + fullPath.ToLower(); // 缓存键使用小写路径 + + // 检查音频缓存 + if (!audioCache.TryGetValue(cacheKey, out audioClip)) + { + // === 重要的实现细节 === + // 在真实的 Unity 项目中，直接从文件系统同步加载 AudioClip 通常不推荐， + // 且 Unity 不提供直接的同步方法。通常会使用 UnityWebRequest.GetAudioClip (异步) + // 或 Asset Bundles。为了与 ImageManager 的 ConfigProcessor.LoadTextureByIO + // 保持一致的同步风格，此处我们假设 Configs.ConfigProcessor 存在一个同步的 + // LoadAudioClipByIO 方法。 + audioClip = Configs.ConfigProcessor.LoadAudioByIO(fullPath).Result; + if (audioClip) + audioCache[cacheKey] = audioClip; + } + } + else + { + // 无前缀：使用当前定义所在包的路径 + var pack = Managers.DefineManager.Instance.GetDefinePackage(audioDef); + if (pack == null) + { + Debug.LogError($"AudioManager: 音频定义 '{audioDef.defName}' (路径: '{audioDef.path}'): 源音频未找到对应的定义包。无法确定完整路径。跳过。"); + continue; + } + var fullPath = Path.Combine(pack.packRootPath, audioDef.path).Replace('\\', '/'); + cacheKey = "file://" + fullPath.ToLower(); // 缓存键使用小写路径 + + // 检查音频缓存 + if (!audioCache.TryGetValue(cacheKey, out audioClip)) + { + audioClip = Configs.ConfigProcessor.LoadAudioByIO(fullPath).Result; + if (audioClip) + audioCache[cacheKey] = audioClip; + } + } + + // 资源加载失败 + if (audioClip == null) + { + Debug.LogError($"AudioManager: 未能加载音频定义关联的音频剪辑: '{audioDef.defName}' (路径: '{audioDef.path}')。请验证路径和文件是否存在。"); + continue; + } + + audioClips[audioDef.defName] = audioClip; // 使用 DefName 作为唯一键存储 + } + catch (Exception ex) + { + Debug.LogError( + $"AudioManager: 处理音频定义时出错: '{audioDef.defName}' (路径: '{audioDef.path}')。异常: {ex.GetType().Name}: {ex.Message}\n堆栈跟踪: {ex.StackTrace}"); + } + } + } + + /// + /// 清理所有已加载的音频剪辑数据。 + /// + /// + /// 此方法会清空 字典，释放对 AudioClip 对象的引用。 + /// 它不会卸载 ，因为它通常通过 Resources.Load 加载， + /// 其生命周期由 Unity 的资源管理系统控制，当不再被引用时会自动卸载。 + /// 对于通过 ConfigProcessor.LoadAudioClipByIO 加载的 AudioClip，如果它们不是通过 Unity API + /// 创建的 Unity.Object 类型，则可能需要额外的内存释放逻辑，但在本示例中，我们假设 + /// ConfigProcessor 会返回一个被 Unity 管理的 AudioClip。 + /// + public void Clear() + { + // 如果需要显式卸载从 Resources.Load 或外部文件加载的 AssetBundle 资源， + // 可能需要 Resources.UnloadAsset(clip) 或 AssetBundle.UnloadAllAssets(true)。 + // 但对于单独的 AudioClip 引用，通常在不再被引用时Unity会自动清理。 + audioClips.Clear(); + StepDescription = "音频管理器数据已清理。"; // 更新状态 + } + + /// + /// 重新加载所有音频数据。 + /// + /// + /// 此方法会首先调用 清理所有数据，然后调用 重新初始化。 + /// + public void Reload() + { + Clear(); + Init(); + } + + /// + /// 根据 对象获取对应的音频剪辑。 + /// + /// 包含音频名称的 对象。 + /// 如果找到对应的音频剪辑，则返回该剪辑；否则返回 。 + public AudioClip GetAudioClip(AudioDef audioDef) + { + if (audioDef == null) + { + Debug.LogWarning("AudioManager: 请求的 AudioDef 为空。返回默认音频。"); + return defaultAudioClip; + } + return GetAudioClip(audioDef.defName); + } + + /// + /// 根据音频名称（全局唯一的DefName）获取对应的音频剪辑。 + /// + /// 音频剪辑的名称。 + /// 如果找到对应的音频剪辑，则返回该剪辑；否则返回 。 + public AudioClip GetAudioClip(string name) + { + if (string.IsNullOrEmpty(name)) + { + Debug.LogWarning("AudioManager: 请求的音频名称为空或null。返回默认音频。"); + return defaultAudioClip; + } + + if (audioClips.TryGetValue(name, out var clip)) + return clip; + + // 如果未找到，返回默认音频剪辑 + Debug.LogWarning($"AudioManager: 未找到名称为 '{name}' 的音频剪辑。返回默认音频。"); + return defaultAudioClip; + } + } +} diff --git a/Client/Assets/Scripts/Managers/AudioManager.cs.meta b/Client/Assets/Scripts/Managers/AudioManager.cs.meta new file mode 100644 index 0000000..d23db8b --- /dev/null +++ b/Client/Assets/Scripts/Managers/AudioManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 42bb2c7fdd494670bc464905def6952f +timeCreated: 1756549944 \ No newline at end of file diff --git a/Client/Assets/Scripts/Managers/DefineManager.cs b/Client/Assets/Scripts/Managers/DefineManager.cs index 48cb107..cd485bf 100644 --- a/Client/Assets/Scripts/Managers/DefineManager.cs +++ b/Client/Assets/Scripts/Managers/DefineManager.cs @@ -67,17 +67,73 @@ namespace Managers if (packs.Count > 0) return; - // 获取所有定义包的文件夹路径 + // // 获取所有定义包的文件夹路径 + // var packFolder = Configs.ConfigProcessor.GetSubFolders(new(dataSetFilePath)); + // foreach (var folder in packFolder) + // { + // var pack = new DefinePack(); + // if (pack.LoadPack(folder)) + // { + // packs.Add(pack.packID, pack); + // } + // } var packFolder = Configs.ConfigProcessor.GetSubFolders(new(dataSetFilePath)); + + // 获取当前的加载顺序 + var currentOrder = Base.Setting.Instance.CurrentSettings.loadOrder; // 假设为 string[] + var isFirstLaunch = currentOrder == null || currentOrder.Length == 0; + + var newOrder = new List(); // 用于最终写回 + foreach (var folder in packFolder) { var pack = new DefinePack(); if (pack.LoadPack(folder)) { + // 根据加载顺序设置 priority + int priority; + + if (isFirstLaunch) + { + // 第一次启动，按遍历顺序设置 priority + // 暂时使用新增时的顺序作为 priority，顺序从 newOrder 的索引确定 + priority = newOrder.Count; + // 记录该 pack 的 ID，后续写回 loadOrder + newOrder.Add(pack.packID); + } + else + { + // 非首次启动，使用现有 loadOrder 中的位置来设置 priority + var idx = Array.IndexOf(currentOrder, pack.packID); + if (idx >= 0) + { + priority = idx; + } + else + { + // 未出现在现有顺序中，放在末尾 + priority = currentOrder.Length; + // 可选：也将其加入 newOrder 以更新 loadOrder + } + } + + pack.priority = priority; packs.Add(pack.packID, pack); } } +// 如果是第一次启动，写回 loadOrder（顺序为 newOrder） + if (isFirstLaunch) + { + // 将 newOrder 转换为 string[]，并写回设置 + Base.Setting.Instance.CurrentSettings.loadOrder = new string[newOrder.Count]; + newOrder.CopyTo(Base.Setting.Instance.CurrentSettings.loadOrder); + // 可能需要保存设置到磁盘/持久化 + // Example: Settings.Save(Base.Setting.Instance.CurrentSettings); + } + + + // 字段信息缓存，用于优化反射性能。 Dictionary fieldCache = new(); @@ -130,6 +186,7 @@ namespace Managers anonymousDefines.Add(typeName, new List()); anonymousDefines[typeName].Add(defRef); } + ProcessDefine(defRef); } } @@ -208,7 +265,8 @@ namespace Managers var value = FindDefine(defRef.Item3.description, defRef.Item3.defName); if (value == null) { - Debug.LogError($"未找到引用,出错的定义:定义类型:{defRef.Item1.GetType().Name}, 定义名:{defRef.Item1.defName} ; 类型:{defRef.Item3.description}, 定义名:{defRef.Item3.defName}"); + Debug.LogError( + $"未找到引用,出错的定义:定义类型:{defRef.Item1.GetType().Name}, 定义名:{defRef.Item1.defName} ; 类型:{defRef.Item3.description}, 定义名:{defRef.Item3.defName}"); continue; } @@ -352,7 +410,6 @@ namespace Managers // 如果结果为空，则返回 null。 if (result.Count == 0) { - Debug.LogWarning($"查询失败：未找到定义类型 '{defineType}'"); return null; } diff --git a/Client/Assets/Scripts/Managers/EntityManage.cs b/Client/Assets/Scripts/Managers/EntityManage.cs index be49657..e06af34 100644 --- a/Client/Assets/Scripts/Managers/EntityManage.cs +++ b/Client/Assets/Scripts/Managers/EntityManage.cs @@ -51,31 +51,44 @@ namespace Managers /// 默认实体的预制体，用于生成失败时的回退。 public EntityPrefab defaultEntityPrefab; - + public EntityPrefab[] GetAllEntities(string dimensionId) + { + if (!_dimensionFactionEntities.ContainsKey(dimensionId)) + { + Debug.LogWarning($"实体管理器：尝试在维度 '{dimensionId}' 中查找实体，但其内部存储未初始化。"); + return null; + } + // 获取对应维度的内层字典 + var factionEntitiesForDimension = _dimensionFactionEntities[dimensionId]; + // 使用 LINQ 的 SelectMany 方法来扁平化所有 LinkedList 中的 EntityPrefab + return factionEntitiesForDimension.Values // 获取所有 LinkedList 的集合 + .SelectMany(linkedList => linkedList) // 将每个 LinkedList 中的元素展开到一个单一的序列中 + .ToArray(); // 将该序列转换为一个数组 + } /// /// 在指定维度中，根据派系键查找所有实体。 /// /// 维度的唯一标识符。 /// 派系键。 /// 指定派系下的实体列表，如果未找到则返回空列表。 - public LinkedList FindEntitiesByFaction(string dimensionId, string factionKey) + public EntityPrefab[] FindEntitiesByFaction(string dimensionId, string factionKey) { // 如果在场景加载前或维度未在Program中注册，_dimensionFactionEntities可能还没有该维度ID的条目。 if (!_dimensionFactionEntities.ContainsKey(dimensionId)) { Debug.LogWarning($"实体管理器：尝试在维度 '{dimensionId}' 中查找实体，但其内部存储未初始化。"); - return new LinkedList(); + return null; } if (_dimensionFactionEntities.TryGetValue(dimensionId, out var factionDict)) { if (factionDict.TryGetValue(factionKey, out var entities)) { - return entities; + return entities.ToArray(); } } - return new LinkedList(); // 如果未找到，返回一个空列表 + return null; // 如果未找到，返回一个空列表 } /// diff --git a/Client/Assets/Scripts/Managers/EventManager.cs b/Client/Assets/Scripts/Managers/EventManager.cs index a39a6cd..b0b287c 100644 --- a/Client/Assets/Scripts/Managers/EventManager.cs +++ b/Client/Assets/Scripts/Managers/EventManager.cs @@ -1,181 +1,154 @@ -using Data; +using System; using System.Collections.Generic; +using System.Reflection; +using Data; +using EventWorkClass; +using Utils; using UnityEngine; -using EventType = Data.EventType; namespace Managers { - // 新增私有结构体，用于在事件队列中存储事件定义及其运行时上下文 - public struct EventPayload // Make it public if EventManager exposes it directly + /// + /// 事件管理器，负责事件的加载、注册和执行。 + /// 遵循单例模式，并在启动流程中扮演一个管理器角色。 + /// + class EventManager : Singleton, ILaunchManager { - public string DimensionId; - public EventDef EventDefinition; - public Vector3 Position; // 适用于 Character, Bullet, Pickup, DefaultEntity - public Vector3 Direction; // 仅适用于 Bullet - public Entity.Entity SourceEntity; // 仅适用于 Bullet (发射源) - public Vector3Int GridPosition; // 仅适用于 Building - } - - public class EventManager : Utils.MonoSingleton - { - private Queue _eventQueue = new Queue(); - - private EventManager() - { - /* Private constructor for singleton */ - } - - // =================================== - // 公共入队方法 - // =================================== - public void EnqueueCharacterSpawnEvent(string dimensionId, EventDef eventDef, Vector3 pos) - { - if (eventDef == null || eventDef.eventType != EventType.SpawnCharacter || - eventDef.entityDef_Character == null) - { - Debug.LogError( - $"EnqueueCharacterSpawnEvent: Invalid EventDef, mismatched EventType ({eventDef?.eventType}), or missing characterDef for event '{eventDef?.defName ?? "Unknown"}'."); - return; - } - - _eventQueue.Enqueue(new EventPayload - { - DimensionId = dimensionId, - EventDefinition = eventDef, - Position = pos, - }); - Debug.Log($"Event '{eventDef.defName}' (SpawnCharacter) enqueued for dimension {dimensionId} at {pos}."); - } - - public void EnqueueBuildingSpawnEvent(string dimensionId, EventDef eventDef, Vector3Int gridPos) - { - if (eventDef == null || eventDef.eventType != EventType.SpawnBuilding || - eventDef.entityDef_Building == null) - { - Debug.LogError( - $"EnqueueBuildingSpawnEvent: Invalid EventDef, mismatched EventType ({eventDef?.eventType}), or missing buildingDef for event '{eventDef?.defName ?? "Unknown"}'."); - return; - } - - _eventQueue.Enqueue(new EventPayload - { - DimensionId = dimensionId, - EventDefinition = eventDef, - GridPosition = gridPos, - }); - Debug.Log($"Event '{eventDef.defName}' (SpawnBuilding) enqueued for dimension {dimensionId} at grid {gridPos}."); - } - - public void EnqueueBulletSpawnEvent(string dimensionId, EventDef eventDef, Vector3 pos, Vector3 dir, - Entity.Entity source = null) - { - if (eventDef == null || eventDef.eventType != EventType.SpawnBullet || eventDef.entityDef_Bullet == null) - { - Debug.LogError( - $"EnqueueBulletSpawnEvent: Invalid EventDef, mismatched EventType ({eventDef?.eventType}), or missing bulletDef for event '{eventDef?.defName ?? "Unknown"}'."); - return; - } - - _eventQueue.Enqueue(new EventPayload - { - DimensionId = dimensionId, - EventDefinition = eventDef, - Position = pos, - Direction = dir, - SourceEntity = source, - }); - Debug.Log($"Event '{eventDef.defName}' (SpawnBullet) enqueued for dimension {dimensionId} at {pos}, dir {dir}."); - } - - public void EnqueuePickupSpawnEvent(string dimensionId, EventDef eventDef, Vector3 pos) - { - if (eventDef == null || eventDef.eventType != EventType.SpawnPickup || eventDef.entityDef_Pickup == null) - { - Debug.LogError( - $"EnqueuePickupSpawnEvent: Invalid EventDef, mismatched EventType ({eventDef?.eventType}), or missing itemDef for event '{eventDef?.defName ?? "Unknown"}'."); - return; - } - - _eventQueue.Enqueue(new EventPayload - { - DimensionId = dimensionId, - EventDefinition = eventDef, - Position = pos, - }); - Debug.Log($"Event '{eventDef.defName}' (SpawnPickup) enqueued for dimension {dimensionId} at {pos}."); - } - - public void EnqueueDefaultEntitySpawnEvent(string dimensionId, EventDef eventDef, Vector3 pos) - { - if (eventDef == null || eventDef.eventType != EventType.SpawnDefaultEntity) - { - Debug.LogError( - $"EnqueueDefaultEntitySpawnEvent: Invalid EventDef or mismatched EventType ({eventDef?.eventType}) for event '{eventDef?.defName ?? "Unknown"}'."); - return; - } - - _eventQueue.Enqueue(new EventPayload - { - DimensionId = dimensionId, - EventDefinition = eventDef, - Position = pos, - }); - Debug.Log($"Event '{eventDef.defName}' (SpawnDefaultEntity) enqueued for dimension {dimensionId} at {pos}."); - } - - // =================================== - // 事件处理方法 - // =================================== /// - /// 处理所有在队列中的待处理事件。 + /// 存储所有已加载的事件定义，键为事件名称，值为对应的事件工作类实例。 /// - public void ProcessEvents() + public Dictionary EventDefs { get; private set; } = null; + + /// + /// 获取当前加载步骤的描述，用于启动流程的进度显示。 + /// + public string StepDescription => "正在载入事件"; + + /// + /// 初始化事件管理器，从定义管理器中加载所有事件定义并实例化其工作类。 + /// + public void Init() { - while (_eventQueue.Count > 0) + // 如果事件定义已经加载，则直接返回，避免重复初始化。 + if (EventDefs != null) + return; + + var defs = DefineManager.Instance.QueryDefinesByType(); + EventDefs = new Dictionary(); + foreach (var def in defs) { - EventPayload eventData = _eventQueue.Dequeue(); - if (!Program.Instance.GetDimension(eventData.DimensionId)) + if (EventDefs.ContainsKey(def.defName)) { - Debug.LogWarning( - $"Event '{eventData.EventDefinition.defName}' for dimension {eventData.DimensionId} dropped as dimension is no longer active."); + Debug.LogWarning($"警告：事件名称重复，已跳过加载名称为 {def.defName} 的事件定义。"); continue; } - - // 核心：调用 EntityManage.Instance 的现有公共方法 - switch (eventData.EventDefinition.eventType) + var eventWorker = GetAndInstantiateEventWorker(def.workClass); + if (eventWorker == null) { - case EventType.SpawnCharacter: - EntityManage.Instance.GenerateEntity(eventData.DimensionId, - eventData.EventDefinition.entityDef_Character, eventData.Position); - break; - case EventType.SpawnBuilding: - EntityManage.Instance.GenerateBuildingEntity(eventData.DimensionId, - eventData.EventDefinition.entityDef_Building, eventData.GridPosition); - break; - case EventType.SpawnBullet: - EntityManage.Instance.GenerateBulletEntity(eventData.DimensionId, - eventData.EventDefinition.entityDef_Bullet, eventData.Position, eventData.Direction, - eventData.SourceEntity); - break; - case EventType.SpawnPickup: - EntityManage.Instance.GeneratePickupEntity(eventData.DimensionId, - eventData.EventDefinition.entityDef_Pickup, eventData.Position); - break; - case EventType.SpawnDefaultEntity: - EntityManage.Instance.GenerateDefaultEntity(eventData.DimensionId, eventData.Position); - break; - case EventType.None: - default: - Debug.LogWarning( - $"EventManager: Unhandled or invalid event type: {eventData.EventDefinition.eventType} for event '{eventData.EventDefinition.defName}'."); - break; + Debug.LogWarning($"警告：未能找到或实例化名称为 '{def.workClass}' 的事件工作类，已跳过加载名称为 '{def.defName}' 的事件定义。"); + continue; } + eventWorker.Init(def.value); + EventDefs.Add(def.defName, eventWorker); + } + Debug.Log($"事件管理器初始化完成，共载入 {EventDefs.Count} 个事件。"); + } + + /// + /// 清理事件管理器，释放所有已加载的事件定义。 + /// + public void Clear() + { + EventDefs = null; + Debug.Log("事件管理器已清理。"); + } + + /// + /// 执行指定名称的事件。 + /// + /// 要执行的事件的名称。 + /// 事件执行的维度ID，如果为null，将使用当前焦点的维度ID。 + public void Action(string eventName, string dimensionID = null) + { + if (EventDefs == null) + { + Debug.LogError($"错误：事件管理器尚未初始化或已被清理。无法执行事件 '{eventName}'。"); + return; + } + + if (!EventDefs.ContainsKey(eventName)) + { + Debug.LogWarning($"警告：未能找到名称为 '{eventName}' 的事件定义，已跳过执行该事件。"); + return; + } + // 假设 Program.Instance 和 FocusedDimensionId 存在且可访问。 + // 如果 dimensionID 为 null，则使用当前焦点维度ID。 + dimensionID ??= Program.Instance.FocusedDimensionId; + EventDefs[eventName].Run(dimensionID); + } + + /// + /// 根据类名从指定命名空间和程序集下获取并实例化一个 的子类。 + /// + /// 要实例化的类的短名称（不包含命名空间）。 + /// 目标类所在的完整命名空间。 + /// 要搜索的程序集。如果为 null，将搜索 所在的程序集。 + /// 实例化后的 对象，如果找不到或不符合条件则返回 null。 + public static EventWorkClassBase GetAndInstantiateEventWorker( + string className, + string targetNamespace = "EventWorkClass", // 默认命名空间 + Assembly assemblyToSearch = null) // 默认程序集 + { + // 1. 确定要搜索的程序集。 + if (assemblyToSearch == null) + { + // 默认从 EventWorkClassBase 所在的程序集查找，通常其实现类也会在这个程序集。 + assemblyToSearch = typeof(EventWorkClassBase).Assembly; + } + + // 2. 构造完整的类型名称。 + string fullTypeName = $"{targetNamespace}.{className}"; + Type targetType = null; + + // 3. 尝试直接从程序集获取类型。 + targetType = assemblyToSearch.GetType(fullTypeName); + + // 4. 进行类型检查。 + if (targetType == null) + { + Debug.LogError($"错误：在程序集 '{assemblyToSearch.FullName}' 的命名空间 '{targetNamespace}' 中未找到类 '{className}'。"); + return null; + } + // 检查是否是 EventWorkClassBase 的子类。 + if (!typeof(EventWorkClassBase).IsAssignableFrom(targetType)) + { + Debug.LogError($"错误：类 '{fullTypeName}' 不是 '{typeof(EventWorkClassBase).FullName}' 的子类。"); + return null; + } + // 检查是否可以实例化（非抽象类，非接口）。 + if (targetType.IsAbstract || targetType.IsInterface) + { + Debug.LogError($"错误：类 '{fullTypeName}' 是抽象类或接口，不能直接实例化。"); + return null; + } + + // 5. 实例化对象。 + try + { + // 使用 Activator.CreateInstance 实例化对象。它默认调用无参公共构造函数。 + object instance = Activator.CreateInstance(targetType); + return instance as EventWorkClassBase; + } + catch (MissingMethodException ex) + { + Debug.LogError($"错误：类 '{fullTypeName}' 没有公共的无参构造函数。详情: {ex.Message}"); + return null; + } + catch (Exception ex) + { + Debug.LogError($"实例化类 '{fullTypeName}' 时发生未知错误。详情: {ex.Message}"); + return null; } } - - protected override void OnStart() - { - throw new System.NotImplementedException(); - } } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/Managers/ILaunchManager.cs b/Client/Assets/Scripts/Managers/ILaunchManager.cs index 3b70db6..d47d3ad 100644 --- a/Client/Assets/Scripts/Managers/ILaunchManager.cs +++ b/Client/Assets/Scripts/Managers/ILaunchManager.cs @@ -3,6 +3,7 @@ namespace Managers public interface ILaunchManager { string StepDescription { get; } // 获取当前加载步骤的描述 + void Init(); // 初始化管理器 void Clear(); // 清理管理器，用于重载 } diff --git a/Client/Assets/Scripts/Managers/PackagesImageManager.cs b/Client/Assets/Scripts/Managers/PackagesImageManager.cs index 7528ec5..00035c5 100644 --- a/Client/Assets/Scripts/Managers/PackagesImageManager.cs +++ b/Client/Assets/Scripts/Managers/PackagesImageManager.cs @@ -22,20 +22,14 @@ namespace Managers public Sprite defaultSprite; /// - /// 存储所有已加载的纹理，按包ID和图像名称索引。 + /// 存储所有已加载的纹理，按图像名称（全局唯一的DefName）索引。 /// - /// - /// 外层字典键是包ID，内层字典键是图像名称。 - /// - public Dictionary> packagesImages = new(); + public Dictionary packagesImages = new(); /// - /// 存储所有已创建的精灵，按包ID和精灵名称索引。 + /// 存储所有已创建的精灵，按精灵名称（全局唯一的DefName或其带索引后缀）索引。 /// - /// - /// 外层字典键是包ID，内层字典键是精灵名称（如果纹理被分割，会包含索引后缀）。 - /// - public Dictionary> sprites = new(); + public Dictionary sprites = new(); /// /// 获取当前启动步骤的描述。 @@ -49,21 +43,15 @@ namespace Managers { if (packagesImages.Count > 0) { - // 如果已经加载过，直接返回。 - StepDescription = "包图像管理器已初始化。"; - return; + // 如果已经有数据，则跳过初始化，防止重复加载。 + return; } - - StepDescription = "正在加载默认精灵..."; // 更新加载步骤描述 defaultSprite = Resources.Load("Default/DefaultImage"); if (defaultSprite == null) { Debug.LogWarning("无法加载默认精灵 'Resources/Default/DefaultImage'。请确保文件存在。"); } - - StepDescription = "正在处理图像定义并创建精灵..."; // 更新加载步骤描述 InitImageDef(); - StepDescription = "包图像管理器初始化完成。"; // 完成加载 } /// @@ -76,7 +64,7 @@ namespace Managers if (imageDef == null || !imageDef.Any()) { - Debug.Log($"在 DefineManager 中未找到任何 ImageDef 定义。({typeof(ImageDef).Name})"); + Debug.Log($"在定义管理器中未找到任何图像定义。({nameof(ImageDef)})"); return; } @@ -84,7 +72,7 @@ namespace Managers { if (string.IsNullOrEmpty(ima.path) || string.IsNullOrEmpty(ima.packID)) { - Debug.LogWarning($"跳过图像定义 '{ima?.name ?? "未知"}'，因为它包含空路径或包ID。(路径: '{ima?.path ?? ""}', 包ID: '{ima?.packID ?? ""}')"); + Debug.LogWarning($"跳过图像定义 '{ima?.defName ?? "未知"}'，因为它包含空路径或包ID。(路径: '{ima?.path ?? ""}', 包ID: '{ima?.packID ?? ""}')"); continue; } @@ -119,7 +107,7 @@ namespace Managers var packageRoot = Managers.DefineManager.Instance.GetPackagePath(packageID); if (string.IsNullOrEmpty(packageRoot)) { - Debug.LogWarning($"图像定义 '{ima.name}' (包ID: {ima.packID}): 引用的包ID '{packageID}' 未找到或没有根路径。跳过图像加载。"); + Debug.LogWarning($"图像定义 '{ima.defName}' (包ID: {ima.packID}): 引用的包ID '{packageID}' 未找到或没有根路径。跳过图像加载。"); continue; } @@ -140,7 +128,7 @@ namespace Managers var pack = Managers.DefineManager.Instance.GetDefinePackage(ima); if (pack == null) { - Debug.LogError($"图像定义 '{ima.name}' (包ID: {ima.packID}): 源图像未找到对应的定义包。无法确定 '{ima.path}' 的完整路径。跳过。"); + Debug.LogError($"图像定义 '{ima.defName}' (包ID: {ima.packID}): 源图像未找到对应的定义包。无法确定 '{ima.path}' 的完整路径。跳过。"); continue; } var fullPath = Path.Combine(pack.packRootPath, ima.path).Replace('\\', '/'); @@ -158,31 +146,20 @@ namespace Managers // 资源加载失败 if (!texture) { - Debug.LogError($"未能加载图像定义所在的纹理: '{ima.name}' (路径: '{ima.path}', 包ID: '{ima.packID}')。请验证路径和文件是否存在。"); + Debug.LogError($"未能加载图像定义关联的纹理: '{ima.defName}' (路径: '{ima.path}', 包ID: '{ima.packID}')。请验证路径和文件是否存在。"); continue; } - // 存储到包纹理字典（使用定义自身的 packID） - var packId = ima.packID; - if (!packagesImages.ContainsKey(packId)) - packagesImages[packId] = new Dictionary(); - - // 警告：如果图片名重复，则覆盖 - if (packagesImages[packId].ContainsKey(ima.name)) - { - Debug.LogWarning($"包 '{packId}' 中名为 '{ima.name}' 的图像被多次定义。将覆盖之前的纹理引用。这可能表示配置错误。"); - } - packagesImages[packId][ima.name] = texture; // 覆盖或添加 - + packagesImages[ima.defName] = texture; // 切分精灵 - SplitTextureIntoSprites(packId, ima.name, texture, ima.hCount, ima.wCount, ima.pixelsPerUnit); + SplitTextureIntoSprites(ima.defName, texture, ima.hCount, ima.wCount, ima.pixelsPerUnit); } catch (Exception ex) { // 捕获异常并打印详细错误信息 Debug.LogError( - $"处理图像定义时出错: '{ima.name}' (路径: '{ima.path}', 包ID: '{ima.packID}')。异常: {ex.GetType().Name}: {ex.Message}\n堆栈跟踪: {ex.StackTrace}"); + $"处理图像定义时出错: '{ima.defName}' (路径: '{ima.path}', 包ID: '{ima.packID}')。异常: {ex.GetType().Name}: {ex.Message}\n堆栈跟踪: {ex.StackTrace}"); } } } @@ -190,14 +167,12 @@ namespace Managers /// /// 将纹理按指定行数和列数分割成多个精灵，并存储起来。 /// - /// 精灵所属的包ID。 - /// 精灵的基础名称。 + /// 精灵的基础名称（全局唯一的DefName）。 /// 要分割的 对象。 /// 水平分割的行数。 /// 垂直分割的列数。 /// 每个单元的像素数，用于Sprite.Create。 private void SplitTextureIntoSprites( - string packId, string baseName, Texture2D texture, int rows, @@ -206,7 +181,7 @@ namespace Managers { if (!texture) { - Debug.LogError($"SplitTextureIntoSprites: 包 '{packId}' 中 '{baseName}' 提供的纹理为空。无法分割。"); + Debug.LogError($"SplitTextureIntoSprites: '{baseName}' 提供的纹理为空。无法分割。"); return; } @@ -217,19 +192,11 @@ namespace Managers var textureWidth = texture.width; var textureHeight = texture.height; - if (!sprites.ContainsKey(packId)) - sprites[packId] = new Dictionary(); - - // 创建未分割的完整精灵，使用原始名称 + // 创建未分割的完整精灵，使用原始名称 (baseName，即 ImageDef.name) var fullSpriteRect = new Rect(0, 0, textureWidth, textureHeight); - // 警告：如果精灵名重复，则覆盖 - if (sprites[packId].ContainsKey(baseName)) - { - Debug.LogWarning($"包 '{packId}' 中名为 '{baseName}' 的精灵已存在。将覆盖之前的完整精灵定义。"); - } var fullSprite = Sprite.Create(texture, fullSpriteRect, new Vector2(0.5f, 0.5f), pixelsPerUnit); fullSprite.name = baseName; // 确保 Sprite.name 被设置 - sprites[packId][baseName] = fullSprite; + sprites[baseName] = fullSprite; // 如果不分割（rows和cols都为1），提前返回 if (rows == 1 && cols == 1) @@ -240,7 +207,7 @@ namespace Managers // 检查纹理尺寸是否可被分割数整除 if (textureWidth % cols != 0 || textureHeight % rows != 0) { - Debug.LogError($"包 '{packId}' 中 '{baseName}' 的纹理尺寸 ({textureWidth}x{textureHeight}) 不能被指定的行数 ({rows}) 和列数 ({cols}) 完美整除。子精灵将不会生成或可能不正确。仅显示完整精灵。"); + Debug.LogError($"'{baseName}' 的纹理尺寸 ({textureWidth}x{textureHeight}) 不能被指定的行数 ({rows}) 和列数 ({cols}) 完美整除。子精灵将不会生成或可能不正确。仅显示完整精灵。"); return; // 终止子精灵分割，只保留完整的精灵 } @@ -253,18 +220,11 @@ namespace Managers { Rect spriteRect = new(col * tileWidth, row * tileHeight, tileWidth, tileHeight); var sprite = Sprite.Create(texture, spriteRect, new Vector2(0.5f, 0.5f), pixelsPerUnit); - // 精灵索引计算方式 var index = (rows - row - 1) * cols + col; var spriteName = $"{baseName}_{index}"; sprite.name = spriteName; - - // 警告：如果子精灵名重复，则覆盖 - if (sprites[packId].ContainsKey(spriteName)) - { - Debug.LogWarning($"包 '{packId}' 中名为 '{spriteName}' 的精灵已存在。将覆盖之前的子精灵定义。这可能表示配置错误。"); - } - sprites[packId][spriteName] = sprite; + sprites[spriteName] = sprite; } } } @@ -299,36 +259,24 @@ namespace Managers /// /// 根据 对象获取对应的精灵。 /// - /// 包含精灵包ID和名称的 对象。 + /// 包含精灵名称的 对象。 /// 如果找到对应的精灵，则返回该精灵；否则返回 。 public Sprite GetSprite(ImageDef ima) { - if (ima == null) return defaultSprite; - return GetSprite(ima.packID, ima.name); + if (ima == null) return defaultSprite; + return GetSprite(ima.packID, ima.defName); } /// /// 根据包ID和精灵名称获取对应的精灵。 /// - /// 精灵所属的包ID。如果为空，则会遍历所有包查找。 - /// 精灵的名称。 + /// 精灵所属的包ID。此参数在此版本中已不再用于字典查找，但为保持兼容性而保留。 + /// 精灵的名称（全局唯一的DefName）。 /// 如果找到对应的精灵，则返回该精灵；否则返回 。 public Sprite GetSprite(string packID, string name) { - if (string.IsNullOrEmpty(packID)) - { - // 如果packID为空，遍历所有包以name查找 - foreach (var kvp in sprites) - { - if (kvp.Value.TryGetValue(name, out var sprite)) - return sprite; - } - } - else if (sprites.TryGetValue(packID, out var dict)) - { - if (dict.TryGetValue(name, out var sprite)) - return sprite; - } + if (sprites.TryGetValue(name, out var sprite)) + return sprite; // 如果未找到，返回默认精灵 return defaultSprite; @@ -337,14 +285,40 @@ namespace Managers /// /// 根据包ID、基础名称和索引获取被分割的子精灵。 /// - /// 精灵所属的包ID。 - /// 精灵的基础名称。 + /// 精灵所属的包ID。此参数在此版本中已不再用于字典查找，但为保持兼容性而保留。 + /// 精灵的基础名称（全局唯一的DefName）。 /// 子精灵的索引。 /// 如果找到对应的子精灵，则返回该精灵；否则返回 。 public Sprite GetSprite(string packID, string name, int index) { var fullName = $"{name}_{index}"; - return GetSprite(packID, fullName); + return GetSprite(packID, fullName); + } + + // ---------- 新增的查询接口 ---------- + + /// + /// 根据精灵名称（全局唯一的DefName）获取对应的精灵。 + /// + /// 精灵的名称。 + /// 如果找到对应的精灵，则返回该精灵；否则返回 。 + public Sprite GetSprite(string name) + { + if (sprites.TryGetValue(name, out var sprite)) + return sprite; + return defaultSprite; + } + + /// + /// 根据基础名称（全局唯一的DefName）和索引获取被分割的子精灵。 + /// + /// 精灵的基础名称。 + /// 子精灵的索引。 + /// 如果找到对应的子精灵，则返回该精灵；否则返回 。 + public Sprite GetSprite(string name, int index) + { + var fullName = $"{name}_{index}"; + return GetSprite(fullName); } } } diff --git a/Client/Assets/Scripts/Managers/SaveManager.cs b/Client/Assets/Scripts/Managers/SaveManager.cs new file mode 100644 index 0000000..302c8be --- /dev/null +++ b/Client/Assets/Scripts/Managers/SaveManager.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using Entity; + +namespace Managers +{ + public class SaveManager:Utils.Singleton + { + public List baseHediffs = new(); + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Managers/SaveManager.cs.meta b/Client/Assets/Scripts/Managers/SaveManager.cs.meta new file mode 100644 index 0000000..5367d98 --- /dev/null +++ b/Client/Assets/Scripts/Managers/SaveManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: daa6e65f38a5495492e994e89eba53f4 +timeCreated: 1756655387 \ No newline at end of file diff --git a/Client/Assets/Scripts/Map/Dimension.cs b/Client/Assets/Scripts/Map/Dimension.cs index 16c9dba..6e86c6f 100644 --- a/Client/Assets/Scripts/Map/Dimension.cs +++ b/Client/Assets/Scripts/Map/Dimension.cs @@ -17,6 +17,8 @@ namespace Map [SerializeField] public MapGenerator mapGenerator; public Vector3 cameraPosition; + + public Entity.Entity focusEntity; /// /// 获取此维度的唯一标识符。 /// @@ -42,39 +44,27 @@ namespace Map private void Awake() { - // 1. 确保 DimensionId 已初始化，这会触发 DimensionId 属性的 getter 逻辑 var id = DimensionId; // 2. 创建一个用于存放此维度下所有实体的根GameObject，方便管理 var rootObj = new GameObject($"_Entities_{id}"); rootObj.transform.SetParent(this.transform); // 将其作为Dimension对象的子对象 DimensionRoot = rootObj.transform; - // 3. 注册此维度到 Program - if (Program.Instance != null) // 检查单例是否仍然存在 - { - Program.Instance.RegisterDimension(this); - } - else - { - Debug.LogError( - "[Dimension] Program.Instance is null during Dimension Awake. Cannot register dimension.", this); - } - + Program.Instance.RegisterDimension(this); + + mapGenerator.Init(); + var size = mapGenerator.baseMap.GetSize(); + cameraPosition = new Vector3(size.x / 2f, size.y / 2f, -10)+transform.position; // 5. 处理 defaultOpen 逻辑，设置Program的焦点维度 // 确保在自身注册到 Program 之后再设置焦点，这样 Program 内部才能找到它 - if (defaultOpen && Program.Instance != null) + if (defaultOpen) { Program.Instance.SetFocusedDimension(_dimensionId); } } - - private void Start() - { - var size = mapGenerator.baseMap.GetSize(); - cameraPosition = new Vector3(size.x / 2f, size.y / 2f, -10) + transform.position; - } + private void OnDestroy() { diff --git a/Client/Assets/Scripts/Map/MapGenerator.cs b/Client/Assets/Scripts/Map/MapGenerator.cs index e6b3b3a..9e97830 100644 --- a/Client/Assets/Scripts/Map/MapGenerator.cs +++ b/Client/Assets/Scripts/Map/MapGenerator.cs @@ -6,8 +6,8 @@ namespace Map public class MapGenerator : MonoBehaviour { public DoubleMap baseMap; - - private void Awake() + + public void Init() { Managers.DefineManager.Instance.Init(); Managers.PackagesImageManager.Instance.Init(); @@ -26,8 +26,16 @@ namespace Map } baseMap.RefreshAllTiles(); - CameraControl.CameraControl.Instance.SetPosition(new Vector3(size * 0.5f, size * 0.5f, -10)); } + public Vector2Int GetSize() + { + return baseMap.GetSize(); + } + + public Vector2Int GetWorldCoordinates(Vector2Int mapCoordinates) + { + return new Vector2Int((int)transform.position.x, (int)transform.position.y) + mapCoordinates; + } } } \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/BaseAnimator.cs b/Client/Assets/Scripts/Prefab/BaseAnimator.cs new file mode 100644 index 0000000..584731e --- /dev/null +++ b/Client/Assets/Scripts/Prefab/BaseAnimator.cs @@ -0,0 +1,138 @@ +// Base/BaseAnimator.cs +using System; +using UnityEngine; +using Base; // 假设ITick接口在这个命名空间 + +namespace Base +{ + // 抽象基类，封装通用动画逻辑 + public abstract class BaseAnimator : MonoBehaviour, ITick + { + // 通用公开字段（可在编辑器中设置） + [SerializeField] protected Sprite[] _sprites; // 动画精灵序列 + [SerializeField] protected float _fps = 2; // 每秒帧数 + [SerializeField] protected Sprite _staticSprite; // 暂停时的静态精灵 + + // 通用内部状态 + protected bool _isPaused; // 暂停状态 + protected float _frameTimer; // 帧计时器 + protected int _currentFrameIndex; // 当前帧索引 + + // 抽象方法：子类必须实现以获取并验证其特有的显示组件 + protected abstract void ValidateComponent(); + + // 抽象方法：子类必须实现以设置实际显示组件的Sprite + protected abstract void SetDisplaySprite(Sprite sprite); + + protected virtual void Awake() + { + ValidateComponent(); // 子类获取组件 + ValidateStartFrame(); // 初始化第一帧 + } + + // ITick接口实现 + public void Tick() + { + var deltaTime = Time.deltaTime; + if (_isPaused) + { + HandlePausedState(); + return; + } + + PlayAnimation(deltaTime); + } + + protected void ValidateStartFrame() + { + // 确保有精灵时可显示有效帧 + if (_sprites != null && _sprites.Length > 0) + { + _currentFrameIndex = Mathf.Clamp(_currentFrameIndex, 0, _sprites.Length - 1); + SetDisplaySprite(_sprites[_currentFrameIndex]); // 调用抽象方法设置Sprite + } + else + { + SetDisplaySprite(null); // 调用抽象方法清空Sprite + } + } + + protected void HandlePausedState() + { + // 优先使用静态精灵，否则保持当前帧 + if (_staticSprite) + { + SetDisplaySprite(_staticSprite); // 调用抽象方法设置Sprite + } + // 否则，保持当前显示的Sprite，不需要额外操作（SetDisplaySprite已在NextFrame中设置） + } + + protected void PlayAnimation(float deltaTime) + { + if (_sprites == null || _sprites.Length == 0) + { + // 如果没有精灵，确保显示组件的Sprite被清除 + SetDisplaySprite(null); + return; + } + + // 更新帧计时器 + _frameTimer += deltaTime; + var frameDuration = 1f / _fps; + + // 检查帧切换条件 + while (_frameTimer >= frameDuration) + { + _frameTimer -= frameDuration; + NextFrame(); + } + } + + protected void NextFrame() + { + if (_sprites == null || _sprites.Length == 0) return; + + // 循环播放动画 + _currentFrameIndex = (_currentFrameIndex + 1) % _sprites.Length; + SetDisplaySprite(_sprites[_currentFrameIndex]); // 调用抽象方法更新Sprite + } + + // 外部控制方法 + public void SetPaused(bool paused) => _isPaused = paused; + + public void SetSprites(Sprite[] newSprites) + { + _sprites = newSprites; + + // 如果有新的精灵数组，则立即显示第一帧 + if (_sprites != null && _sprites.Length > 0) + { + _currentFrameIndex = 0; // 重置当前帧索引为第一帧 + SetDisplaySprite(_sprites[_currentFrameIndex]); // 立即显示第一帧 + } + else + { + SetDisplaySprite(null); // 如果没有精灵，则清空渲染器 + } + + // 重置帧计时器，以确保从头开始播放 + _frameTimer = 0f; + } + + public void Restore() + { + _currentFrameIndex = 0; + if (_sprites != null && _sprites.Length > 0) + { + SetDisplaySprite(_sprites[_currentFrameIndex]); // 恢复到第一帧 + } + else + { + SetDisplaySprite(null); + } + } + + public void SetFPS(float newFPS) => _fps = Mathf.Max(0.1f, newFPS); + public void SetStaticSprite(Sprite sprite) => _staticSprite = sprite; + } +} diff --git a/Client/Assets/Scripts/Prefab/BaseAnimator.cs.meta b/Client/Assets/Scripts/Prefab/BaseAnimator.cs.meta new file mode 100644 index 0000000..3a6c8ef --- /dev/null +++ b/Client/Assets/Scripts/Prefab/BaseAnimator.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 84dda25302c44253949e7818cd62b7e7 +timeCreated: 1756778358 \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/BuffIconUI.cs b/Client/Assets/Scripts/Prefab/BuffIconUI.cs new file mode 100644 index 0000000..bba9550 --- /dev/null +++ b/Client/Assets/Scripts/Prefab/BuffIconUI.cs @@ -0,0 +1,10 @@ +using UI; +using UnityEngine; + +namespace Prefab +{ + public class BuffIconUI: MonoBehaviour + { + public UIImageAnimator icon; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/BuffIconUI.cs.meta b/Client/Assets/Scripts/Prefab/BuffIconUI.cs.meta new file mode 100644 index 0000000..7dc7161 --- /dev/null +++ b/Client/Assets/Scripts/Prefab/BuffIconUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 17587b13f9d4467dbff77cf9762dc8fe +timeCreated: 1756780876 \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/SpriteAnimator.cs b/Client/Assets/Scripts/Prefab/SpriteAnimator.cs index 9448abe..bd8be9a 100644 --- a/Client/Assets/Scripts/Prefab/SpriteAnimator.cs +++ b/Client/Assets/Scripts/Prefab/SpriteAnimator.cs @@ -1,114 +1,36 @@ -using Base; using UnityEngine; +using Base; // 引入Base命名空间以使用BaseAnimator namespace Prefab { [RequireComponent(typeof(SpriteRenderer))] - public class SpriteAnimator : MonoBehaviour, ITick + public class SpriteAnimator : BaseAnimator { - // 公开字段（可在编辑器中设置） - [SerializeField] private Sprite[] _sprites; // 动画精灵序列 - [SerializeField] private float _fps = 2; // 每秒帧数 - [SerializeField] private Sprite _staticSprite; // 暂停时的静态精灵 - private SpriteRenderer _renderer; // 渲染器组件 - private bool _isPaused; // 暂停状态 - private float _frameTimer; // 帧计时器 - private int _currentFrameIndex; // 当前帧索引 - private void Awake() + protected override void ValidateComponent() { _renderer = GetComponent(); - ValidateStartFrame(); - } - - // ITick接口实现 - public void Tick() - { - var deltaTime = Time.deltaTime; - if (_isPaused) + if (_renderer == null) { - HandlePausedState(); - return; - } - - PlayAnimation(deltaTime); - } - - private void ValidateStartFrame() - { - // 确保有精灵时可显示有效帧 - if (_sprites != null && _sprites.Length > 0) - { - _currentFrameIndex = Mathf.Clamp(_currentFrameIndex, 0, _sprites.Length - 1); - _renderer.sprite = _sprites[_currentFrameIndex]; - } - else - { - _renderer.sprite = null; + Debug.LogError("SpriteAnimator requires a SpriteRenderer component.", this); + enabled = false; // 禁用脚本如果组件缺失 } } - private void HandlePausedState() + protected override void SetDisplaySprite(Sprite sprite) { - // 优先使用静态精灵，否则保持当前帧 - if (_staticSprite) + if (_renderer != null) { - _renderer.sprite = _staticSprite; + _renderer.sprite = sprite; } } - private void PlayAnimation(float deltaTime) - { - if (_sprites == null || _sprites.Length == 0) return; - - // 更新帧计时器 - _frameTimer += deltaTime; - var frameDuration = 1f / _fps; - - // 检查帧切换条件 - while (_frameTimer >= frameDuration) - { - _frameTimer -= frameDuration; - NextFrame(); - } - } - - private void NextFrame() - { - // 循环播放动画 - _currentFrameIndex = (_currentFrameIndex + 1) % _sprites.Length; - _renderer.sprite = _sprites[_currentFrameIndex]; - } - - // 外部控制方法 - public void SetPaused(bool paused) => _isPaused = paused; - public void SetSprites(Sprite[] newSprites) - { - _sprites = newSprites; - - // 如果有新的精灵数组，则立即显示第一帧 - if (_sprites != null && _sprites.Length > 0) - { - _currentFrameIndex = 0; // 重置当前帧索引为第一帧 - _renderer.sprite = _sprites[_currentFrameIndex]; // 立即显示第一帧 - } - else - { - _renderer.sprite = null; // 如果没有精灵，则清空渲染器 - } - - // 重置帧计时器，以确保从头开始播放 - _frameTimer = 0f; - } - - public void Restore() - { - _currentFrameIndex = 0; - _renderer.sprite = _sprites[_currentFrameIndex]; - } - - public void SetFPS(float newFPS) => _fps = Mathf.Max(0.1f, newFPS); - public void SetStaticSprite(Sprite sprite) => _staticSprite = sprite; + // [可选] 如果SpriteAnimator需要任何Awake后特有的初始化逻辑，可以在这里重写 + // protected override void Awake() + // { + // base.Awake(); // 确保调用基类的Awake + // // 子类特有的初始化 + // } } } \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/UIImageAnimator.cs b/Client/Assets/Scripts/Prefab/UIImageAnimator.cs new file mode 100644 index 0000000..a5d2379 --- /dev/null +++ b/Client/Assets/Scripts/Prefab/UIImageAnimator.cs @@ -0,0 +1,38 @@ +// UI/UIImageAnimator.cs +using UnityEngine; +using UnityEngine.UI; +using Base; // 引入Base命名空间以使用BaseAnimator + +namespace UI +{ + [RequireComponent(typeof(Image))] + public class UIImageAnimator : BaseAnimator // 继承BaseAnimator + { + private Image _image; // UI Image组件 + + protected override void ValidateComponent() + { + _image = GetComponent(); + if (_image == null) + { + Debug.LogError("UIImageAnimator requires an Image component.", this); + enabled = false; // 禁用脚本如果组件缺失 + } + } + + protected override void SetDisplaySprite(Sprite sprite) + { + if (_image) + { + _image.sprite = sprite; + } + } + + // [可选] 如果UIImageAnimator需要任何Awake后特有的初始化逻辑，可以在这里重写 + // protected override void Awake() + // { + // base.Awake(); // 确保调用基类的Awake + // // 子类特有的初始化 + // } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Prefab/UIImageAnimator.cs.meta b/Client/Assets/Scripts/Prefab/UIImageAnimator.cs.meta new file mode 100644 index 0000000..b8ebcfb --- /dev/null +++ b/Client/Assets/Scripts/Prefab/UIImageAnimator.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c6f899d1c5ef450bb6f3e670fa55cffd +timeCreated: 1756778168 \ No newline at end of file diff --git a/Client/Assets/Scripts/Program.cs b/Client/Assets/Scripts/Program.cs index 1cb0735..6ec9842 100644 --- a/Client/Assets/Scripts/Program.cs +++ b/Client/Assets/Scripts/Program.cs @@ -5,6 +5,9 @@ using System.Linq; using UnityEngine; using Utils; + + + /// /// Program 类作为单例模式的核心管理器，负责维护和管理游戏或应用中的维度(Dimension)实例和焦点状态。 /// 它提供了维度注册、注销、获取以及焦点维度设置的功能。 @@ -205,6 +208,8 @@ public class Program : Singleton // 更新内部状态 FocusedEntity = entity; + if(FocusedDimension) + FocusedDimension.focusEntity=entity; // 触发事件，将新的焦点实体（或 null）作为参数传递。 OnFocusedEntityChanged?.Invoke(FocusedEntity); diff --git a/Client/Assets/Scripts/UI/AttackModeUI.cs b/Client/Assets/Scripts/UI/AttackModeUI.cs new file mode 100644 index 0000000..51a958c --- /dev/null +++ b/Client/Assets/Scripts/UI/AttackModeUI.cs @@ -0,0 +1,16 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +namespace UI +{ + public class AttackModeUI:MonoBehaviour + { + public UIImageAnimator icon; + + private void Start() + { + icon.gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/AttackModeUI.cs.meta b/Client/Assets/Scripts/UI/AttackModeUI.cs.meta new file mode 100644 index 0000000..fd663b4 --- /dev/null +++ b/Client/Assets/Scripts/UI/AttackModeUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2d81179f82c542edb275daabff5bfe12 +timeCreated: 1756781456 \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/BarUI.cs b/Client/Assets/Scripts/UI/BarUI.cs index e84fbc9..83ac949 100644 --- a/Client/Assets/Scripts/UI/BarUI.cs +++ b/Client/Assets/Scripts/UI/BarUI.cs @@ -7,10 +7,63 @@ namespace UI { [SerializeField] private Image image; + [Header("Progress Gradient")] [SerializeField] + private Gradient progressGradient; // 用于定义多色进度渐变 + + [Header("Editor Preview")] [SerializeField] [Range(0, 1)] + private float _editorProgressPreview = 0f; // 用于在编辑器中预览的进度值 + + /// + /// 获取或设置进度条的当前进度 (0-1)。 + /// 设置时会同时更新进度条的填充量和根据渐变更新颜色。 + /// public float Progress { get => image.fillAmount; - set => image.fillAmount = value; + set + { + // 在运行时检查image是否已赋值 + if (image == null) + { + Debug.LogWarning("BarUI: Image reference is not set! Cannot update progress or color.", this); + return; + } + + // 确保进度值在0到1之间，防止出现异常情况 + float clampedValue = Mathf.Clamp01(value); + image.fillAmount = clampedValue; + + // 使用Gradient的Evaluate方法根据进度值获取对应的渐变颜色 + // Unity编辑器会自动为Gradient字段初始化一个默认实例，但在某些特殊运行时情况下， + // 还是可以加一个null检查以增加健壮性。 + if (progressGradient != null) + { + image.color = progressGradient.Evaluate(clampedValue); + } + else + { + // 如果梯度未定义（极少发生），则使用默认颜色并发出警告 + Debug.LogWarning("BarUI: Progress Gradient is not set! Using default white color.", this); + image.color = Color.white; + } + } + } + + // OnValidate是Unity编辑器特有的方法，当脚本实例在编辑器中被加载或Inspector中的数据被修改时调用 + private void OnValidate() + { + // 只有当存在Image引用时才进行更新，避免在编辑器中因未赋值而引发NullReferenceException + if (image != null) + { + // 在编辑器中修改_editorProgressPreview时，同步更新实际的Progress + // 这会触发Progress属性的setter，进而更新fillAmount和color + Progress = _editorProgressPreview; + } + else + { + // 在编辑器中未分配Image时给出提示，防止用户迷惑 + Debug.LogWarning("BarUI: Image reference is not assigned. Editor preview disabled.", this); + } } } } \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/BuffIconListUI.cs b/Client/Assets/Scripts/UI/BuffIconListUI.cs new file mode 100644 index 0000000..1e84ac5 --- /dev/null +++ b/Client/Assets/Scripts/UI/BuffIconListUI.cs @@ -0,0 +1,20 @@ +using System; +using Prefab; +using UnityEngine; + +namespace UI +{ + public class BuffIconListUI: MonoBehaviour + { + public BuffIconUI prefab; + public Transform container; + + private void Start() + { + foreach (Transform child in container) + { + Destroy(child.gameObject); + } + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/BuffIconListUI.cs.meta b/Client/Assets/Scripts/UI/BuffIconListUI.cs.meta new file mode 100644 index 0000000..e6f2028 --- /dev/null +++ b/Client/Assets/Scripts/UI/BuffIconListUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8f6f033d6fe84e769e101fb355ef3ffa +timeCreated: 1756780958 \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/Button3D.cs b/Client/Assets/Scripts/UI/Button3D.cs new file mode 100644 index 0000000..343aa2e --- /dev/null +++ b/Client/Assets/Scripts/UI/Button3D.cs @@ -0,0 +1,142 @@ + +using System.Linq; // 用于可能的LINQ操作，但在此版本中可能不直接使用 +using TMPro; // 用于 TextMeshPro 组件 +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.Serialization; // 用于 UnityEvent + +namespace UI +{ + public class Button3D : MonoBehaviour + { + [Tooltip("当按钮被点击时触发的UnityEvent。可以在Inspector中配置.")] + public UnityEvent OnClick; + + [FormerlySerializedAs("renderer")] public MeshRenderer meshRenderer; // 请确保在Inspector中拖拽赋值 + public Material outlineMaterial; // 请确保在Inspector中拖拽赋值 + + public TMP_Text text; // 文本组件 + + private Material[] _originalMaterials; // 用于存储按钮的原始材质，以便正确添加和移除描边 + + private void Awake() + { + if (meshRenderer == null) + { + Debug.LogError("Button3D: MeshRenderer is not assigned. Please assign it in the Inspector.", this); + return; + } + + if (outlineMaterial == null) + { + Debug.LogWarning( + "Button3D: Outline Material is not assigned. Outline effect will not work. Please assign it in the Inspector.", + this); + } + + if (text == null) + { + Debug.LogWarning("Button3D: TMP_Text is not assigned. Text features will not work. Please assign it in the Inspector.", this); + // 这里不return，允许按钮无文本运行 + } + + + // 存储原始材质数组，以便在添加和移除描边时正确操作 + // .ToArray() 是为了确保我们拿到的是拷贝，而不是引用，防止外部意外修改 + _originalMaterials = meshRenderer.materials.ToArray(); + + // 确保初始化时没有边框材质 + // Important: 调用RemoveOutlineMaterialInternal()可能会清除_originalMaterials，所以要确保先保存 + RemoveOutlineMaterialInternal(); // 这一步会根据_originalMaterials重新设置renderer.materials + + // 初始时隐藏文本 + if (text != null) + { + text.gameObject.SetActive(false); + } + } + + private void Update() + { + // 文本始终朝向摄像机 + if (text != null && text.IsActive() && Camera.main != null) + { + text.transform.LookAt(text.transform.position + Camera.main.transform.rotation * Vector3.forward, + Camera.main.transform.rotation * Vector3.up); + } + } + + private void OnMouseEnter() + { + if (meshRenderer == null) return; + + // 鼠标进入时显示文本 + if (text != null) + { + text.gameObject.SetActive(true); + } + + // 如果没有描边材质，或者渲染器已经有描边材质，就没必要再添加了 + // 检查当前材质数组长度是否已经大于等于_originalMaterials的长度+1 + // 这样可以避免重复添加 + if (outlineMaterial == null || meshRenderer.materials.Length > _originalMaterials.Length) + { + return; + } + + // 如果当前材质数组和_originalMaterials不一致，说明可能被其他逻辑修改了， + // 稳妥起见，最好先恢复到_originalMaterials + if (!meshRenderer.materials.SequenceEqual(_originalMaterials)) + { + //Debug.LogWarning("Button3D: Renderer materials were unexpectedly modified before OnMouseEnter. Restoring original materials."); + // 通常不应该发生，除非有其他脚本在修改 + meshRenderer.materials = _originalMaterials; + } + + // 创建一个新数组，包含原始材质和描边材质 + var newMaterials = new Material[_originalMaterials.Length + 1]; + System.Array.Copy(_originalMaterials, newMaterials, _originalMaterials.Length); + newMaterials[_originalMaterials.Length] = outlineMaterial; + meshRenderer.materials = newMaterials; + } + + private void OnMouseExit() + { + if (meshRenderer == null) return; + + // 鼠标离开时隐藏文本 + if (text != null) + { + text.gameObject.SetActive(false); + } + + // 调用内部方法移除边框材质 + RemoveOutlineMaterialInternal(); + } + + private void OnMouseDown() + { + // 触发UnityEvent + OnClick.Invoke(); + } + + /// + /// 移除渲染器上的边框材质（如果存在），恢复到按钮的原始材质。 + /// + private void RemoveOutlineMaterialInternal() + { + if (meshRenderer == null) return; + // 即使_originalMaterials == null（因为Awake中的LogError），也可以安全赋值空数组 + // 但如果_originalMaterials确实是null，说明Awake有问题，后续操作也可能继续出错 + if (_originalMaterials == null) + { + Debug.LogError("Button3D: _originalMaterials is null. Cannot remove outline. Check Awake method.", this); + return; + } + + // 直接将渲染器材质恢复为_originalMaterials的副本 + meshRenderer.materials = _originalMaterials.ToArray(); // 使用ToArray()确保赋值一个副本，避免_originalMaterials被意外修改 + } + } +} + diff --git a/Client/Assets/Scripts/UI/Button3D.cs.meta b/Client/Assets/Scripts/UI/Button3D.cs.meta new file mode 100644 index 0000000..dfa0c02 --- /dev/null +++ b/Client/Assets/Scripts/UI/Button3D.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0d5e1709fa6d5c54f93ac068f067e20b \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/CoinCountUI.cs b/Client/Assets/Scripts/UI/CoinCountUI.cs new file mode 100644 index 0000000..c747d5e --- /dev/null +++ b/Client/Assets/Scripts/UI/CoinCountUI.cs @@ -0,0 +1,16 @@ +using System; +using TMPro; +using UnityEngine; + +namespace UI +{ + public class CoinCountUI:MonoBehaviour + { + public TMP_Text text; + + private void Start() + { + + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/CoinCountUI.cs.meta b/Client/Assets/Scripts/UI/CoinCountUI.cs.meta new file mode 100644 index 0000000..bcdb434 --- /dev/null +++ b/Client/Assets/Scripts/UI/CoinCountUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 85cfb4a924a04c6e9f6f7801207dbee3 +timeCreated: 1756776391 \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/DevMenuUI.cs b/Client/Assets/Scripts/UI/DevMenuUI.cs index 7c26411..1a0084e 100644 --- a/Client/Assets/Scripts/UI/DevMenuUI.cs +++ b/Client/Assets/Scripts/UI/DevMenuUI.cs @@ -5,7 +5,7 @@ using UnityEngine.SceneManagement; namespace UI { - public class DevMenuUI : UIBase + public class DevMenuUI : FullScreenUI { public GameObject menuContent; @@ -77,9 +77,8 @@ namespace UI InitDefineButtons( "事件菜单", "未定义任何事件", - // 假设 EventDef 也有 label 字段作为按钮文本 - def => def.label, - eventDef => + def => def.label, + eventDef => { // TODO: 在这里实现事件触发逻辑 Debug.Log($"触发事件: {eventDef.label}"); diff --git a/Client/Assets/Scripts/UI/EquipmentUI.cs b/Client/Assets/Scripts/UI/EquipmentUI.cs index 2e3fe9e..87f2fef 100644 --- a/Client/Assets/Scripts/UI/EquipmentUI.cs +++ b/Client/Assets/Scripts/UI/EquipmentUI.cs @@ -1,275 +1,15 @@ -using Base; -using Entity; -using System.Collections.Generic; using UnityEngine; -// 确保 Character 类在此命名空间下 + namespace UI { - /// - /// 负责管理和显示角色的装备用户界面。 - /// 该组件会监听当前关注实体的变化，并根据所关注角色的库存数据动态更新装备槽位的显示， - /// 同时采用对象池技术高效管理 ItemUI 实例的创建和复用。 - /// 除了显示，现在还支持通过滚轮选择物品，并同步更新焦点角色的 CurrentSelected 字段。 - /// - public class EquipmentUI : MonoBehaviour, ITick + + public class EquipmentUI : MonoBehaviour { - [SerializeField] - [Tooltip("所有 ItemUI 实例的父级 GameObject，用于布局。")] - private GameObject uiParent; - - [SerializeField] - [Tooltip("用于实例化装备槽位的 ItemUI 预制件。")] - private ItemUI itemUIPrefab; - - /// - /// 当前界面所关联和关注的角色实体。 - /// - private Character focusedEntity; - - /// - /// ItemUI 实例的对象池，用于高效管理和复用 ItemUI。 - /// - private List itemUIPool = new(); - - /// - /// MonoBehaviour 的 Start 生命周期方法。 - /// 在此方法中，注册当游戏主要程序中关注的实体发生变化时，调用 方法进行更新。 - /// - private void Start() - { - Program.Instance.OnFocusedEntityChanged += UpdateFocusedEntity; - uiParent.SetActive(false); - } - - /// - /// MonoBehaviour 的 OnDestroy 生命周期方法。 - /// 在此方法中，取消注册所有已订阅的事件监听器，并清理对象池中创建的所有 ItemUI 实例， - /// 以防止内存泄漏和不必要的引用。 - /// - private void OnDestroy() - { - Program.Instance.OnFocusedEntityChanged -= UpdateFocusedEntity; - - // 如果当前有关注的角色，取消注册其库存改变事件。 - // 确保 focusedEntity 不为 null 且 Inventory 不为 null。 - if (focusedEntity != null && focusedEntity.Inventory != null) - { - focusedEntity.Inventory.OnInventoryChanged -= UpdateUI; - } - - // 销毁对象池中所有 ItemUI 的 GameObject。 - foreach (var itemUI in itemUIPool) - { - if (itemUI != null && itemUI.gameObject != null) - { - Destroy(itemUI.gameObject); - } - } - itemUIPool.Clear(); - } - - /// - /// 当游戏程序中关注的实体发生变化时调用此方法。 - /// 该方法会更新当前 EquipmentUI 所关联的角色，并相应地注册或取消注册库存改变事件。 - /// - /// 新的关注实体，可能为 null 或非 Character 类型。 - private void UpdateFocusedEntity(Entity.Entity entity) - { - // 如果之前有关注的角色，先取消注册其库存改变事件。 - // 确保 focusedEntity 不为 null 且 Inventory 不为 null。 - if (focusedEntity != null && focusedEntity.Inventory != null) - { - focusedEntity.Inventory.OnInventoryChanged -= UpdateUI; - } - - // 尝试将新的实体转换为角色类型。 - Character newCharacter = entity as Character; - if (newCharacter != null) - { - focusedEntity = newCharacter; - } - else - { - // 如果传入的 entity 不是 Character 类型，或者为 null，则清除当前的 focusedEntity。 - focusedEntity = null; - } - - // 如果现在有关注的角色，注册其库存改变事件。 - if (focusedEntity != null) - { - focusedEntity.Inventory.OnInventoryChanged += UpdateUI; - } - - // 立即更新UI以反映新的关注实体（或没有关注实体）的状态。 - UpdateUI(); - - // 在更新UI后，确保UI的选中状态与角色当前选中字段同步 - // 只有当有焦点角色且库存不为空时才更新选中状态 - if (focusedEntity != null && focusedEntity.Inventory != null && focusedEntity.Inventory.Capacity > 0) - { - // 确保 CurrentSelected 在有效范围内，否则重置为0 - if (focusedEntity.CurrentSelected < 0 || focusedEntity.CurrentSelected >= focusedEntity.Inventory.Capacity) - { - focusedEntity.CurrentSelected = 0; - } - UpdateSelectionUI(focusedEntity.CurrentSelected); - } - else - { - // 如果没有焦点实体或库存为空，则清空所有选中状态 - UpdateSelectionUI(-1); // 传入一个无效索引以取消所有选中 - } - } - - /// - /// 根据当前关注角色的库存数据更新装备UI的显示。 - /// 该方法通过对象池机制高效地管理 ItemUI 实例的创建、复用和禁用。 - /// - private void UpdateUI() - { - // 如果没有关注的角色或其库存，则禁用所有 ItemUI。 - if (focusedEntity == null || focusedEntity.Inventory == null) - { - foreach (var itemUI in itemUIPool) - { - if (itemUI != null && itemUI.gameObject != null) - { - itemUI.gameObject.SetActive(false); - } - } - uiParent.SetActive(false); - return; - } - - // 检查用于创建物品UI的预制件是否已在 Inspector 中赋值。 - if (itemUIPrefab == null) - { - Debug.LogError("ItemUIPrefab 未在 EquipmentUI 中指定。无法创建物品用户界面。", this); - foreach (var itemUI in itemUIPool) itemUI.gameObject.SetActive(false); - uiParent.SetActive(false); // 确保父级也被禁用 - return; - } - - int requiredUIs = focusedEntity.Inventory.Capacity; - int currentUIPoolSize = itemUIPool.Count; // 当前对象池中 ItemUI 实例的总数。 - - // 遍历所有必要的物品槽位，复用对象池中的 ItemUI，或在不足时创建新的 ItemUI。 - for (int i = 0; i < requiredUIs; i++) - { - ItemUI itemUI; - if (i < currentUIPoolSize) - { - itemUI = itemUIPool[i]; - } - else - { - // 使用 Instantiate(GameObject, Transform) 以确保父级设置正确且避免转换问题。 - var itemObj = Instantiate(itemUIPrefab.gameObject, uiParent.transform); - itemUI = itemObj.GetComponent(); - itemUIPool.Add(itemUI); - currentUIPoolSize++; // 更新池的大小计数。 - } - - // 确保 ItemUI GameObject 处于激活状态，并使用当前物品槽位的数据进行初始化。 - itemUI.gameObject.SetActive(true); - itemUI.Init(focusedEntity.Inventory.GetSlot(i), i); - // 移除此处 itemUI.Select = false; 选中状态将由 UpdateSelectionUI 统一管理 - } - - // 如果库存槽位数量减少，禁用对象池中多余的 ItemUI 实例。 - for (int i = requiredUIs; i < currentUIPoolSize; i++) - { - if (itemUIPool[i] != null && itemUIPool[i].gameObject != null) - { - itemUIPool[i].gameObject.SetActive(false); - itemUIPool[i].Select = false; // 禁用时也确保清除选中状态 - } - } - uiParent.SetActive(true); - - // 首次更新UI时，或者当Inventory改变时，需要确保 CurrentSelected 的UI状态是正确的 - // 但如果 UpdateFocusedEntity 已经处理了，这里可以省略，或者确保只在必要时调用 - // 考虑到 UpdateUI 也会被 Inventory.OnInventoryChanged 调用，这里再次确保同步是合理的。 - if (focusedEntity != null && focusedEntity.Inventory != null && focusedEntity.Inventory.Capacity > 0) - { - UpdateSelectionUI(focusedEntity.CurrentSelected); - } - else - { - UpdateSelectionUI(-1); - } - } - - /// - /// 当当前选中物品改变时，更新所有 ItemUI 的选中状态。 - /// - /// 当前选中的物品索引。传入 -1 将取消所有 ItemUI 的选中状态。 - private void UpdateSelectionUI(int selectedItemIndex) - { - // 如果对象池为空，则无需更新 - if (itemUIPool == null || itemUIPool.Count == 0) - { - return; - } - - for (int i = 0; i < itemUIPool.Count; i++) - { - ItemUI itemUI = itemUIPool[i]; - if (itemUI != null && itemUI.gameObject != null) - { - // 只有在 ItemUI 激活状态下才设置其选中状态，避免对禁用UI的操作 - // 或者如果传入-1，即使激活也全部设置为false - if (itemUI.gameObject.activeSelf || selectedItemIndex == -1) // 确保当取消所有选中时，循环到所有激活的，甚至当前禁用的ItemUI - { - itemUI.Select = (i == selectedItemIndex && itemUI.gameObject.activeSelf); - } - } - } - } - - /// - /// 每帧调用的更新方法，用于处理滚轮输入以选择物品。 - /// - public void Tick() - { - // 如果没有焦点实体、没有库存或库存为空，不进行选择操作 - if (focusedEntity == null || focusedEntity.Inventory == null || focusedEntity.Inventory.Capacity == 0) - { - return; - } - - float scrollInput = Input.GetAxis("Mouse ScrollWheel"); - - if (scrollInput != 0) // 检测到滚轮输入 - { - int currentSelection = focusedEntity.CurrentSelected; - int inventoryCapacity = focusedEntity.Inventory.Capacity; - - if (scrollInput > 0) // 滚轮向上，选择前一个 - { - currentSelection--; - if (currentSelection < 0) - { - currentSelection = inventoryCapacity - 1; // 循环到最后一个 - } - } - else // 滚轮向下，选择后一个 - { - currentSelection++; - if (currentSelection >= inventoryCapacity) - { - currentSelection = 0; // 循环到第一个 - } - } - - // 如果选择发生变化，则更新焦点实体和UI - if (focusedEntity.CurrentSelected != currentSelection) - { - focusedEntity.CurrentSelected = currentSelection; - UpdateSelectionUI(currentSelection); // 更新UI选中状态 - } - } - } + public ItemUI currentUse; + public ItemUI two; + public ItemUI three; + + } } diff --git a/Client/Assets/Scripts/UI/FullScreenUI.cs b/Client/Assets/Scripts/UI/FullScreenUI.cs new file mode 100644 index 0000000..d4d8821 --- /dev/null +++ b/Client/Assets/Scripts/UI/FullScreenUI.cs @@ -0,0 +1,21 @@ +using Base; +using UnityEngine; + +namespace UI +{ + public class FullScreenUI:UIBase,ITickUI + { + public FullScreenUI() + { + isInputOccupied = true; + exclusive=true; + } + public virtual void TickUI() + { + if(!IsVisible) + return; + if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(actionButton)) + UIInputControl.Instance.Hide(this); + } + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/FullScreenUI.cs.meta b/Client/Assets/Scripts/UI/FullScreenUI.cs.meta new file mode 100644 index 0000000..0643fbc --- /dev/null +++ b/Client/Assets/Scripts/UI/FullScreenUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 92b2dc3c0fc0475596413b883c51e9b2 \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/ItemUI.cs b/Client/Assets/Scripts/UI/ItemUI.cs index 4b9c442..30547b6 100644 --- a/Client/Assets/Scripts/UI/ItemUI.cs +++ b/Client/Assets/Scripts/UI/ItemUI.cs @@ -1,91 +1,34 @@ -using Base; + using System; -using TMPro; +using System.Linq; using UnityEngine; -using UnityEngine.EventSystems; using UnityEngine.UI; + namespace UI { - public class ItemUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler, ITick + public class ItemUI:MonoBehaviour { - [SerializeField] private Image textureUI; - [SerializeField] private TMP_Text countUI; - [SerializeField] private TMP_Text nameUI; - [SerializeField] private GameObject selectedOutline; + public Entity.InventorySlot inventorySlot; + public UIImageAnimator icon; - private Entity.InventorySlot _item; - private float timer = 0; - private float switchTime = 0; - private int texturePtr = 0; - - public event Action OnPlayerSelect; - - public bool Select + private void Start() { - get => selectedOutline.activeSelf; - set => selectedOutline.SetActive(value); + icon.gameObject.SetActive(false); } - public int SlotIndex { get; private set; } = -1; - - public void Init(Entity.InventorySlot item, int index) + public void SetDisplayItem(Entity.InventorySlot slot) { - if (item == null) + inventorySlot = slot; + if (inventorySlot == null) { - switchTime = -1; - textureUI.gameObject.SetActive(false); - countUI.text = ""; - nameUI.text = ""; - return; - } - - textureUI.gameObject.SetActive(true); - _item = item; - textureUI.sprite = item.Item.Icon[0]; - countUI.text = item.Quantity.ToString(); - nameUI.text = item.Item.Name; - nameUI.gameObject.SetActive(false); - Select = false; - SlotIndex = index; - if (item.Item.FPS > 0) - { - switchTime = 1f / item.Item.FPS; + icon.gameObject.SetActive(false); } else { - switchTime = 0; + icon.gameObject.SetActive(true); + icon.SetSprites(inventorySlot.Item.Icon.ToArray()); } } - - public void OnPointerEnter(PointerEventData eventData) - { - nameUI.gameObject.SetActive(true); - } - - public void OnPointerExit(PointerEventData eventData) - { - nameUI.gameObject.SetActive(false); - } - public void OnPointerClick(PointerEventData eventData) - { - OnPlayerSelect?.Invoke(); - } - public void Tick() - { - if (switchTime > 0) - { - timer += Time.deltaTime; - if (timer >= switchTime) - { - timer -= switchTime; - texturePtr++; - texturePtr %= _item.Item.Icon.Count; - textureUI.sprite = _item.Item.Icon[texturePtr]; - } - } - } - - } } \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/LogUI.cs b/Client/Assets/Scripts/UI/LogUI.cs index 677dfb2..159e17d 100644 --- a/Client/Assets/Scripts/UI/LogUI.cs +++ b/Client/Assets/Scripts/UI/LogUI.cs @@ -1,12 +1,12 @@ -using Prefab; -using System; using System.Collections.Generic; -using TMPro; +using Prefab; // 假设 TextPrefab 在 Prefab 命名空间下 +using TMPro; // 假设 TextPrefab 内部使用了 TextMeshPro + using UnityEngine; namespace UI { - public class LogUI : UIBase + public class LogUI : FullScreenUI { public Transform contentPanel; // 日志内容容器 public TextPrefab textPrefab; // 文本预制体引用 @@ -21,66 +21,80 @@ namespace UI { LogType.Assert, new Color(0.8f, 0.4f, 1f) } }; - private List _logItems = new List(); // 已创建的日志条目 + // 逻辑修改：将_logItems改为存储TextPrefab实例，避免频繁GetComponent + private List _logItems = new List(); // 已创建的日志条目 private int _lastLogCount = 0; // 上次显示的日志数量 + - private void Start() + // 逻辑修改：在Update中周期性检查日志数量变化并刷新UI + private void Update() { - Logging.LogCapturer.Clear(); + // 获取当前LogCapturer中的日志数量（最旧在前） + var currentCapturerLogCount = Logging.LogCapturer.GetLogs(reverseOrder: false).Count; + if (_lastLogCount != currentCapturerLogCount) + { + RefreshLogDisplay(); + } } public override void Show() { base.Show(); - RefreshLogDisplay(); + RefreshLogDisplay(); // 首次显示时刷新 } private void RefreshLogDisplay() { - var logs = Logging.LogCapturer.GetLogs(); + // 逻辑修改：获取"最旧在前，最新在后"的日志列表，与UI显示顺序匹配 + var currentLogsInCapturer = Logging.LogCapturer.GetLogs(reverseOrder: false); + var newLogCount = currentLogsInCapturer.Count; + var existingUiItemCount = _logItems.Count; - // 如果日志数量减少，清理多余的条目 - if (logs.Count < _lastLogCount) + // 逻辑修改：处理日志数量减少的情况（日志被从LogCapturer的队列前端移除，即最旧的日志） + if (newLogCount < existingUiItemCount) { - for (var i = logs.Count; i < _lastLogCount; i++) + // 计算需要移除的UI条目数量 + var itemsToRemove = existingUiItemCount - newLogCount; + // 从_logItems的开头移除（销毁最旧的UI元素） + for (var i = 0; i < itemsToRemove; i++) { + // 确保销毁对应的GameObject，避免内存泄露 Destroy(_logItems[i].gameObject); } - - _logItems.RemoveRange(logs.Count, _logItems.Count - logs.Count); + _logItems.RemoveRange(0, itemsToRemove); // 从列表中移除引用 } - - // 更新现有条目 - for (var i = 0; i < Math.Min(logs.Count, _logItems.Count); i++) + // 逻辑修改：处理日志数量增加的情况（LogCapturer中新增日志） + else if (newLogCount > existingUiItemCount) { - UpdateLogEntry(_logItems[i], logs[logs.Count - 1 - i]); - } - - // 添加新的条目 - if (logs.Count > _lastLogCount) - { - for (var i = _lastLogCount; i < logs.Count; i++) + // 从现有UI条目数量开始，创建新的UI条目，并添加到_logItems末尾 + for (var i = existingUiItemCount; i < newLogCount; i++) { - CreateLogEntry(logs[logs.Count - 1 - i]); + CreateLogEntry(currentLogsInCapturer[i]); // 创建并添加新的UI元素，会自动追加到_logItems } } - _lastLogCount = logs.Count; + // 逻辑修改：更新所有现有/剩余的UI条目内容，确保与LogCapturer中的数据一致 + // 这一步确保了UI元素能准确反映其对应的日志数据，处理了任何可能的日志内容更新或初始设置。 + for (var i = 0; i < newLogCount; i++) + { + UpdateLogEntry(_logItems[i], currentLogsInCapturer[i]); + } + + _lastLogCount = newLogCount; // 更新上次显示的日志数量 } private void CreateLogEntry(Logging.LogCapturer.LogEntry entry) { - // 实例化文本预制体 + // 实例化文本预制体，并将其添加到内容面板 var logItem = Instantiate(textPrefab, contentPanel); - _logItems.Add(logItem.transform); + _logItems.Add(logItem); // 逻辑修改：直接添加TextPrefab实例 - UpdateLogEntry(logItem.transform, entry); + UpdateLogEntry(logItem, entry); // 逻辑修改：直接传入TextPrefab实例进行更新 } - private void UpdateLogEntry(Transform logItemTransform, Logging.LogCapturer.LogEntry entry) + // 逻辑修改：UpdateLogEntry现在直接接收TextPrefab实例，更高效 + private void UpdateLogEntry(TextPrefab logItem, Logging.LogCapturer.LogEntry entry) { - var logItem = logItemTransform.GetComponent(); - // 设置文本内容 logItem.Label = entry.ToString(); @@ -96,5 +110,22 @@ namespace UI logItem.text.alignment = TextAlignmentOptions.TopLeft; } + + // 逻辑修改：添加OnDestroy方法来清理动态创建的UI元素 + private void OnDestroy() + { + if (_logItems != null) + { + foreach (var item in _logItems) + { + // 检查item及其gameObject是否仍有效，以防在其他地方已经被销毁或为空 + if (item != null && item.gameObject != null) + { + Destroy(item.gameObject); + } + } + _logItems.Clear(); // 清空列表引用 + } + } } -} \ No newline at end of file +} diff --git a/Client/Assets/Scripts/UI/PlayerStateUI.cs b/Client/Assets/Scripts/UI/PlayerStateUI.cs index 50326e4..575f7a6 100644 --- a/Client/Assets/Scripts/UI/PlayerStateUI.cs +++ b/Client/Assets/Scripts/UI/PlayerStateUI.cs @@ -1,3 +1,7 @@ +using System; +using Base; +using Map; +using TMPro; using UnityEngine; namespace UI @@ -6,7 +10,13 @@ namespace UI { [SerializeField] private BarUI focusedEntityHP; [SerializeField] private BarUI lastEntityHP; - + [SerializeField] private BarUI BaseBuildingHP; + [SerializeField] private MiniMap miniMap; + [SerializeField] private EquipmentUI equipmentUI; + [SerializeField] private CoinCountUI coinCountUI; + [SerializeField] private BuffIconListUI focuseEntityBuffIconList; + [SerializeField] private BuffIconListUI lastEntityBuffIconList; + [SerializeField] private AttackModeUI attackMode; public void Tick() { @@ -18,5 +28,52 @@ namespace UI } } + public void Show() + { + focusedEntityHP.gameObject.SetActive(true); + lastEntityHP.gameObject.SetActive(true); + BaseBuildingHP.gameObject.SetActive(true); + miniMap.gameObject.SetActive(true); + equipmentUI.gameObject.SetActive(true); + coinCountUI.gameObject.SetActive(true); + focuseEntityBuffIconList.gameObject.SetActive(true); + lastEntityBuffIconList.gameObject.SetActive(true); + attackMode.gameObject.SetActive(true); + } + + public void Hide() + { + focusedEntityHP.gameObject.SetActive(false); + lastEntityHP.gameObject.SetActive(false); + BaseBuildingHP.gameObject.SetActive(false); + miniMap.gameObject.SetActive(false); + equipmentUI.gameObject.SetActive(false); + coinCountUI.gameObject.SetActive(false); + focuseEntityBuffIconList.gameObject.SetActive(false); + lastEntityBuffIconList.gameObject.SetActive(false); + attackMode.gameObject.SetActive(false); + } + + private void Start() + { + UIInputControl.Instance.OnWindowVisibilityChanged += UIChange; + } + + private void OnDestroy() + { + UIInputControl.Instance.OnWindowVisibilityChanged -= UIChange; + } + + private void UIChange(UIBase ui, bool open) + { + if (ui.exclusive && open) + { + Hide(); + } + else + { + Show(); + } + } } } \ No newline at end of file diff --git a/Client/Assets/Scripts/UI/SettingUI.cs b/Client/Assets/Scripts/UI/SettingUI.cs index e009178..14b9603 100644 --- a/Client/Assets/Scripts/UI/SettingUI.cs +++ b/Client/Assets/Scripts/UI/SettingUI.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; namespace UI { - public class SettingUI : UIBase + public class SettingUI : FullScreenUI { [SerializeField] private Scrollbar globalVolume; [SerializeField] private Toggle developerMode; @@ -47,6 +47,7 @@ namespace UI { windowResolution.value = 0; } + windowMode.value = (int)currentSettings.currentWindowMode; } public void CancelSettings() { diff --git a/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index ba61f2c..33722f4 100644 --- a/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -108,6 +108,8 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: -2 + type: {class: , ns: , asm: } - rid: 6852985685364965376 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -121,6 +123,9 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} diff --git a/Client/Assets/Shader.meta b/Client/Assets/Shader.meta new file mode 100644 index 0000000..5a167ef --- /dev/null +++ b/Client/Assets/Shader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d4583fea28dea54cac2f29cde1b99c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Shader/OutlineShader.shadergraph b/Client/Assets/Shader/OutlineShader.shadergraph new file mode 100644 index 0000000..117b9f3 --- /dev/null +++ b/Client/Assets/Shader/OutlineShader.shadergraph @@ -0,0 +1,910 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "4c4fc4006449490dbe343b50970f353c", + "m_Properties": [ + { + "m_Id": "966cc5eb0a8a4289b76db1c1fb9a20b4" + }, + { + "m_Id": "aee9bea820ab495ebea1fd16e6e4426d" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "77b7ab57f4994f77bc06b85fd1862a13" + } + ], + "m_Nodes": [ + { + "m_Id": "59a780e466d342afa011b55a3d95b15b" + }, + { + "m_Id": "92c6bf1708bc4eefa9f708ccedf82e7b" + }, + { + "m_Id": "3da1fcb014254517857c0f1757f89dee" + }, + { + "m_Id": "275d38d75fd947068131f18e2ea8f88b" + }, + { + "m_Id": "9d575cc9818041d0b0b195bdab8bb293" + }, + { + "m_Id": "cd0010223c1344559b11ffc2f918a831" + }, + { + "m_Id": "1f4e07b0db3c459b906693c887f3e252" + }, + { + "m_Id": "d22f0b20543941d4b21cdb5780053b49" + }, + { + "m_Id": "23cf3544aed047c38359d49bc9bfd39c" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1f4e07b0db3c459b906693c887f3e252" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "59a780e466d342afa011b55a3d95b15b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "23cf3544aed047c38359d49bc9bfd39c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "275d38d75fd947068131f18e2ea8f88b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cd0010223c1344559b11ffc2f918a831" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1f4e07b0db3c459b906693c887f3e252" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d22f0b20543941d4b21cdb5780053b49" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1f4e07b0db3c459b906693c887f3e252" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -95.0000228881836, + "y": 76.00000762939453 + }, + "m_Blocks": [ + { + "m_Id": "59a780e466d342afa011b55a3d95b15b" + }, + { + "m_Id": "92c6bf1708bc4eefa9f708ccedf82e7b" + }, + { + "m_Id": "3da1fcb014254517857c0f1757f89dee" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -95.0000228881836, + "y": 286.0000305175781 + }, + "m_Blocks": [ + { + "m_Id": "275d38d75fd947068131f18e2ea8f88b" + }, + { + "m_Id": "9d575cc9818041d0b0b195bdab8bb293" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "4cc1a064f7874a9b8aa521d595d5092d" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "17ef39b9aa3f4f9b9b545bd0a4d867f5", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "1f4e07b0db3c459b906693c887f3e252", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -329.0, + "y": 76.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "a89ab5333ae449e59da03aa1ab9d9022" + }, + { + "m_Id": "32a29b201337425ea089343d5247233d" + }, + { + "m_Id": "6785395363af428fbc58da381fe55359" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "23cf3544aed047c38359d49bc9bfd39c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -251.00001525878907, + "y": 325.0, + "width": 105.0, + "height": 34.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "17ef39b9aa3f4f9b9b545bd0a4d867f5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "aee9bea820ab495ebea1fd16e6e4426d" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "275d38d75fd947068131f18e2ea8f88b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "64edbafd8dfd47a2ad97435827012ad2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "32a29b201337425ea089343d5247233d", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3da1fcb014254517857c0f1757f89dee", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b4c90de2ecc947c0ba37d42e034cb369" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "4cc1a064f7874a9b8aa521d595d5092d", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "7d6d58b2f6734a4fa425de949a55a7c4" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 1, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "59a780e466d342afa011b55a3d95b15b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "673631bf98b24d6a9c127d8c2bbe71bc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "64edbafd8dfd47a2ad97435827012ad2", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "673631bf98b24d6a9c127d8c2bbe71bc", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6785395363af428fbc58da381fe55359", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "77b7ab57f4994f77bc06b85fd1862a13", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "966cc5eb0a8a4289b76db1c1fb9a20b4" + }, + { + "m_Id": "aee9bea820ab495ebea1fd16e6e4426d" + } + ] +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "7d6d58b2f6734a4fa425de949a55a7c4" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "8169db28379542af9cdd62d5a1b89de0", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "92c6bf1708bc4eefa9f708ccedf82e7b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "8169db28379542af9cdd62d5a1b89de0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "936f470cf96b4c65a1750ba068d23d51", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "966cc5eb0a8a4289b76db1c1fb9a20b4", + "m_Guid": { + "m_GuidSerialized": "05553a18-36ca-4f4b-8dcb-3d0622846b4c" + }, + "m_Name": "Scale", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Scale", + "m_DefaultReferenceName": "_Scale", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9d575cc9818041d0b0b195bdab8bb293", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "936f470cf96b4c65a1750ba068d23d51" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a89ab5333ae449e59da03aa1ab9d9022", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "aee9bea820ab495ebea1fd16e6e4426d", + "m_Guid": { + "m_GuidSerialized": "79218567-43f6-4d23-b803-a064a7a527b0" + }, + "m_Name": "Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "b4c90de2ecc947c0ba37d42e034cb369", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "cd0010223c1344559b11ffc2f918a831", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -596.0, + "y": 123.00000762939453, + "width": 208.00003051757813, + "height": 314.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "d1f1ce54627b45e1856f7d362b461a97" + } + ], + "synonyms": [ + "location" + ], + "m_Precision": 1, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 0, + "m_PositionSource": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "d1f1ce54627b45e1856f7d362b461a97", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d22f0b20543941d4b21cdb5780053b49", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -492.0, + "y": 89.0, + "width": 104.00003051757813, + "height": 34.00000762939453 + } + }, + "m_Slots": [ + { + "m_Id": "d7622898365f4568be7c6a1fd7941832" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "966cc5eb0a8a4289b76db1c1fb9a20b4" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d7622898365f4568be7c6a1fd7941832", + "m_Id": 0, + "m_DisplayName": "Scale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + diff --git a/Client/Assets/Shader/OutlineShader.shadergraph.meta b/Client/Assets/Shader/OutlineShader.shadergraph.meta new file mode 100644 index 0000000..e092a6b --- /dev/null +++ b/Client/Assets/Shader/OutlineShader.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 11268f83bf2cc2447b1f0e995112ca43 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Client/Assets/Shader/Shader Graphs_OutlineShader.mat b/Client/Assets/Shader/Shader Graphs_OutlineShader.mat new file mode 100644 index 0000000..4d79627 --- /dev/null +++ b/Client/Assets/Shader/Shader Graphs_OutlineShader.mat @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2119912562947499068 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Shader Graphs_OutlineShader + m_Shader: {fileID: -6465566751694194690, guid: 11268f83bf2cc2447b1f0e995112ca43, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 + - _Scale: 1.05 + m_Colors: + - _Color: {r: 1.8490566, g: 1.6566842, b: 0.61925954, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Client/Assets/Shader/Shader Graphs_OutlineShader.mat.meta b/Client/Assets/Shader/Shader Graphs_OutlineShader.mat.meta new file mode 100644 index 0000000..b90fbc7 --- /dev/null +++ b/Client/Assets/Shader/Shader Graphs_OutlineShader.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b32baf03e8f4bd448cf625f4299f5ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Data/Core/Define/Event/GenerateEventDef.xml b/Client/Data/Core/Define/Event/GenerateEventDef.xml new file mode 100644 index 0000000..bc52d11 --- /dev/null +++ b/Client/Data/Core/Define/Event/GenerateEventDef.xml @@ -0,0 +1,16 @@ + + + + MonsterAttack + + 生成一个怪物袭击事件 + Event_EntityGenerater + + { + "EntityDefName":"chicken", + "EntityDefTypeName":"MonsterDef", + "LocationType":"OffMap" + } + + + \ No newline at end of file diff --git a/Client/Data/Core/Define/Event/Story.xml b/Client/Data/Core/Define/Event/Story.xml new file mode 100644 index 0000000..46e7367 --- /dev/null +++ b/Client/Data/Core/Define/Event/Story.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Client/Data/Core/Define/Item/Weapon.xml b/Client/Data/Core/Define/Item/Weapon.xml index 1c020aa..0454aeb 100644 --- a/Client/Data/Core/Define/Item/Weapon.xml +++ b/Client/Data/Core/Define/Item/Weapon.xml @@ -94,4 +94,288 @@ 爪子 Claw + + + + MonsterA1Bullet + + 1 + 15 + + + + +
  • GenericBulletTexture
    • +     +     +     +     + + MonsterA2Bullet + + 1 + 18 + + + + +
  • GenericBulletTexture
    • +     +     +     +     + + MonsterD1Bullet + + 1 + 16 + + + + +
  • GenericBulletTexture
    • +     +     +     +     + + MonsterD2Bullet + + 1 + 19 + + + + +
  • GenericBulletTexture
    • +     +     +     +     + + BiologicalSnakeMonsterBullet + + 1 + 20 + + + + +
  • GenericBulletTexture
    • +     +     +     +     + + + + Weapon_MonsterA1 + + Ranged + + 612 + 0.333 + 10 + + MonsterA1Bullet + + + Weapon_MonsterA2 + + Ranged + + 408 + 0.555 + 12 + + MonsterA2Bullet + + + Weapon_MonsterB1 + + Melee + + 1148 + 0.2 + 1.5 + + + + Weapon_MonsterB2 + + Melee + + 1045 + 0.222 + 1.5 + + + + Weapon_MonsterC1 + + Melee + + 728 + 0.5 + 2 + + + + Weapon_MonsterC2 + + Melee + + 1078 + 0.333 + 2 + + + + + Weapon_MonsterD1 + + Ranged + + 646 + 0.333 + 11 + + MonsterD1Bullet + + + Weapon_MonsterD2 + + Ranged + + 412 + 0.555 + 13 + + MonsterD2Bullet + + + Weapon_MonsterE1 + + Melee + + 1622 + 0.125 + 1.5 + + + + Weapon_MonsterE2 + + Melee + + 1875 + 0.125 + 1.5 + + + + Weapon_MonsterF1 + + Melee + + 2048 + 0.238 + 2.5 + + + + Weapon_MonsterF2 + + Melee + + 2254 + 0.222 + 2.5 + + + + + Weapon_MaskMonster + + Melee + + 389 + 0.333 + 1.2 + + + + Weapon_MaskMonsterElite + + Melee + + 728 + 0.385 + 1.2 + + + + Weapon_HologramMonster + + Melee + + 666 + 0.166 + 1.8 + + + + Weapon_HologramMonsterElite + + Melee + + 1666 + 0.166 + 1.8 + + + + Weapon_SnakeMonster + + Ranged + + 125 + 1 + 8 + + BiologicalSnakeMonsterBullet + + + Weapon_SnakeMonsterElite + + Ranged + + 246 + 1 + 10 + + BiologicalSnakeMonsterBullet + + + Weapon_RatMonster + + Melee + + 11 + 1 + 0.8 + + + + Weapon_RatMonsterElite + + Melee + + 22 + 0.5 + 0.8 + + + + \ No newline at end of file diff --git a/Client/Data/Core/Define/Pawn/Monster.xml b/Client/Data/Core/Define/Pawn/Monster.xml index dd7922d..04c9141 100644 --- a/Client/Data/Core/Define/Pawn/Monster.xml +++ b/Client/Data/Core/Define/Pawn/Monster.xml @@ -5,7 +5,7 @@ chicken - + @@ -64,5 +64,828 @@ - + + + MonsterA1 + + 机械类型怪物，拥有远程攻击能力。击杀后掉落5能量。 + + + + + + + monster + + 4600 + 100 + 2.5 + + Weapon_MonsterA1 + + + +
  • MechanicalMonsterA1Texture
    • +     +     + + +
  • MechanicalMonsterA1Texture
    • +     +     + + +
  • MechanicalMonsterA1Texture
    • +     +     + + +
  • MechanicalMonsterA1Texture
    • +     +     +     + 5 +     + + MonsterA2 + + 更快的机械远程怪物。击杀后掉落5能量。 + + + + + + + monster + + 6000 + 10 + 4 + + Weapon_MonsterA2 + + + +
  • MechanicalMonsterA2Texture
    • +     +     + + +
  • MechanicalMonsterA2Texture
    • +     +     + + +
  • MechanicalMonsterA2Texture
    • +     +     + + +
  • MechanicalMonsterA2Texture
    • +     +     +     + 5 +     + + MonsterB1 + + 防御较高的机械近战怪物。击杀后掉落5能量。 + + + + + + + monster + + 5000 + 400 + 1 + + Weapon_MonsterB1 + + + +
  • MechanicalMonsterB1Texture
    • +     +     + + +
  • MechanicalMonsterB1Texture
    • +     +     + + +
  • MechanicalMonsterB1Texture
    • +     +     + + +
  • MechanicalMonsterB1Texture
    • +     +     +     + 5 +     + + MonsterB2 + + 高血高防的机械近战怪物。击杀后掉落5能量。 + + + + + + + monster + + 8000 + 500 + 1.5 + + Weapon_MonsterB2 + + + +
  • MechanicalMonsterB2Texture
    • +     +     + + +
  • MechanicalMonsterB2Texture
    • +     +     + + +
  • MechanicalMonsterB2Texture
    • +     +     + + +
  • MechanicalMonsterB2Texture
    • +     +     +     + 5 +     + + MonsterC1 + + 血量和防御极高的精英机械近战怪物。击杀后掉落10能量。 + + + + + + + monster + + 22000 + 800 + 1 + + Weapon_MonsterC1 + + + +
  • MechanicalMonsterC1Texture
    • +     +     + + +
  • MechanicalMonsterC1Texture
    • +     +     + + +
  • MechanicalMonsterC1Texture
    • +     +     + + +
  • MechanicalMonsterC1Texture
    • +     +     +     + 10 +     + + MonsterC2 + + 血量极高的精英机械近战怪物，攻击力强大。击杀后掉落10能量。 + + + + + + + monster + + 22000 + 450 + 2 + + Weapon_MonsterC2 + + + +
  • MechanicalMonsterC2Texture
    • +     +     + + +
  • MechanicalMonsterC2Texture
    • +     +     + + +
  • MechanicalMonsterC2Texture
    • +     +     + + +
  • MechanicalMonsterC2Texture
    • +     +     +     + 10 +     + + + MonsterD1 + + 混合类型怪物，拥有远程攻击能力。击杀后掉落5能量。 + + + + + + + monster + + 6400 + 50 + 2 + + Weapon_MonsterD1 + + + +
  • HybridMonsterD1Texture
    • +     +     + + +
  • HybridMonsterD1Texture
    • +     +     + + +
  • HybridMonsterD1Texture
    • +     +     + + +
  • HybridMonsterD1Texture
    • +     +     +     + 5 +     + + MonsterD2 + + 混合类型怪物，高速远程攻击。击杀后掉落5能量。 + + + + + + + monster + + 7200 + 0 + 3 + + Weapon_MonsterD2 + + + +
  • HybridMonsterD2Texture
    • +     +     + + +
  • HybridMonsterD2Texture
    • +     +     + + +
  • HybridMonsterD2Texture
    • +     +     + + +
  • HybridMonsterD2Texture
    • +     +     +     + 5 +     + + MonsterE1 + + 混合类型近战怪物，高速。击杀后掉落5能量。 + + + + + + + monster + + 6550 + 240 + 3 + + Weapon_MonsterE1 + + + +
  • HybridMonsterE1Texture
    • +     +     + + +
  • HybridMonsterE1Texture
    • +     +     + + +
  • HybridMonsterE1Texture
    • +     +     + + +
  • HybridMonsterE1Texture
    • +     +     +     + 5 +     + + MonsterE2 + + 更强大的混合类型近战怪物。击杀后掉落5能量。 + + + + + + + monster + + 9120 + 320 + 3 + + Weapon_MonsterE2 + + + +
  • HybridMonsterE2Texture
    • +     +     + + +
  • HybridMonsterE2Texture
    • +     +     + + +
  • HybridMonsterE2Texture
    • +     +     + + +
  • HybridMonsterE2Texture
    • +     +     +     + 5 +     + + MonsterF1 + + 关卡BOSS，血量和防御极高，近战爆发强。击杀后掉落50能量。 + + + + + + + monster + + 42000 + 770 + 2 + + Weapon_MonsterF1 + + + +
  • HybridMonsterF1Texture
    • +     +     + + +
  • HybridMonsterF1Texture
    • +     +     + + +
  • HybridMonsterF1Texture
    • +     +     + + +
  • HybridMonsterF1Texture
    • +     +     +     + 50 +     + + MonsterF2 + + 终极关卡BOSS，超高血量和攻击力。击杀后掉落50能量。 + + + + + + + monster + + 48000 + 560 + 2 + + Weapon_MonsterF2 + + + +
  • HybridMonsterF2Texture
    • +     +     + + +
  • HybridMonsterF2Texture
    • +     +     + + +
  • HybridMonsterF2Texture
    • +     +     + + +
  • HybridMonsterF2Texture
    • +     +     +     + 50 +     + + + MaskMonster1 + + 快速生物近战怪物。击杀后掉落5能量。 + + + + + + + monster + + 4800 + 66 + 8 + + Weapon_MaskMonster + + + +
  • BiologicalMaskMonster1Texture
    • +     +     + + +
  • BiologicalMaskMonster1Texture
    • +     +     + + +
  • BiologicalMaskMonster1Texture
    • +     +     + + +
  • BiologicalMaskMonster1Texture
    • +     +     +     + 5 +     + + MaskMonster4 + + 更强大的快速精英生物近战怪物。击杀后掉落10能量。 + + + + + + + monster + + 9600 + 132 + 8 + + Weapon_MaskMonsterElite + + + +
  • BiologicalMaskMonster4Texture
    • +     +     + + +
  • BiologicalMaskMonster4Texture
    • +     +     + + +
  • BiologicalMaskMonster4Texture
    • +     +     + + +
  • BiologicalMaskMonster4Texture
    • +     +     +     + 10 +     + + HologramMonster1 + + 特殊的生物近战怪物，无移动速度。击杀后掉落5能量。 + + + + + + + monster + + 6666 + -66 + 0 + + Weapon_HologramMonster + + + +
  • BiologicalHologramMonster1Texture
    • +     +     + + +
  • BiologicalHologramMonster1Texture
    • +     +     + + +
  • BiologicalHologramMonster1Texture
    • +     +     + + +
  • BiologicalHologramMonster1Texture
    • +     +     +     + 5 +     + + HologramMonster3 + + 更强大的精英生物近战怪物，无移动速度。击杀后掉落10能量。 + + + + + + + monster + + 16666 + -166 + 0 + + Weapon_HologramMonsterElite + + + +
  • BiologicalHologramMonster3Texture
    • +     +     + + +
  • BiologicalHologramMonster3Texture
    • +     +     + + +
  • BiologicalHologramMonster3Texture
    • +     +     + + +
  • BiologicalHologramMonster3Texture
    • +     +     +     + 10 +     + + SnakeMonster1 + + 生物远程怪物。击杀后掉落5能量。 + + + + + + + monster + + 5630 + 78 + 2 + + Weapon_SnakeMonster + + + +
  • BiologicalSnakeMonster1Texture
    • +     +     + + +
  • BiologicalSnakeMonster1Texture
    • +     +     + + +
  • BiologicalSnakeMonster1Texture
    • +     +     + + +
  • BiologicalSnakeMonster1Texture
    • +     +     +     + 5 +     + + SnakeMonster4 + + 更强大的精英生物远程怪物。击杀后掉落10能量。 + + + + + + + monster + + 11260 + 156 + 2 + + Weapon_SnakeMonsterElite + + + +
  • BiologicalSnakeMonster4Texture
    • +     +     + + +
  • BiologicalSnakeMonster4Texture
    • +     +     + + +
  • BiologicalSnakeMonster4Texture
    • +     +     + + +
  • BiologicalSnakeMonster4Texture
    • +     +     +     + 10 +     + + RatMonster1 + + 弱小的生物近战怪物，每11秒移动一次。击杀后掉落1能量。 + + + + + + + monster + + 111 + 1 + 11 + + Weapon_RatMonster + + + +
  • BiologicalRatMonster1Texture
    • +     +     + + +
  • BiologicalRatMonster1Texture
    • +     +     + + +
  • BiologicalRatMonster1Texture
    • +     +     + + +
  • BiologicalRatMonster1Texture
    • +     +     +     + 1 +     + + RatMonster2 + + 更强大的精英生物近战怪物，每22秒移动一次。击杀后掉落2能量。 + + + + + + + monster + + 222 + 2 + 22 + + Weapon_RatMonsterElite + + + +
  • BiologicalRatMonster2Texture
    • +     +     + + +
  • BiologicalRatMonster2Texture
    • +     +     + + +
  • BiologicalRatMonster2Texture
    • +     +     + + +
  • BiologicalRatMonster2Texture
    • +     +     +     + 2 +     + \ No newline at end of file diff --git a/Client/Data/Core/Define/Pawn/MonsterTextures.xml b/Client/Data/Core/Define/Pawn/MonsterTextures.xml new file mode 100644 index 0000000..3b50257 --- /dev/null +++ b/Client/Data/Core/Define/Pawn/MonsterTextures.xml @@ -0,0 +1,136 @@ + + + + + MechanicalMonsterA1Texture + res:Texture/Monster/机械/A怪物1 + 1 + 1 + + + MechanicalMonsterA2Texture + res:Texture/Monster/机械/A怪物2 + 1 + 1 + + + MechanicalMonsterB1Texture + res:Texture/Monster/机械/B怪物1 + 1 + 1 + + + MechanicalMonsterB2Texture + res:Texture/Monster/机械/B怪物2 + 1 + 1 + + + MechanicalMonsterC1Texture + res:Texture/Monster/机械/C怪物1 + 1 + 1 + + + MechanicalMonsterC2Texture + res:Texture/Monster/机械/C怪物2 + 1 + 1 + + + + + HybridMonsterD1Texture + res:Texture/Monster/混合/D怪物1 + 1 + 1 + + + HybridMonsterD2Texture + res:Texture/Monster/混合/D怪物2 + 1 + 1 + + + HybridMonsterE1Texture + res:Texture/Monster/混合/E怪物1 + 1 + 1 + + + HybridMonsterE2Texture + res:Texture/Monster/混合/E怪物2 + 1 + 1 + + + HybridMonsterF1Texture + res:Texture/Monster/混合/F怪物1 + 1 + 1 + + + HybridMonsterF2Texture + res:Texture/Monster/混合/F怪物2 + 1 + 1 + + + + + BiologicalMaskMonster1Texture + res:Texture/Monster/生物/面具1 + 1 + 1 + + + + BiologicalHologramMonster1Texture + res:Texture/Monster/生物/全息1 + 1 + 1 + + + + BiologicalSnakeMonster1Texture + res:Texture/Monster/生物/蛇1 + 1 + 1 + + + + + + GenericBulletTexture + res:Texture/Bullet/GenericBullet + 1 + 1 + + + \ No newline at end of file diff --git a/Client/Packages/manifest.json b/Client/Packages/manifest.json index 4183d75..084e6e3 100644 --- a/Client/Packages/manifest.json +++ b/Client/Packages/manifest.json @@ -13,6 +13,7 @@ "com.unity.test-framework": "1.5.1", "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", + "com.unity.vectorgraphics": "2.0.0-preview.25", "com.unity.visualscripting": "1.9.8", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json index 76e1efc..4c5998d 100644 --- a/Client/Packages/packages-lock.json +++ b/Client/Packages/packages-lock.json @@ -20,8 +20,8 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.tilemap": "1.0.0", "com.unity.2d.tilemap": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.24", + "version": "1.8.23", "depth": 2, "source": "registry", "dependencies": { @@ -53,14 +53,13 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.7", + "version": "2.5.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.19", - "com.unity.mathematics": "1.3.2", - "com.unity.nuget.mono-cecil": "1.11.5", - "com.unity.test-framework": "1.4.6", + "com.unity.burst": "1.8.17", + "com.unity.test-framework": "1.4.5", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -114,14 +113,14 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.5", + "version": "1.11.4", "depth": 3, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.2.0", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { @@ -136,12 +135,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.2.0", + "version": "17.1.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.2.0", - "com.unity.shadergraph": "17.2.0", + "com.unity.render-pipelines.core": "17.1.0", + "com.unity.shadergraph": "17.1.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -171,11 +170,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.2.0", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.2.0", + "com.unity.render-pipelines.core": "17.1.0", "com.unity.searcher": "4.9.3" } }, @@ -204,9 +203,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -220,6 +219,25 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.vectorgraphics": { + "version": "2.0.0-preview.25", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.visualscripting": { "version": "1.9.8", "depth": 0, @@ -378,8 +396,7 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index 193ceb3..3ced676 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0 + bundleVersion: 0.2 preloadedAssets: - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} metroInputSource: 0 diff --git a/Client/ProjectSettings/ShaderGraphSettings.asset b/Client/ProjectSettings/ShaderGraphSettings.asset index ce8c243..e66042a 100644 --- a/Client/ProjectSettings/ShaderGraphSettings.asset +++ b/Client/ProjectSettings/ShaderGraphSettings.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 - overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/Tools/ProtoBuf/proto/message.proto b/Tools/ProtoBuf/proto/message.proto index e52936b..59d5465 100644 --- a/Tools/ProtoBuf/proto/message.proto +++ b/Tools/ProtoBuf/proto/message.proto @@ -33,3 +33,260 @@ message SignupResponse { RequestResult result = 1; string message = 2; } + +// 导入 google/protobuf/empty.proto 用于不需要参数或返回值的 RPC +import "google/protobuf/empty.proto"; +// 导入 google/protobuf/timestamp.proto 用于时间戳 +import "google/protobuf/timestamp.proto"; +// 可以根据需要导入其他标准 Protobuf 类型 +// =================================================================== +// 1. 基础公共类型和枚举 +// =================================================================== +// 表示一个唯一的实体ID +message EntityID { + string value = 1; // 例如：UUID, "player_123", "enemy_A_45" +} +// 2D 向量（位置或方向） +message Vec2D { + float x = 1; + float y = 2; +} +// 房间状态枚举 +enum RoomStatus { + UNKNOWN_ROOM_STATUS = 0; // 未知状态，通常作为默认值 + WAITING = 1; // 等待玩家加入 + IN_GAME = 2; // 游戏进行中 + FINISHED = 3; // 游戏已结束，等待结算 +} +// 游戏版本信息 +message GameVersion { + uint32 major = 1; // 主版本号 + uint32 minor = 2; // 次版本号 + uint32 patch = 3; // 补丁版本号 +} +// 包信息 (用于核对客户端资源包) +message PackageInfo { + string package_id = 1; // 包的唯一ID (如 "map_pack_001", "character_skins") + GameVersion version = 2; // 包的版本 + string checksum = 3; // 包的校验和 (MD5, SHA256等)，用于完整性检查 +} +// =================================================================== +// 2. 身份验证与连接服务 (Authentication and Connection Service) +// 用于客户端连接、核对版本和资源包 +// =================================================================== +service AuthService { + // 客户端连接服务器时进行初始化认证 + rpc Authenticate (AuthRequest) returns (AuthResponse); +} +// 认证请求 +message AuthRequest { + string client_id = 1; // 客户端唯一ID (如设备ID或用户ID) + GameVersion game_version = 2; // 客户端的游戏版本 + repeated PackageInfo client_packages = 3; // 客户端拥有的资源包列表及其版本和校验和 + string auth_token = 4; // 可选：OAuth token 或其他认证凭证 +} +// 认证响应 +message AuthResponse { + bool success = 1; // 是否认证成功 + optional string message = 2; // 认证失败时的错误消息 + // 如果认证失败，可能需要提供不匹配的包信息 + repeated PackageInfo mismatched_packages = 3; // 服务器端不匹配或过时的包信息 + // 注意：此处可以考虑更详细的错误码系统 + // 如果成功，可能返回一些会话信息 + optional string session_id = 4; // 会话ID，用于后续请求 +} +// =================================================================== +// 3. 房间管理服务 (Room Management Service) +// 用于查询、建立、加入和离开房间 +// =================================================================== +service RoomService { + // 查询可用房间列表 + rpc ListRooms (ListRoomsRequest) returns (ListRoomsResponse); + // 创建一个新房间 + rpc CreateRoom (CreateRoomRequest) returns (CreateRoomResponse); + // 加入一个现有房间 + rpc JoinRoom (JoinRoomRequest) returns (JoinRoomResponse); + // 离开当前房间 + rpc LeaveRoom (LeaveRoomRequest) returns (google.protobuf.Empty); // 无需特定响应体 + // 撤销一个房间 (通常由房主或服务器管理员操作) + rpc DisbandRoom (DisbandRoomRequest) returns (google.protobuf.Empty); +} +// 房间信息（公共可见部分） +message RoomInfo { + string room_id = 1; + string room_name = 2; + RoomStatus status = 3; + uint32 current_players = 4; + uint32 max_players = 5; + string map_id = 6; // 当前房间使用的地图ID + bool is_private = 7; // 是否是私人房间，需要密码或邀请 + string host_player_id = 8; // 房主ID + google.protobuf.Timestamp created_at = 9; // 房间创建时间 + GameVersion game_version = 10; // 房间创建时使用的游戏版本，确保一致性 +} +// 查询房间请求 +message ListRoomsRequest { + // 可以根据不同的过滤条件查询房间 + optional string map_id_filter = 1; + optional RoomStatus status_filter = 2; + bool only_available = 3; // 只返回可加入的房间 + uint32 max_results = 4; // 最大返回数量 +} +// 查询房间响应 +message ListRoomsResponse { + repeated RoomInfo rooms = 1; +} +// 创建房间请求 +message CreateRoomRequest { + string room_name = 1; + uint32 max_players = 2; + string map_id = 3; + optional string password = 4; // 私人房间密码 + bool is_private = 5; + string player_id = 6; // 创建者的玩家ID +} +// 创建房间响应 +message CreateRoomResponse { + bool success = 1; + optional string message = 2; + optional RoomInfo room_info = 3; // 成功创建后返回房间信息 +} +// 加入房间请求 +message JoinRoomRequest { + string room_id = 1; + string player_id = 2; + optional string password = 3; // 如果是私人房间，需要提供密码 +} +// 加入房间响应 +message JoinRoomResponse { + bool success = 1; + optional string message = 2; + optional RoomInfo room_info = 3; // 成功加入后返回房间信息 + optional string player_session_token = 4; // 玩家在房间内的会话令牌 +} +// 离开房间请求 +message LeaveRoomRequest { + string room_id = 1; + string player_id = 2; +} +// 撤销房间请求 +message DisbandRoomRequest { + string room_id = 1; + string player_id = 2; // 执行撤销的玩家ID (需验证权限) +} +// =================================================================== +// 4. 游戏同步服务 (Game Synchronization Service) +// 用于游戏内实体、地图、状态等数据的同步 +// 这是一个双向流RPC，客户端和服务器可以持续发送更新 +// =================================================================== +service GameSyncService { + // Bi-directional streaming RPC for real-time game state synchronization + // 客户端和服务器持续发送 GameSyncMessage + rpc SyncGame (stream GameSyncMessage) returns (stream GameSyncMessage); +} +// 实体属性（运行时属性，例如血量、能量等） +message EntityRuntimeProperties { + map string_properties = 1; // 字符串属性 (例如 "state": "idle", "team_id": "blue") + map int_properties = 2; // 整型属性 (例如 "health": 100, "attack": 10) + map float_properties = 3; // 浮点型属性 (例如 "speed": 5.5, "mana_regen": 1.2) + map bool_properties = 4; // 布尔属性 (例如 "is_dead": false, "can_move": true) + // 可以添加更多常用类型或更复杂的嵌套消息来表示特定属性 +} +// 实体信息 +message Entity { + EntityID id = 1; // 实体的唯一运行时ID + string def_name = 2; // 实体的定义名称 (例如 "PlayerCharacterA", "GoblinWarrior", "HealthPotion") + Vec2D position = 3; // 位置 + Vec2D orientation = 4; // 朝向 (归一化向量) + // 运行时属性 + EntityRuntimeProperties properties = 5; + // 实体所属的维度ID (例如 "world_0", "dungeon_level_1", "instance_arena_3") + string dimension_id = 6; + // 实体创建时间 (可选) + optional google.protobuf.Timestamp created_at = 7; +} +// 维度信息 (例如一个地图区域，一个副本实例) +message Dimension { + string id = 1; // 维度ID (如 "main_world", "dungeon_level_1") + string map_id = 2; // 维度所使用的地图静态ID + // 其他维度相关的状态，例如天气，时间OfDay等 + map custom_data = 3; +} +// 单个游戏状态更新包 +message GameStateUpdate { + string room_id = 1; // 房间ID + google.protobuf.Timestamp timestamp = 2; // 更新时间戳 + // 实体更新 + repeated Entity entities_to_add = 3; // 要添加或完全更新的实体 + repeated Entity entities_to_update = 4; // 要更新的实体（可能是部分更新，根据实现） + repeated EntityID entities_to_remove = 5; // 要移除的实体ID + // 维度更新 + repeated Dimension dimensions_to_add = 6; + repeated Dimension dimensions_to_update = 7; + repeated string dimensions_to_remove = 8; // 移除维度的ID + // 其他全局游戏状态（例如游戏阶段、得分、时间限制等） + map global_state_properties = 9; +} +// 游戏事件 +message GameEvent { + enum EventType { + UNKNOWN_EVENT = 0; + PLAYER_HIT = 1; + ITEM_PICKUP = 2; + ENTITY_KILLED = 3; + SKILL_CAST = 4; + // ... 更多事件类型 + } + EventType type = 1; + string room_id = 2; + google.protobuf.Timestamp timestamp = 3; + string source_entity_id = 4; // 导致事件的实体ID + optional string target_entity_id = 5; // 事件影响的实体ID + // 事件的具体数据，使用 oneof 模式更优雅 + oneof event_data { + PlayerHitEvent player_hit = 6; + ItemPickupEvent item_pickup = 7; + // ... 更多事件的详细数据 + } +} +// 具体的事件数据示例 +message PlayerHitEvent { + int32 damage_dealt = 1; + string weapon_id = 2; +} +message ItemPickupEvent { + string item_def_name = 1; + int32 quantity = 2; +} +// 通用游戏同步消息（客户端和服务器双向） +message GameSyncMessage { + string room_id = 1; // 当前消息所属的房间ID + string player_id = 2; // 发送消息的玩家ID (客户端发送时) 或目标玩家ID (服务器发送时) + // 使用 oneof 来区分消息类型 + oneof content { + GameStateUpdate state_update = 3; // 服务器发送完整的游戏状态或增量更新 + GameEvent client_event = 4; // 客户端发送的游戏操作事件 (如移动、攻击) + GameEvent server_event = 5; // 服务器发送的游戏事件 (如伤害、物品掉落) + ClientHeartbeat heartbeat = 6; // 客户端发送的心跳包 + ServerPing ping = 7; // 服务器发送的ping消息 + ClientInput input = 8; // 客户端的输入 (键盘/鼠标/手柄) + } +} +// 客户端心跳 +message ClientHeartbeat { + google.protobuf.Timestamp client_time = 1; // 客户端本地时间 +} +// 服务器 ping (用于延迟计算) +message ServerPing { + google.protobuf.Timestamp server_time = 1; // 服务器发送时间 +} +// 客户端输入（示例，可以更复杂） +message ClientInput { + // 按键状态，例如：map keys_pressed; + repeated string keys_pressed = 1; // 当前按下的键名列表 + Vec2D mouse_position = 2; // 鼠标屏幕坐标 + bool left_mouse_click = 3; + bool right_mouse_click = 4; + Vec2D movement_direction = 5; // 玩家移动的期望方向向量 + // 可以添加更多输入相关的数据 +} \ No newline at end of file