diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画.meta b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画.meta new file mode 100644 index 00000000..9970d9d6 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aed0d2bbae0278243a9fc4ad24ab8c44 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim new file mode 100644 index 00000000..9b4b4ef2 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim @@ -0,0 +1,445 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SunChange + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 45} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.4, y: 0.4, z: 0.4} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0.4, y: 0.4, z: 0.4} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 45 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 224 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim.meta b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim.meta new file mode 100644 index 00000000..52543b8b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunChange.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7c6c003c4740cb4c8ca1bfb40e69c65 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller new file mode 100644 index 00000000..36c475a4 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8866460482470999057 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Change + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4149630306856571222} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-716773460808656294 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4149630306856571222} + m_Position: {x: 40, y: 350, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6327393080852224908} + m_Position: {x: 40, y: 210, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6327393080852224908} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SunFloors + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Change + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -716773460808656294} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &4149630306856571222 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SunChange + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7462343709353718551} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a7c6c003c4740cb4c8ca1bfb40e69c65, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6327393080852224908 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SunNormal + m_Speed: 0.25 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8866460482470999057} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5b00f9161aabd1f47838d11d651b9e27, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &7462343709353718551 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6327393080852224908} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller.meta b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller.meta new file mode 100644 index 00000000..d236cd9c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunFloors.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 916a22cfa632afc43b979d569ac507e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim new file mode 100644 index 00000000..59ae9514 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SunNormal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 17.955112} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 20.05 + value: {x: 0, y: 0, z: 360} + inSlope: {x: 0, y: 0, z: 17.955112} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 20.05 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 17.955112 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20.05 + value: 360 + inSlope: 17.955112 + outSlope: 0 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 224 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim.meta b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim.meta new file mode 100644 index 00000000..c78a9174 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/太阳动画/SunNormal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b00f9161aabd1f47838d11d651b9e27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png new file mode 100644 index 00000000..1703120e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png.meta new file mode 100644 index 00000000..ecf1938d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新UI/未命名作品(50).png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: f3d1c0e86bc707f45a84a2b357e2e880 +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(50)_2" + rect: + serializedVersion: 2 + x: 325 + y: 4 + width: 1738 + height: 1658 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c8fcd4f4f414f8a408cb1796da0c9250 + internalID: 2061866726 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 773437cc4b6fe914882e9dc32a2b0be0 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(50)_0": -1627416000 + "\u672A\u547D\u540D\u4F5C\u54C1(50)_1": 1250605207 + "\u672A\u547D\u540D\u4F5C\u54C1(50)_2": 2061866726 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色.meta new file mode 100644 index 00000000..efc03d57 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcce5000115d7db4992f9a040010840d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png new file mode 100644 index 00000000..9d5ce7d6 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png.meta new file mode 100644 index 00000000..2b05d3d2 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(56).png.meta @@ -0,0 +1,150 @@ +fileFormatVersion: 2 +guid: 148a2d2d0f79e5a45956a050630a28be +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(56)_0" + rect: + serializedVersion: 2 + x: 371 + y: 836 + width: 909 + height: 959 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6819796bc3d594446b27014373199eb8 + internalID: -446724613 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8d7a49b7212941c4f871a3611bac965f + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(56)_0": -446724613 + "\u672A\u547D\u540D\u4F5C\u54C1(56)_1": 289313076 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png new file mode 100644 index 00000000..ae0c6a74 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png.meta new file mode 100644 index 00000000..d2ae1986 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(57).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 0a388abdc93c588448fc42a4b574d92e +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(57)_0" + rect: + serializedVersion: 2 + x: 475 + y: 115 + width: 658 + height: 93 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dd322d3892271274090515a56fbda878 + internalID: -1630926794 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2515812e51b7a724394581779751d089 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(57)_0": -1630926794 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png new file mode 100644 index 00000000..2dd3053a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png.meta new file mode 100644 index 00000000..7698cb66 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(58).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 466b6bcc545cfba4e82ab73d880534da +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(58)_0" + rect: + serializedVersion: 2 + x: 474 + y: 1803 + width: 660 + height: 96 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c95cba6311bc52489fb90432b0ab983 + internalID: 1682609269 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: abc04b4f7bc4dab438c8e7d6658b3b47 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(58)_0": 1682609269 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png new file mode 100644 index 00000000..be12766a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png.meta new file mode 100644 index 00000000..b0953811 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(59).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 6c7b2a83c2f15064790d33e1c801bb99 +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(59)_0" + rect: + serializedVersion: 2 + x: 469 + y: 1798 + width: 672 + height: 103 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 440446e744e043b4792c570cbdb59847 + internalID: -1377002784 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 413fa1c8108c70043a7ef43c6a9780ce + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(59)_0": -1377002784 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png new file mode 100644 index 00000000..8fdfa175 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png.meta similarity index 90% rename from ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png.meta rename to ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png.meta index 671a23b8..47e3bc04 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(60).png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 787ce7abe3875da46ab336a461aaf8e3 +guid: d6b5c035f507c154b961512d292efe19 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -110,13 +110,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Sslx_Card_Kamizn_Hudun_v01_0 + name: "\u672A\u547D\u540D\u4F5C\u54C1(60)_0" rect: serializedVersion: 2 - x: 1557 - y: 1198 - width: 910 - height: 724 + x: 157 + y: 154 + width: 353 + height: 355 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -124,8 +124,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 660e3b0383b52fb45b59bb6983d72f22 - internalID: 1276828183 + spriteID: 15b5045db2b05144887b678d496827ff + internalID: 486269610 vertices: [] indices: edges: [] @@ -133,7 +133,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 755f223d4542ede46893a2ab7cd42877 + spriteID: 7156aaa0685c6b64288d595a980e6fad internalID: 0 vertices: [] indices: @@ -141,7 +141,7 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - Sslx_Card_Kamizn_Hudun_v01_0: 1276828183 + "\u672A\u547D\u540D\u4F5C\u54C1(60)_0": 486269610 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png new file mode 100644 index 00000000..d071ee17 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png.meta new file mode 100644 index 00000000..668cab21 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品(62).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 0a24c663bcd9db44d92d3f0503021081 +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(62)_0" + rect: + serializedVersion: 2 + x: 66 + y: 78 + width: 460 + height: 477 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fbf21151f979e4e4baf2e124ffd21bdc + internalID: -1914403500 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 378b1cce592b2de429d9ed68dae46d58 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(62)_0": -1914403500 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关.meta new file mode 100644 index 00000000..cdc02c2d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6edcbbc1514fd5847b67e1d043fb3cce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png new file mode 100644 index 00000000..2a9a4f75 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png.meta new file mode 100644 index 00000000..c7c3e6ab --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(51).png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b5d132332ff25a44aa45b175b20ca9c9 +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: 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png new file mode 100644 index 00000000..db2ecc29 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta new file mode 100644 index 00000000..c7363e76 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta @@ -0,0 +1,303 @@ +fileFormatVersion: 2 +guid: ee9d3d2936bac1148abcec2385b98ec3 +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_0" + rect: + serializedVersion: 2 + x: 133 + y: 315 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8bb8a7811209b1d4f9f3b8a5edd1382e + internalID: -687936468 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_1" + rect: + serializedVersion: 2 + x: 536 + y: 299 + width: 502 + height: 568 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f0bab3f0df6ce64428d8a18119314fb2 + internalID: 865203525 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_2" + rect: + serializedVersion: 2 + x: 1035 + y: 296 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ccccd16d440d60343b02ce22b6491669 + internalID: 1709634788 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_3" + rect: + serializedVersion: 2 + x: 1529 + y: 293 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: facf98a263d8a1d46afab4e75aca7f8f + internalID: 929432110 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_4" + rect: + serializedVersion: 2 + x: 1991 + y: 280 + width: 429 + height: 432 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fc369f7a84ec1684693d1afa45504ac6 + internalID: 865446097 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_5" + rect: + serializedVersion: 2 + x: 2454 + y: 276 + width: 496 + height: 439 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7e56ac57337ca3547b3160994f2e9f91 + internalID: -1693594073 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_6" + rect: + serializedVersion: 2 + x: 3031 + y: 293 + width: 400 + height: 400 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea1c871b26319144a9073cbd3b1dded5 + internalID: 558621461 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(52)_7" + rect: + serializedVersion: 2 + x: 1309 + y: 142 + width: 202 + height: 14 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d86fbc4af1d7f8948b6570f9c1be3454 + internalID: -1543605294 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(52)_0": -687936468 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_1": 865203525 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_2": 1709634788 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_3": 929432110 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_4": 865446097 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_5": -1693594073 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_6": 558621461 + "\u672A\u547D\u540D\u4F5C\u54C1(52)_7": -1543605294 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png new file mode 100644 index 00000000..4574a97d Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png.meta new file mode 100644 index 00000000..54ee792f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(54).png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 3f178ac41dab5ba4f87ae0183d99f2ff +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: 2 + 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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: + - serializedVersion: 2 + name: "\u672A\u547D\u540D\u4F5C\u54C1(54)_0" + rect: + serializedVersion: 2 + x: 74 + y: 423 + width: 17 + height: 324 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4a650b1b40510cb4ca4e3fa3a7045328 + internalID: -1106922250 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u672A\u547D\u540D\u4F5C\u54C1(54)_0": -1106922250 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png new file mode 100644 index 00000000..c326b28b Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png.meta new file mode 100644 index 00000000..863ce669 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(55).png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ff32fb1659a153e42a94662fdb5b6066 +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: 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly.meta b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly.meta new file mode 100644 index 00000000..236c25a9 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18d6d5ee34d6ba646bfd0e433e8e6991 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader new file mode 100644 index 00000000..3af942c6 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader @@ -0,0 +1,98 @@ +Shader "UI/Overlay" +{ + Properties + { + [PerRendererData] _MainTex("Font Texture", 2D) = "white" {} + + _Color("Tint", Color) = (1,1,1,1) + + _StencilComp("Stencil Comparison", Float) = 8 + _Stencil("Stencil ID", Float) = 0 + _StencilOp("Stencil Operation", Float) = 0 + _StencilWriteMask("Stencil Write Mask", Float) = 255 + _StencilReadMask("Stencil Read Mask", Float) = 255 + + _ColorMask("Color Mask", Float) = 15 + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + "PreviewType" = "Plane" + "CanUseSpriteAtlas" = "True" + } + + Stencil + { + Ref[_Stencil] + Comp[_StencilComp] + Pass[_StencilOp] + ReadMask[_StencilReadMask] + WriteMask[_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + ZTest Always + Offset -1,-1 + Blend SrcAlpha OneMinusSrcAlpha + ColorMask[_ColorMask] + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + float4 color : COLOR; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + half2 texcoord : TEXCOORD0; + fixed4 color : COLOR; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + fixed4 _Color; + fixed4 _TextureSampleAdd; + + v2f vert(appdata_t v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + o.color = v.color * _Color; + #ifdef UNITY_HALF_TEXEL_OFFSET + o.vertex.xy += (_ScreenParams.zw - 1.0)*float2(-1,1); + #endif + + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + fixed4 col = (tex2D(_MainTex, i.texcoord) + _TextureSampleAdd) * i.color; + clip(col.a - 0.01); + return col; + } + ENDCG + } + } +} + diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader.meta b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader.meta new file mode 100644 index 00000000..253ba523 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/Overlay.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: febafcfc907b7d04aac4d67b6af026bf +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat new file mode 100644 index 00000000..240d9106 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-845385207162381983 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OverlayUI + m_Shader: {fileID: 4800000, guid: febafcfc907b7d04aac4d67b6af026bf, 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: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat.meta b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat.meta new file mode 100644 index 00000000..c9eb3e1e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Materials/UIOverly/OverlayUI.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5f80b20a6319c744ad2296a28845fda +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab index ab136840..644fe7cf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIcon.prefab @@ -59,7 +59,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -134,7 +134,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab index f7d6dc5e..58d0ceef 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab @@ -393,8 +393,8 @@ MonoBehaviour: fun3Val: {fileID: 0} smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} - noSmallCard: 0 - noSyncText: 0 + noSmallCard: 1 + noSyncText: 1 conditionList: - {fileID: 4398690247767463098} - {fileID: 5970626616650445913} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/EmptyNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/EmptyNode.prefab index 72a72120..539e3fbe 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/EmptyNode.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/EmptyNode.prefab @@ -234,6 +234,7 @@ MonoBehaviour: nextLevelNodes: [] lineRenderer: {fileID: 7723156746810573798, guid: 053bbdc62ad2af54ab02af9260df599a, type: 3} + lineOffset: 0.5 roomType: 0 roomDestinationIndex: 0 --- !u!1 &4322012816575514674 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/Image.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/Image.prefab index a2325b39..05e2f44e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/Image.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/Image.prefab @@ -58,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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: -1106922250, guid: 3f178ac41dab5ba4f87ae0183d99f2ff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png new file mode 100644 index 00000000..8861afe5 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png.meta new file mode 100644 index 00000000..66fba3ed --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/11.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2f7c7e2877b292942973149249a39684 +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: 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: 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 + - serializedVersion: 3 + buildTarget: Server + 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/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png index 8861afe5..092747f7 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png and b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png.meta index 66fba3ed..671a23b8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1blue.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f7c7e2877b292942973149249a39684 +guid: 787ce7abe3875da46ab336a461aaf8e3 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,18 +108,40 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Sslx_Card_Kamizn_Hudun_v01_0 + rect: + serializedVersion: 2 + x: 1557 + y: 1198 + width: 910 + height: 724 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 660e3b0383b52fb45b59bb6983d72f22 + internalID: 1276828183 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 755f223d4542ede46893a2ab7cd42877 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Sslx_Card_Kamizn_Hudun_v01_0: 1276828183 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png b/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png deleted file mode 100644 index 092747f7..00000000 Binary files a/ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/Sslx_Card_Kamizn_Hudun_v01.png and /dev/null differ diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity index a021bde3..0af705da 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity @@ -1014,13 +1014,13 @@ MonoBehaviour: - levelColumn: [] - levelColumn: [] - levelColumn: [] - monsterIcon: {fileID: 21300000, guid: 76c98050a10569a47b1a39a896495b71, type: 3} - eliteMonsterIcon: {fileID: 21300000, guid: 646e58a8cd5cd2145bf0985299361fa8, type: 3} - bossIcon: {fileID: 21300000, guid: a61b314c8ac7c44468531f8788cfafcc, type: 3} - shopIcon: {fileID: 21300000, guid: 0ede3fde763ed2f4eb0a9d302223dfc8, type: 3} - campfireIcon: {fileID: 21300000, guid: 61f8f385d55979a48aeda4bcce61fccf, type: 3} - incidentIcon: {fileID: 21300000, guid: 44e3626da16308c43b0b0c0842f18ab9, type: 3} - treasureIcon: {fileID: 21300000, guid: ec538e81295984d4ab30a848644947dc, type: 3} + monsterIcon: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + eliteMonsterIcon: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + bossIcon: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + shopIcon: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + campfireIcon: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + incidentIcon: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + treasureIcon: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} --- !u!1 &324633910 GameObject: m_ObjectHideFlags: 0 @@ -1166,6 +1166,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 345623503} m_CullTransparentMesh: 1 +--- !u!1 &362330458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 362330459} + - component: {fileID: 362330461} + - component: {fileID: 362330460} + m_Layer: 5 + m_Name: BackGround (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &362330459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362330458} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000000074505806} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1343826539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 348.9, y: 0} + m_SizeDelta: {x: 174.859, y: 93.338} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &362330460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362330458} + 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: b5d132332ff25a44aa45b175b20ca9c9, 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 &362330461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362330458} + m_CullTransparentMesh: 1 --- !u!1 &385316862 GameObject: m_ObjectHideFlags: 0 @@ -1509,6 +1584,81 @@ Transform: m_Children: [] m_Father: {fileID: 1227892821} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &643864313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 643864314} + - component: {fileID: 643864316} + - component: {fileID: 643864315} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &643864314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643864313} + m_LocalRotation: {x: -0, y: -2.3283059e-10, z: 0.00489479, w: 0.999988} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 759243080} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.561} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 14.672, y: -4.571} + m_SizeDelta: {x: 10.89, y: 0.845} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &643864315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643864313} + 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: -1543605294, guid: ee9d3d2936bac1148abcec2385b98ec3, 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 &643864316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643864313} + m_CullTransparentMesh: 1 --- !u!1 &688835535 GameObject: m_ObjectHideFlags: 0 @@ -1573,6 +1723,82 @@ Transform: - {fileID: 324633911} m_Father: {fileID: 2088343897} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &759243079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759243080} + - component: {fileID: 759243082} + - component: {fileID: 759243081} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &759243080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759243079} + 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: 643864314} + m_Father: {fileID: 1343826539} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 5.57, y: 3.7} + m_SizeDelta: {x: 19.811, y: 21.511} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &759243081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759243079} + 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: ff32fb1659a153e42a94662fdb5b6066, 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 &759243082 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759243079} + m_CullTransparentMesh: 1 --- !u!1 &783170688 GameObject: m_ObjectHideFlags: 0 @@ -2144,8 +2370,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 53920778} m_HandleRect: {fileID: 53920777} m_Direction: 0 - m_Value: 0.00000029554465 - m_Size: 0.49275732 + m_Value: 0.000000076738964 + m_Size: 0.43075514 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3305,14 +3531,21 @@ MonoBehaviour: originalPoint: {x: 0, y: 0, z: 0} generatorLine: 14 generatorColumn: 5 - lineOffset: 1.5 - columnOffset: 2.2 - pathAmount: 4 + lineOffset: 1 + columnOffset: 2.13 + pathAmount: 5 mosterWight: 45 eliteMosterWight: 16 shopWight: 5 incidentWight: 22 campfireWight: 12 + mosterBig: {x: 0.04, y: 0.04, z: 0.04} + eliteMosterBig: {x: 0.05, y: 0.05, z: 0.05} + shopBig: {x: 0.055, y: 0.055, z: 0.055} + incidentBig: {x: 0.05, y: 0.05, z: 0.05} + campfireBig: {x: 0.04, y: 0.04, z: 0.04} + bossBig: {x: 0.1, y: 0.1, z: 0.1} + treasureBig: {x: 0.035, y: 0.035, z: 0.035} treasureFloor: 6 levelPrefab: {fileID: 980190143975240430, guid: c8c223db4c0d17645bca03489a39b721, type: 3} @@ -3469,7 +3702,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1241209780 RectTransform: m_ObjectHideFlags: 0 @@ -3477,18 +3710,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241209779} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000000074505806} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1343826539} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.19999695, y: 4.4449997} - m_SizeDelta: {x: 102.035, y: 250} - m_Pivot: {x: 0.5, y: 0.5} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -0.000038146973, y: 0} + m_SizeDelta: {x: 174.258, y: 93.338} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1241209781 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3509,7 +3742,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0ea3df8b35153c43b1bdabc1fdc164c, type: 3} + m_Sprite: {fileID: 21300000, guid: b5d132332ff25a44aa45b175b20ca9c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3775,13 +4008,15 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1241209780} + - {fileID: 362330459} + - {fileID: 759243080} - {fileID: 1941874172} m_Father: {fileID: 1698341606} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0, y: 0} - m_SizeDelta: {x: 154.888, y: 108.945} + m_AnchoredPosition: {x: 0.000024515064, y: 4} + m_SizeDelta: {x: 198.84, y: 108.945} m_Pivot: {x: 0, y: 1} --- !u!1 &1387789436 GameObject: @@ -5010,7 +5245,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941874171} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5018,7 +5253,7 @@ 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: -146.6, y: -40} + m_AnchoredPosition: {x: -139.4, y: -30.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1957780050 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index ccd8580e..36c28112 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -541,6 +541,83 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &25867313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 25867314} + - component: {fileID: 25867316} + - component: {fileID: 25867315} + m_Layer: 5 + m_Name: RedBorderText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &25867314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25867313} + m_LocalRotation: {x: -0.000000029802319, y: -0.000000059604638, z: 0.80696034, w: -0.59060556} + m_LocalPosition: {x: 0, y: 0, z: 0.00007367134} + m_LocalScale: {x: 1.000612, y: 1.0006119, z: 1.0006119} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 616191631} + m_Father: {fileID: 485490295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 252.4} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.43523, y: -0.000022888184} + m_SizeDelta: {x: 5.57, y: 213.58} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &25867315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25867313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.179 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &25867316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25867313} + m_CullTransparentMesh: 1 --- !u!1 &49967998 GameObject: m_ObjectHideFlags: 0 @@ -711,6 +788,7 @@ GameObject: - component: {fileID: 60998408} - component: {fileID: 60998407} - component: {fileID: 60998410} + - component: {fileID: 60998411} m_Layer: 0 m_Name: playerAni m_TagString: Untagged @@ -759,7 +837,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3} + m_Sprite: {fileID: -446724613, guid: 148a2d2d0f79e5a45956a050630a28be, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -778,7 +856,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60998406} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: f6dd374739cf95b4f9c87536c4106a36, type: 2} m_CullingMode: 0 @@ -799,13 +877,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60998406} serializedVersion: 2 - m_LocalRotation: {x: 0.15820347, y: 0.41508186, z: -0.04165652, w: 0.89495444} - m_LocalPosition: {x: 0.03, y: 0.53, z: 0.18} - m_LocalScale: {x: -0.17, y: 0.17, z: 0.17} - m_ConstrainProportionsScale: 1 + m_LocalRotation: {x: 0.16317591, y: 0.33682406, z: -0.05939116, w: 0.92541665} + m_LocalPosition: {x: 0, y: 0.53, z: 0} + m_LocalScale: {x: 0.17, y: 0.17, z: 0.17} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1809205616} - m_LocalEulerAnglesHint: {x: 18.527, y: 50.324, z: 3.433} + m_LocalEulerAnglesHint: {x: 20, y: 40, z: 0} --- !u!114 &60998410 MonoBehaviour: m_ObjectHideFlags: 0 @@ -818,6 +896,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7ec67cb98ea39d84d8a0401cc0a9c43e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &60998411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60998406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &78419876 GameObject: m_ObjectHideFlags: 0 @@ -1167,6 +1258,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 90854702} m_CullTransparentMesh: 1 +--- !u!1 &93650482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 93650483} + - component: {fileID: 93650485} + - component: {fileID: 93650484} + m_Layer: 5 + m_Name: RedBorderText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &93650483 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93650482} + m_LocalRotation: {x: 0, y: -0, z: 0.19200836, w: -0.98139334} + m_LocalPosition: {x: 0, y: 0, z: 0.000054121017} + m_LocalScale: {x: 1.0006115, y: 1.0006115, z: 1.0006115} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 826864415} + m_Father: {fileID: 1485211134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 337.86} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.43526, y: -0.0000166893} + m_SizeDelta: {x: 5.57, y: 213.58} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &93650484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93650482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.179 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &93650485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93650482} + m_CullTransparentMesh: 1 --- !u!1 &97259125 GameObject: m_ObjectHideFlags: 0 @@ -2949,8 +3117,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -3560,7 +3728,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -3639,7 +3807,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -5205,7 +5373,7 @@ Camera: field of view: 37 orthographic: 0 orthographic size: 4.82 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -5255,7 +5423,7 @@ MonoBehaviour: m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 4294967295 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 1 @@ -5664,7 +5832,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} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -6167,7 +6335,7 @@ GameObject: - component: {fileID: 365854628} - component: {fileID: 365854627} - component: {fileID: 365854626} - m_Layer: 0 + m_Layer: 5 m_Name: BUffPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -6182,16 +6350,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365854624} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.000000041723247} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 468997173} 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.0231, y: -0.2098} - m_SizeDelta: {x: 0.8654, y: 0.1566} + 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 &365854626 MonoBehaviour: @@ -6229,7 +6397,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -6331,6 +6499,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 368102274} m_CullTransparentMesh: 1 +--- !u!1 &374190880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 374190881} + - component: {fileID: 374190883} + - component: {fileID: 374190882} + m_Layer: 5 + m_Name: StarBuff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &374190881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374190880} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000000099093} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1974423747} + 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.43205, y: 0.245} + m_SizeDelta: {x: 0.3, y: 0.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &374190882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374190880} + 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: 486269610, guid: d6b5c035f507c154b961512d292efe19, 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 &374190883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374190880} + m_CullTransparentMesh: 1 --- !u!1 &377674262 GameObject: m_ObjectHideFlags: 0 @@ -8230,7 +8473,7 @@ GameObject: - component: {fileID: 468997173} - component: {fileID: 468997175} - component: {fileID: 468997174} - m_Layer: 0 + m_Layer: 5 m_Name: BuffPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -8245,18 +8488,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 468997172} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: -0.000000027381} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 365854625} m_Father: {fileID: 1974423747} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0, y: -0.001} - m_SizeDelta: {x: 1.1641, y: 0.2986} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -0.298} + m_SizeDelta: {x: 0.8697, y: 0.2986} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &468997174 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8269,7 +8512,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -8973,6 +9216,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1063928896} + - {fileID: 25867314} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -9006,7 +9250,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.894 + m_FillAmount: 0 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -9335,6 +9579,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 504685528} m_CullTransparentMesh: 1 +--- !u!1 &505162504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505162505} + - component: {fileID: 505162507} + - component: {fileID: 505162506} + m_Layer: 5 + m_Name: broder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &505162505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505162504} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00000004172325} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 608009377} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000000029802322, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &505162506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505162504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1377002784, guid: 6c7b2a83c2f15064790d33e1c801bb99, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &505162507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505162504} + m_CullTransparentMesh: 1 --- !u!1 &506890228 GameObject: m_ObjectHideFlags: 0 @@ -9385,7 +9704,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7075472, g: 0.5492158, b: 0.16353686, a: 1} + m_Color: {r: 0.6320754, g: 0.46874174, b: 0.068574235, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -9393,7 +9712,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -10496,7 +10815,7 @@ GameObject: - component: {fileID: 560113993} - component: {fileID: 560113995} - component: {fileID: 560113994} - m_Layer: 0 + m_Layer: 5 m_Name: Text (Legacy) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10510,13 +10829,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 560113992} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1302517661} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -0} @@ -10534,7 +10853,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -10740,7 +11059,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -40} + m_AnchoredPosition: {x: 23.2, y: -40} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &591146068 @@ -10764,8 +11083,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -11057,7 +11376,7 @@ GameObject: - component: {fileID: 608009377} - component: {fileID: 608009379} - component: {fileID: 608009378} - m_Layer: 0 + m_Layer: 5 m_Name: HPPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -11072,18 +11391,20 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 608009376} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000000010756776} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1093559905} + - {fileID: 505162505} + - {fileID: 1954493344} m_Father: {fileID: 1974423747} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.0763, y: 0} - m_SizeDelta: {x: 0.9464, y: 0.1244} - m_Pivot: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.08579988, y: -0.00020003319} + m_SizeDelta: {x: 0.69969994, y: 0.1244} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &608009378 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11096,15 +11417,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -959012317, guid: 922c3c65a6c19f94d8c3bdc7559825ef, type: 3} + m_Sprite: {fileID: 1682609269, guid: 466b6bcc545cfba4e82ab73d880534da, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11201,6 +11522,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612797171} m_CullTransparentMesh: 1 +--- !u!1 &616191630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 616191631} + - component: {fileID: 616191633} + - component: {fileID: 616191632} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &616191631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616191630} + m_LocalRotation: {x: 0, y: 0, z: -0.71751875, w: 0.6965392} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 25867314} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -91.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 64.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &616191632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616191630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &616191633 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616191630} + m_CullTransparentMesh: 1 --- !u!1 &617920031 GameObject: m_ObjectHideFlags: 0 @@ -12791,6 +13191,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1578615401} + - {fileID: 2085301212} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12824,7 +13225,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.259 + m_FillAmount: 0 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -13543,7 +13944,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -13832,7 +14233,7 @@ GameObject: - component: {fileID: 806364677} - component: {fileID: 806364679} - component: {fileID: 806364678} - m_Layer: 0 + m_Layer: 5 m_Name: maxHPtext m_TagString: Untagged m_Icon: {fileID: 0} @@ -13847,7 +14248,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 806364676} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000000020861622} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -13855,7 +14256,7 @@ 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: 0.326, y: -0.086} + m_AnchoredPosition: {x: -0.00000015646219, y: 0.0000005364418} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &806364678 @@ -13870,7 +14271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -14199,6 +14600,164 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 816979500} m_CullTransparentMesh: 1 +--- !u!1 &817460660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817460661} + - component: {fileID: 817460663} + - component: {fileID: 817460662} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &817460661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817460660} + m_LocalRotation: {x: 0, y: 0, z: -0.71751875, w: 0.6965392} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1189215339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -91.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 64.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &817460662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817460660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &817460663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817460660} + m_CullTransparentMesh: 1 +--- !u!1 &826864414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 826864415} + - component: {fileID: 826864417} + - component: {fileID: 826864416} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &826864415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826864414} + m_LocalRotation: {x: 0, y: 0, z: -0.71751875, w: 0.6965392} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 93650483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -91.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 64.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &826864416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826864414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &826864417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826864414} + m_CullTransparentMesh: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -15571,7 +16130,7 @@ GameObject: - component: {fileID: 932865025} - component: {fileID: 932865027} - component: {fileID: 932865026} - m_Layer: 0 + m_Layer: 5 m_Name: / m_TagString: Untagged m_Icon: {fileID: 0} @@ -15586,7 +16145,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 932865024} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -15594,7 +16153,7 @@ 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: 0.156, y: -0.086} + m_AnchoredPosition: {x: -0.00000011175871, y: 0.0000005364418} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &932865026 @@ -15609,7 +16168,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -17554,13 +18113,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058175796} - m_LocalRotation: {x: 0, y: 0, z: 0.9950902, w: 0.09897253} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00007367134} m_LocalScale: {x: 1.0006117, y: 1.0006117, z: 1.0006118} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1076314299} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 168.64} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 216.43524, y: 0} @@ -17630,13 +18189,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1063928895} - m_LocalRotation: {x: 0, y: -0, z: 0.33619142, w: -0.9417937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00007367134} m_LocalScale: {x: 1.0006117, y: 1.0006117, z: 1.0006118} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 485490295} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 320.71} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 216.43524, y: 0} @@ -17778,6 +18337,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1058175797} + - {fileID: 1189215339} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -17811,7 +18371,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.47 + m_FillAmount: 0 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -17921,8 +18481,8 @@ GameObject: - component: {fileID: 1093559905} - component: {fileID: 1093559907} - component: {fileID: 1093559906} - m_Layer: 0 - m_Name: Panel + m_Layer: 5 + m_Name: hp m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17936,16 +18496,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1093559904} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000004172325} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 608009377} 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.0656, y: -0} - m_SizeDelta: {x: 0.7534, y: 0.1244} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000000029802322, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1093559906 MonoBehaviour: @@ -17959,15 +18519,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.23303296, b: 0.20943397, a: 1} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1255180889, guid: fe1c308de7c89bc42a3777bfc18c8524, type: 3} + m_Sprite: {fileID: -1630926794, guid: 0a388abdc93c588448fc42a4b574d92e, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19462,6 +20022,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166023162} m_CullTransparentMesh: 1 +--- !u!1 &1176798115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1176798116} + - component: {fileID: 1176798118} + - component: {fileID: 1176798117} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1176798116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176798115} + m_LocalRotation: {x: 0, y: 0, z: -0.71751875, w: 0.6965392} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2085301212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -91.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 64.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1176798117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176798115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1176798118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176798115} + m_CullTransparentMesh: 1 --- !u!1 &1178714474 GameObject: m_ObjectHideFlags: 0 @@ -19689,6 +20328,83 @@ Transform: - {fileID: 1467105165} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 70, y: 0, z: 0} +--- !u!1 &1189215338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1189215339} + - component: {fileID: 1189215341} + - component: {fileID: 1189215340} + m_Layer: 5 + m_Name: RedBorderText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1189215339 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189215338} + m_LocalRotation: {x: 0, y: 0, z: 0.90145516, w: 0.4328726} + m_LocalPosition: {x: 0, y: 0, z: 0.000078201294} + m_LocalScale: {x: 1.0006115, y: 1.0006115, z: 1.0006117} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 817460661} + m_Father: {fileID: 1076314299} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 128.7} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.43524, y: -0.0000076293945} + m_SizeDelta: {x: 5.57, y: 213.58} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1189215340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189215338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.179 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1189215341 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189215338} + m_CullTransparentMesh: 1 --- !u!1 &1190351096 GameObject: m_ObjectHideFlags: 0 @@ -21681,7 +22397,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278694492} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -21689,7 +22405,7 @@ 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: 21, y: -38} + m_AnchoredPosition: {x: 20.3, y: -38} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1278694494 @@ -21713,8 +22429,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 15 + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -21867,10 +22583,34 @@ MonoBehaviour: servantState: {fileID: 0} playerBoundary: -1 enemyBoundary: 15 - Red: {fileID: 0} - Green: {fileID: 0} - Bule: {fileID: 0} - Black: {fileID: 0} + Red: {fileID: 1848107657} + Green: {fileID: 734247259} + Bule: {fileID: 1076314300} + Black: {fileID: 485490296} + redBorder: {fileID: 2122054344} + greenBorder: {fileID: 1578615401} + blueBorder: {fileID: 1058175797} + blackBorder: {fileID: 1063928896} + redText: {fileID: 1560422283} + greenText: {fileID: 1176798117} + blueText: {fileID: 817460662} + blackText: {fileID: 616191632} + whiteText: {fileID: 826864416} + redTextBorder: {fileID: 2032267769} + greenTextBorder: {fileID: 2085301212} + blueTextBorder: {fileID: 1189215339} + blackTextBorder: {fileID: 25867314} + whiteTextBorder: {fileID: 93650483} + sunImage: {fileID: 1313982822} + lastSunColor: white + defaultSun: {fileID: 2061866726, guid: f3d1c0e86bc707f45a84a2b357e2e880, type: 3} + redSun: {fileID: -28987179, guid: ce3299864de119a42996982ff81eac45, type: 3} + greenSun: {fileID: 557439306, guid: 1e8a70bc60f2fc4468c29f2f06a3c41c, type: 3} + whiteSun: {fileID: 615819073, guid: d034f4ed4b90d384393351669f914ad6, type: 3} + blueSun: {fileID: -281758944, guid: 382995de68f3ca248ac9203a043b9fa0, type: 3} + blackSun: {fileID: 0} + sunSpeed: 2 + sunAnim: {fileID: 1313982821} cardRewardsRarityAdjustment: 0 cardRewardsCounter: 0 mainCamera: {fileID: 330585545} @@ -22023,6 +22763,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1313982820} - {fileID: 345108945} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: -40.166, y: -66.807, z: 50.571} @@ -22044,7 +22785,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} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -22272,7 +23013,7 @@ GameObject: - component: {fileID: 1302517661} - component: {fileID: 1302517663} - component: {fileID: 1302517662} - m_Layer: 0 + m_Layer: 5 m_Name: ShieldPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -22286,19 +23027,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302517660} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.13052616, w: 0.9914449} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 560113993} m_Father: {fileID: 1974423747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.86, y: -0.04} - m_SizeDelta: {x: 0.2337, y: 0.2056} - m_Pivot: {x: 1, y: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.239, y: 0.057} + m_SizeDelta: {x: 0.17, y: 0.17} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1302517662 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22311,15 +23052,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06846d39b2c9e8f40941c43d5e290f19, type: 3} + m_Sprite: {fileID: -1914403500, guid: 0a24c663bcd9db44d92d3f0503021081, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22415,6 +23156,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304969850} m_CullTransparentMesh: 1 +--- !u!1 &1313982819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1313982820} + - component: {fileID: 1313982823} + - component: {fileID: 1313982822} + - component: {fileID: 1313982821} + m_Layer: 5 + m_Name: Sun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1313982820 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313982819} + m_LocalRotation: {x: -0, y: -0.000000059604645, z: -0.000000014901161, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000027780301} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1293189437} + m_LocalEulerAnglesHint: {x: -40.166, y: -66.807, z: 50.571} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000061035156, y: -0.00015258789} + m_SizeDelta: {x: 785.1, y: 749.23} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1313982821 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313982819} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 916a22cfa632afc43b979d569ac507e3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1313982822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313982819} + 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: 557439306, guid: 1e8a70bc60f2fc4468c29f2f06a3c41c, 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 &1313982823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313982819} + m_CullTransparentMesh: 1 --- !u!1 &1317009331 GameObject: m_ObjectHideFlags: 0 @@ -23914,6 +24752,106 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1437895613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437895614} + - component: {fileID: 1437895616} + - component: {fileID: 1437895615} + m_Layer: 0 + m_Name: playerUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1437895614 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437895613} + serializedVersion: 2 + m_LocalRotation: {x: 0.16317591, y: 0.33682406, z: -0.05939116, w: 0.92541665} + m_LocalPosition: {x: 0, y: 0.53, z: 0} + m_LocalScale: {x: 0.17, y: 0.17, z: 0.17} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1974423747} + - {fileID: 1750187012} + m_Father: {fileID: 1809205616} + m_LocalEulerAnglesHint: {x: 20, y: 40, z: 0} +--- !u!114 &1437895615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437895613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!212 &1437895616 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437895613} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -446724613, guid: 148a2d2d0f79e5a45956a050630a28be, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.89, y: 11.19} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1442274114 GameObject: m_ObjectHideFlags: 0 @@ -24631,6 +25569,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 518405336} + - {fileID: 93650483} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -24664,7 +25603,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 1 + m_FillAmount: 0 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -25150,7 +26089,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -20.700012, y: -24.700012} + m_AnchoredPosition: {x: -20.699951, y: -24.699951} m_SizeDelta: {x: 419.5, y: 373.7} m_Pivot: {x: 0, y: 0} --- !u!114 &1504140804 @@ -26030,6 +26969,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549458907} m_CullTransparentMesh: 1 +--- !u!1 &1560422281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1560422282} + - component: {fileID: 1560422284} + - component: {fileID: 1560422283} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1560422282 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560422281} + m_LocalRotation: {x: 0, y: 0, z: -0.71751875, w: 0.6965392} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2032267769} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -91.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 65.1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1560422283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560422281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1560422284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560422281} + m_CullTransparentMesh: 1 --- !u!1 &1578615400 GameObject: m_ObjectHideFlags: 0 @@ -26055,13 +27073,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578615400} - m_LocalRotation: {x: 0, y: 0, z: 0.72908807, w: 0.68441993} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00007367134} m_LocalScale: {x: 1.0006117, y: 1.0006117, z: 1.0006118} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 734247258} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 93.62} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 216.43524, y: 0} @@ -29437,18 +30455,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750187011} - m_LocalRotation: {x: 0.38015592, y: 0.40537584, z: -0.07415948, w: 0.82804126} - m_LocalPosition: {x: 0, y: 0, z: -0.07} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 5.882353, y: 5.8823533, z: 5.8823533} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1340744} - {fileID: 1975487182} - m_Father: {fileID: 1809205616} - m_LocalEulerAnglesHint: {x: 43.606, y: 58.132, z: 14.835} + m_Father: {fileID: 1437895614} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.85, y: 0.49} + m_AnchoredPosition: {x: 7.41, y: -0} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1750187013 @@ -31046,6 +32064,7 @@ MonoBehaviour: bookUpAnim: {fileID: 1679017128766604892} bookAnim: {fileID: 4328817775323300922} paper: {fileID: 1210516118} + whiteColorNode: {fileID: 1485211135} --- !u!4 &1802141879 Transform: m_ObjectHideFlags: 0 @@ -31390,8 +32409,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 60998409} - - {fileID: 1974423747} - - {fileID: 1750187012} + - {fileID: 1437895614} - {fileID: 969951638} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -31419,6 +32437,42 @@ MonoBehaviour: movePath: [] anim: {fileID: 60998408} speed: 2 + posCount: 7 + jumpHeight: 1.5 + jumpSpeed: 15 + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.00000032782555 + value: 1.0011742 + inSlope: -1.4465826 + outSlope: -1.4465826 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.7666647 + - serializedVersion: 3 + time: 0.49999422 + value: 0.700547 + inSlope: -0.011173545 + outSlope: -0.011173545 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0000062 + value: 1.0063303 + inSlope: 1.4297178 + outSlope: 1.4297178 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.36145905 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 stepIconCount: -1 StepIconFather: {fileID: 1975487182} stepIconPrefab: {fileID: 5159667013927544512, guid: ca425697306c5a941b283345d04e8f26, @@ -31558,7 +32612,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -31971,6 +33025,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2122054344} + - {fileID: 2032267769} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -32004,7 +33059,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.122 + m_FillAmount: 0 m_FillClockwise: 0 m_FillOrigin: 2 m_UseSpriteMesh: 0 @@ -33374,7 +34429,7 @@ GameObject: - component: {fileID: 1954493344} - component: {fileID: 1954493346} - component: {fileID: 1954493345} - m_Layer: 0 + m_Layer: 5 m_Name: HPtextPanle m_TagString: Untagged m_Icon: {fileID: 0} @@ -33388,21 +34443,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1954493343} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000000033899} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2083389423} - {fileID: 932865025} - {fileID: 806364677} - m_Father: {fileID: 1974423747} + m_Father: {fileID: 608009377} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.3, y: -0.003999993} - m_SizeDelta: {x: 0.3, y: 0.3} - m_Pivot: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.000000011175871} + m_SizeDelta: {x: 0.3, y: 0.1244} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1954493345 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33415,7 +34470,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -33836,7 +34891,7 @@ GameObject: - component: {fileID: 1974423749} - component: {fileID: 1974423748} - component: {fileID: 1974423751} - m_Layer: 0 + m_Layer: 5 m_Name: PlayerInSenceCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -33850,20 +34905,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1974423746} - m_LocalRotation: {x: 0.29637718, y: 0.40247795, z: -0.05527022, w: 0.86435956} - m_LocalPosition: {x: 0, y: 0, z: -0.28} - m_LocalScale: {x: 1.4285715, y: 1.4285712, z: 1.4285713} - m_ConstrainProportionsScale: 0 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 8.403361, y: 8.40336, z: 8.403361} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 608009377} - - {fileID: 1954493344} - {fileID: 1302517661} - {fileID: 468997173} - m_Father: {fileID: 1809205616} - m_LocalEulerAnglesHint: {x: 33.838, y: 52.96, z: 9.915} + - {fileID: 374190881} + m_Father: {fileID: 1437895614} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.23, y: -0.06} + m_AnchoredPosition: {x: -0, y: -4.66} m_SizeDelta: {x: 1.1641, y: 0.2986} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1974423748 @@ -33926,7 +34981,7 @@ Canvas: m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 801241541 + m_SortingLayerID: 269777783 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!114 &1974423751 @@ -34020,7 +35075,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -34687,6 +35742,83 @@ Transform: - {fileID: 208314015} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2032267768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2032267769} + - component: {fileID: 2032267771} + - component: {fileID: 2032267770} + m_Layer: 5 + m_Name: RedBorderText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2032267769 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032267768} + m_LocalRotation: {x: 0, y: 0, z: 0.1827503, w: 0.98315936} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1560422282} + m_Father: {fileID: 1848107656} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 21.06} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.43518, y: 0} + m_SizeDelta: {x: 5.57, y: 213.58} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2032267770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032267768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.179 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2032267771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032267768} + m_CullTransparentMesh: 1 --- !u!1 &2032320507 GameObject: m_ObjectHideFlags: 0 @@ -35264,7 +36396,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -35296,7 +36428,7 @@ GameObject: - component: {fileID: 2083389423} - component: {fileID: 2083389425} - component: {fileID: 2083389424} - m_Layer: 0 + m_Layer: 5 m_Name: currentHPtext m_TagString: Untagged m_Icon: {fileID: 0} @@ -35311,7 +36443,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2083389422} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.000000020861627} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -35319,7 +36451,7 @@ 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: -0.026, y: -0.085} + m_AnchoredPosition: {x: -0.00000090897083, y: -0.0000008791685} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2083389424 @@ -35334,7 +36466,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -35439,6 +36571,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084732122} m_CullTransparentMesh: 1 +--- !u!1 &2085301211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2085301212} + - component: {fileID: 2085301214} + - component: {fileID: 2085301213} + m_Layer: 5 + m_Name: RedBorderText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2085301212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085301211} + m_LocalRotation: {x: 0, y: 0, z: 0.5742911, w: 0.8186512} + m_LocalPosition: {x: 0, y: 0, z: 0.000078201294} + m_LocalScale: {x: 1.0006115, y: 1.0006115, z: 1.0006117} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1176798116} + m_Father: {fileID: 734247258} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 70.1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 216.43524, y: 0} + m_SizeDelta: {x: 5.57, y: 213.58} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2085301213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085301211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.179 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2085301214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085301211} + m_CullTransparentMesh: 1 --- !u!1 &2096369103 GameObject: m_ObjectHideFlags: 0 @@ -35497,7 +36706,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -35697,13 +36906,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2122054343} - m_LocalRotation: {x: 0, y: 0, z: 0.37832546, w: 0.92567265} + 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: 1848107656} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 44.46} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 216.43518, y: 0} @@ -36608,7 +37817,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &3656132357315152643 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index 850fe0b4..46784aab 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -5023,6 +5023,7 @@ MonoBehaviour: cardPoint: {fileID: 2090442576} originalCardEntity: {fileID: 0} newCardEntity: {fileID: 0} + conditionCount: 0 colorSlots: - {fileID: 355653053} - {fileID: 2085548176} @@ -9162,6 +9163,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 940746817} m_CullTransparentMesh: 1 +--- !u!1 &943214873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 943214874} + - component: {fileID: 943214876} + - component: {fileID: 943214875} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &943214874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943214873} + 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: 1662811235} + 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 &943214875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943214873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BBE\u7F6E" +--- !u!222 &943214876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943214873} + m_CullTransparentMesh: 1 --- !u!1 &943554750 GameObject: m_ObjectHideFlags: 0 @@ -9241,6 +9321,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 943554750} m_CullTransparentMesh: 1 +--- !u!1 &968086909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 968086910} + - component: {fileID: 968086912} + - component: {fileID: 968086911} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &968086910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968086909} + 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: 1086056309} + 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 &968086911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968086909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8FD4\u56DE" +--- !u!222 &968086912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968086909} + m_CullTransparentMesh: 1 --- !u!1 &983532664 GameObject: m_ObjectHideFlags: 0 @@ -10542,6 +10701,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1083918070} m_CullTransparentMesh: 1 +--- !u!1 &1086056308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1086056309} + - component: {fileID: 1086056312} + - component: {fileID: 1086056311} + - component: {fileID: 1086056310} + m_Layer: 5 + m_Name: "\u8FD4\u56DE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1086056309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086056308} + 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: 968086910} + m_Father: {fileID: 1386412410} + 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: -844, y: 470} + m_SizeDelta: {x: 191.56, y: 68.08} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1086056310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086056308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1086056311} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1086056311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086056308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1086056312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086056308} + m_CullTransparentMesh: 1 --- !u!1 &1111471201 GameObject: m_ObjectHideFlags: 0 @@ -12088,6 +12368,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267263446} m_CullTransparentMesh: 1 +--- !u!1 &1267862969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267862970} + - component: {fileID: 1267862973} + - component: {fileID: 1267862972} + - component: {fileID: 1267862971} + m_Layer: 5 + m_Name: "\u5730\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1267862970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267862969} + 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: 1396758528} + m_Father: {fileID: 1386412410} + 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: 545, y: 504} + m_SizeDelta: {x: 77.53, y: 68.08} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1267862971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267862969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1267862972} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1267862972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267862969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1267862973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267862969} + m_CullTransparentMesh: 1 --- !u!1 &1270350547 GameObject: m_ObjectHideFlags: 0 @@ -13287,6 +13688,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1586415770} + - {fileID: 1086056309} + - {fileID: 1662811235} + - {fileID: 1838324860} + - {fileID: 1267862970} m_Father: {fileID: 1020082260} m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -13357,6 +13762,85 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &1396758527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396758528} + - component: {fileID: 1396758530} + - component: {fileID: 1396758529} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396758528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396758527} + 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: 1267862970} + 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 &1396758529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396758527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5730\u56FE" +--- !u!222 &1396758530 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396758527} + m_CullTransparentMesh: 1 --- !u!1 &1400598351 GameObject: m_ObjectHideFlags: 0 @@ -16497,9 +16981,84 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646159721} + m_GameObject: {fileID: 1646159721} + m_CullTransparentMesh: 1 +--- !u!1 &1652039331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1652039332} + - component: {fileID: 1652039334} + - component: {fileID: 1652039333} + m_Layer: 5 + m_Name: CardIcon + m_TagString: Card + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1652039332 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652039331} + 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: 286601663} + 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.00079345703, y: 39.51658} + m_SizeDelta: {x: 100, y: 80.7449} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1652039333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652039331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, 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 &1652039334 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652039331} m_CullTransparentMesh: 1 ---- !u!1 &1652039331 +--- !u!1 &1662811234 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -16507,42 +17066,88 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1652039332} - - component: {fileID: 1652039334} - - component: {fileID: 1652039333} + - component: {fileID: 1662811235} + - component: {fileID: 1662811238} + - component: {fileID: 1662811237} + - component: {fileID: 1662811236} m_Layer: 5 - m_Name: CardIcon - m_TagString: Card + m_Name: "\u8BBE\u7F6E" + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1652039332 +--- !u!224 &1662811235 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652039331} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1662811234} + 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: 286601663} + m_Children: + - {fileID: 943214874} + m_Father: {fileID: 1386412410} 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.00079345703, y: 39.51658} - m_SizeDelta: {x: 100, y: 80.7449} + m_AnchoredPosition: {x: 764.02, y: 504} + m_SizeDelta: {x: 77.53, y: 68.08} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1652039333 +--- !u!114 &1662811236 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652039331} + m_GameObject: {fileID: 1662811234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1662811237} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1662811237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1662811234} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -16550,14 +17155,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -16566,13 +17171,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1652039334 +--- !u!222 &1662811238 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652039331} + m_GameObject: {fileID: 1662811234} m_CullTransparentMesh: 1 --- !u!1 &1666546984 GameObject: @@ -17897,6 +18502,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1829270344} m_CullTransparentMesh: 1 +--- !u!1 &1838324859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1838324860} + - component: {fileID: 1838324863} + - component: {fileID: 1838324862} + - component: {fileID: 1838324861} + m_Layer: 5 + m_Name: "\u5361\u7EC4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1838324860 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838324859} + 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: 2071212077} + m_Father: {fileID: 1386412410} + 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: 653, y: 504} + m_SizeDelta: {x: 77.53, y: 68.08} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1838324861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838324859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1838324862} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1838324862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838324859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1838324863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838324859} + m_CullTransparentMesh: 1 --- !u!1 &1847001027 GameObject: m_ObjectHideFlags: 0 @@ -19372,7 +20098,7 @@ 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: 417, y: -355} + m_AnchoredPosition: {x: 695, y: -349} m_SizeDelta: {x: 262.6, y: 75.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1989837797 @@ -19418,7 +20144,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1989837798} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 101933366} + m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp + m_MethodName: LoadTargetLevel + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1989837798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20296,6 +21034,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2068035518} m_CullTransparentMesh: 1 +--- !u!1 &2071212076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2071212077} + - component: {fileID: 2071212079} + - component: {fileID: 2071212078} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2071212077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071212076} + 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: 1838324860} + 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 &2071212078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071212076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5361\u7EC4" +--- !u!222 &2071212079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071212076} + m_CullTransparentMesh: 1 --- !u!1 &2085548170 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs new file mode 100644 index 00000000..b8cfc4c3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ForwardCamera : MonoBehaviour +{ + public Camera _camera; + private void Start() + { + _camera = Camera.main; + } + void Update() + { + transform.eulerAngles = new Vector3(_camera.transform.eulerAngles.x, _camera.transform.eulerAngles.y, 0); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs.meta new file mode 100644 index 00000000..31603d7c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForwardCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f71de549a026fec48b8f116e81d3ff61 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 5fc37e0b..da89d852 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -56,7 +57,40 @@ public class GameManager : Singleton public Image Green; public Image Bule; public Image Black; - + [Header("ɫֶ̱߽")] + public RectTransform redBorder; + public RectTransform greenBorder; + public RectTransform blueBorder; + public RectTransform blackBorder; + [Header("ɫֶ")] + public Text redText; + public Text greenText; + public Text blueText; + public Text blackText; + public Text whiteText; + public RectTransform redTextBorder; + public RectTransform greenTextBorder; + public RectTransform blueTextBorder; + public RectTransform blackTextBorder; + public RectTransform whiteTextBorder; + [Header("ɫ̫")] + public Image sunImage; + public string lastSunColor = Name.none; + public Sprite defaultSun; + public Sprite redSun; + public Sprite greenSun; + public Sprite whiteSun; + public Sprite blueSun; + public Sprite blackSun; + [Header("ɫؿ")] + public float sunSpeed; + float redNodeCountLatest; + float blueNodeCountLatest; + float greenNodeCountLatest; + float whiteNodeCountLatest; + float blackNodeCountLatest; + [Header("̫")] + public Animator sunAnim; public double cardRewardsRarityAdjustment = 0.0; @@ -154,9 +188,90 @@ public class GameManager : Singleton } } - + //̫ͬ + if(complete ==true ) + SyncColourSunUI(); } - + public void SyncColourSunUI() + { + float redNodeCount = MapUnityManager.Instance.redNodeCount; + float blueNodeCount = MapUnityManager.Instance.blueNodeCount; + float greenNodeCount = MapUnityManager.Instance.greenNodeCount; + float whiteNodeCount = MapUnityManager.Instance.whiteNodeCount; + float blackNodeCount = MapUnityManager.Instance.blackNodeCount; + + redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount, Time.deltaTime * sunSpeed); + blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount, Time.deltaTime * sunSpeed); + greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount, Time.deltaTime * sunSpeed); + // float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); + blackNodeCountLatest = Mathf.Lerp(blackNodeCountLatest, blackNodeCount, Time.deltaTime * sunSpeed); + + float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blueNodeCount; + //ɫ + Red.fillAmount = redNodeCountLatest / totoalNode; + Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode; + Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode; + Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode; + //߽ + redBorder.localEulerAngles = new Vector3(0, 0, Red.fillAmount * 360); + greenBorder.localEulerAngles = new Vector3(0, 0, Green.fillAmount * 360); + blueBorder.localEulerAngles = new Vector3(0, 0, Bule.fillAmount * 360); + blackBorder.localEulerAngles = new Vector3(0, 0, Black.fillAmount * 360); + // + redTextBorder.localEulerAngles = new Vector3(0, 0, Red.fillAmount * 180); + greenTextBorder.localEulerAngles = new Vector3(0, 0, (Green.fillAmount + Red.fillAmount) * 180); + blueTextBorder.localEulerAngles = new Vector3(0, 0, (Bule.fillAmount + Green.fillAmount) * 180); + blackTextBorder.localEulerAngles = new Vector3(0, 0, (Black.fillAmount + Bule.fillAmount) * 180); + whiteTextBorder.localEulerAngles = new Vector3(0, 0, (1 + Black.fillAmount) * 180); + redText.transform.eulerAngles = new Vector3(0,0,0); + redText.text = redNodeCount.ToString(); + if (redNodeCount == 0) + redText.text = " "; + greenText.transform.eulerAngles = new Vector3(0, 0, 0); + greenText.text = greenNodeCount.ToString(); + if (greenNodeCount == 0) + greenText.text = " "; + blueText.transform.eulerAngles = new Vector3(0, 0, 0); + blueText .text = blueNodeCount.ToString(); + if (blueNodeCount == 0) + blueText.text = " "; + blackText.transform.eulerAngles = new Vector3(0, 0, 0); + blackText .text = blackNodeCount.ToString(); + if (blackNodeCount == 0) + blackText.text = " "; + whiteText.transform.eulerAngles = new Vector3(0,0,0); + whiteText.text = whiteNodeCount.ToString(); + if (whiteNodeCount == 0) + whiteText.text = " "; + //̫ + string advColor = MapUnityManager.Instance.getAdvNode(); + if(lastSunColor != advColor ) + { + sunAnim.SetTrigger("Change"); + lastSunColor = advColor; + switch (advColor) + { + case Name.Color.Red: + sunImage.sprite = redSun; + break; + case Name.Color.Green: + sunImage.sprite = greenSun; + break; + case Name.Color.Blue: + sunImage.sprite = blueSun; + break; + case Name.Color.Black: + sunImage.sprite = blackSun; + break; + case Name.Color.White: + sunImage.sprite = whiteSun; + break; + case Name.none: + sunImage.sprite = defaultSun; + break; + } + } + } //ͳƳɫ public bool SyncColourCountUI() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs index 3a15b0bb..a11619ad 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs @@ -33,6 +33,15 @@ public class LevelGenerator : Singleton public int shopWight; public int incidentWight; public int campfireWight; + [Header("ڵɴС")] + public Vector3 mosterBig; + public Vector3 eliteMosterBig; + public Vector3 shopBig; + public Vector3 incidentBig; + public Vector3 campfireBig; + public Vector3 bossBig; + public Vector3 treasureBig; + List roomTypeWeight = new List(); [Header("ضɲ")] @@ -63,10 +72,11 @@ public class LevelGenerator : Singleton GenerateGridMap(generatorLine, generatorColumn); List pathList = GeneratePathSatrtPoint(pathAmount); GeneratePath(pathList); - ShowMap(); RandomSetUpRoom(); CheckNodeRule(); CheckEliteMonster(); + SetRoomBig(); + ShowMap(); } // public void GenerateGridMap( int generatorLine,int generatorColumn) @@ -83,7 +93,7 @@ public class LevelGenerator : Singleton var level = Instantiate(levelPrefab, generatorPoint.transform.position, levelPrefab.transform.rotation); level.transform.SetParent(LevelDevelopManager.Instance.levelFather.transform); - level.transform.localScale = new Vector3(0.2f, 0.2f, 0.2f); + level.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f); LevelNode bossLevelNode = level.GetComponent(); bossLevelNode.line = i; @@ -132,7 +142,7 @@ public class LevelGenerator : Singleton } // return startPoints; - List startPoints2 = new List() {0,1,3,4 }; + List startPoints2 = new List() {1,1,2,3,3 }; return startPoints2; } @@ -333,7 +343,7 @@ public class LevelGenerator : Singleton { var level = Instantiate(levelPrefab, pos, levelPrefab.transform.rotation); level.transform.SetParent(LevelDevelopManager.Instance.levelFather.transform); - level.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f); + level.transform.localScale = new Vector3(0.04f, 0.04f, 0.04f); LevelNode levelNode = level.GetComponent(); levelNode.line = line; levelNode.column = column; @@ -642,4 +652,41 @@ public class LevelGenerator : Singleton } } + + //÷С + public void SetRoomBig() + { + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + switch (LevelDevelopManager.Instance.levelMap[i].levelColumn[j].roomType) + { + case RoomType.monster: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = mosterBig; + break; + case RoomType.eliteMonster: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = eliteMosterBig; + break; + case RoomType.shop: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = shopBig; + break; + case RoomType.incident: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = incidentBig; + break; + case RoomType.treasure: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = treasureBig; + break; + case RoomType.boss: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = bossBig; + break; + case RoomType.campfire: + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].transform.localScale = campfireBig; + break; + } + } + + } + } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs index 9c9777ba..b6a6ab68 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs @@ -19,7 +19,8 @@ public class LevelNode : MonoBehaviour [Header("·")] public GameObject lineRenderer; - + [Header("߶ƫ")] + public float lineOffset; [Header("")] public LevelDevelopManager.RoomType roomType; [Header("Ŀĵ")] @@ -106,7 +107,8 @@ public class LevelNode : MonoBehaviour // float distance = Vector3.Distance(nextLevelNodes[i].transform.position, line.transform.position); - line.GetComponent().sizeDelta = new Vector2(0.15f,distance) ; + line.GetComponent().sizeDelta = new Vector2(0.1f,distance-lineOffset*2 ) ; + line.transform.position += line .transform .up *lineOffset; } } public LevelDevelopData_SO .levelData ReturnSaveData() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index 3e5d6a49..90c499b6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -37,7 +37,8 @@ public class MapManager : Singleton public GameObject bookAnim; [Header("ֽƬ")] public GameObject paper; - + [Header("ɫ̫")] + public Image whiteColorNode; void Start() { StartCoroutine (starttest()); @@ -66,8 +67,29 @@ public class MapManager : Singleton } mapImages_dol.Add(sprites); } + + //ɫؿͿɫ + StartCoroutine(WhiteColorNodeSun()); } + IEnumerator WhiteColorNodeSun() + { + GameManager.Instance.sunImage.sprite = GameManager.Instance.defaultSun; + float time = 0; + while ( true ) + { + whiteColorNode.fillAmount = Mathf.Lerp(0, 1,time += Time.deltaTime*0.5f ); + if (whiteColorNode.fillAmount>0.99) + { + whiteColorNode.fillAmount = 1; + GameManager.Instance.sunAnim.SetTrigger("Change"); + GameManager.Instance.sunImage.sprite = GameManager.Instance.whiteSun; + yield break; + } + yield return null; + } + + } public void test() { List enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.strongEnemyPool); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs index 83ce1a4b..b75c1fc5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs @@ -18,7 +18,13 @@ public class Player : MonoBehaviour public Animator anim; [Header("ܲٶ")] public float speed =2; - + [Header("Ծ߽ڵ")] + public float posCount; + [Header("Ծ߶")] + public float jumpHeight = 2; + [Header("Ծٶ")] + public float jumpSpeed = 10; + public AnimationCurve speedCurve; [Header("ʶUI")] public int stepIconCount; public Transform StepIconFather; @@ -130,20 +136,38 @@ public class Player : MonoBehaviour Usermanager.Instance.ParasitismnRealize(movePath[0]); for (int i=1;i linePath = new List(); + linePath = CalculatePath(linePath, posCount, startPos, jumpCentre, endpos); bool move = true; float time = 0; - Vector3 startPos= transform.position; - Vector3 endpos = new Vector3(movePath[i].transform.position.x,transform.position.y, movePath[i].transform.position.z); - while (move ) - { - transform .position = Vector3.Lerp(startPos, endpos, time += Time.deltaTime*speed); - if(Vector3 .Distance ( transform .position, endpos) <0.1f) + Debug.Log("ʼ" + startPos + "" + endpos + "м" + jumpCentre); + for (int posIndex = 0;posIndex < linePath .Count;posIndex++) + { + time = 0; + move = true; + while (move) { - move = false; + if (posIndex == linePath.Count-1) + { + transform.position = Vector3.Lerp(linePath[posIndex], endpos , time += Time.deltaTime * speedCurve.Evaluate(posIndex / posCount) * jumpSpeed); + } + else + { + transform.position = Vector3.Lerp(linePath[posIndex], linePath[posIndex + 1], time += Time.deltaTime * speedCurve.Evaluate(posIndex / posCount) * jumpSpeed); //time += Time.deltaTime * speedCurve.Evaluate(posIndex+1 /posCount )); + } + + if (time >= 1) + { + move = false; + } + yield return null; } - yield return 0; } + //жϼѪǷЧ Usermanager.Instance.ParasitismnRealize(movePath [i]);//뵱ǰnode Usermanager.Instance.bleedRealize(); @@ -569,5 +593,25 @@ public class Player : MonoBehaviour } - + #region 㱴ߵϵ + public List CalculatePath(List linePath , float posCount,Vector3 lineStart,Vector3 lineMiddel,Vector3 lineEnd) + { + linePath.Clear(); + + for (int i = 0; i < posCount; i++) + { + Vector3 currentPoint = CalculateBezierPoint(lineStart, lineMiddel, lineEnd, i / posCount); + linePath.Add(currentPoint); + Debug.Log("currentPoint" + currentPoint); + } + return linePath; + } + public Vector3 CalculateBezierPoint(Vector3 p0, Vector3 p1, Vector3 p2, float t) + { + Debug.Log("t"+t); + float u = 1 - t; + float tt = t * t; + return u * u * p0 + 2 * t * u * p1 + tt * p2; + } + #endregion } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ChangeColorMangaer.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ChangeColorMangaer.cs index a6a107ac..1337d708 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ChangeColorMangaer.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ChangeColorMangaer.cs @@ -11,8 +11,9 @@ public class ChangeColorMangaer : Singleton public GameObject changeColorPanle; public Transform creatFather; public Transform cardPoint; - public CardEntity originalCardEntity; - public CardEntity newCardEntity; + public CardEntity originalCardEntity; + public CardEntity newCardEntity; + public int conditionCount;// [Header("ɫԴ")] public List colorSlots = new List(); public Sprite defaultSlotSprite; @@ -20,10 +21,14 @@ public class ChangeColorMangaer : Singleton { for (int i = 0; i < colorSlots.Count; i++) { - colorSlots[i].colorType = ChooseWeaponManager.ColorType.none; - colorSlots[i].image.sprite = defaultSlotSprite; - colorSlots[i].cantChoose = false; - colorSlots[i].cantChooseMark.SetActive(false); + if(i<=conditionCount ) + { + colorSlots[i].colorType = ChooseWeaponManager.ColorType.none; + colorSlots[i].image.sprite = defaultSlotSprite; + colorSlots[i].cantChoose = false; + colorSlots[i].cantChooseMark.SetActive(false); + } + } if(newCardEntity !=null ) @@ -31,6 +36,7 @@ public class ChangeColorMangaer : Singleton CardOriginalDataList.Instance.cardOriginalDataList.Remove(newCardEntity.cardId); Destroy(newCardEntity.gameObject); } + } public void GenerateNewColorCard(string cardID) @@ -66,6 +72,19 @@ public class ChangeColorMangaer : Singleton card.transform.localPosition = cardPoint.localPosition; originalCardEntity = card.GetComponent(); + //ȷɸĵ + conditionCount = originalCardEntity.cardOriginalData.conditionAndFunctionVal.Count; + for(int i=0;iconditionCount) + { + colorSlots[i].gameObject.SetActive(false); + } + else + { + colorSlots[i].gameObject.SetActive(true); + } + } } public void GetCard() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ColorSlotInChange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ColorSlotInChange.cs index a089f2fa..56e3bcee 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ColorSlotInChange.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ColorSlotInChange.cs @@ -20,22 +20,24 @@ public class ColorSlotInChange : MonoBehaviour List colorSlots = ChangeColorMangaer.Instance.colorSlots; for (int i = 0; i < colorSlots.Count; i++) { - if (i != index) + if(i <= ChangeColorMangaer.Instance.conditionCount) { - colorSlots[i].colorType = ChooseWeaponManager.ColorType.none; - colorSlots[i].image.sprite = ChangeColorMangaer.Instance.defaultSlotSprite; - colorSlots[i].cantChoose = true; - colorSlots[i].cantChooseMark.SetActive(true); + if (i != index) + { + colorSlots[i].colorType = ChooseWeaponManager.ColorType.none; + colorSlots[i].image.sprite = ChangeColorMangaer.Instance.defaultSlotSprite; + colorSlots[i].cantChoose = true; + colorSlots[i].cantChooseMark.SetActive(true); + } + else + { + colorType = inputColorType; + image.sprite = inputColor; + colorSlots[i].cantChoose = true; + colorSlots[i].cantChooseMark.SetActive(false); + ChangeCondition(inputColorType); + } } - else - { - colorType = inputColorType; - image.sprite = inputColor; - colorSlots[i].cantChoose = true; - colorSlots[i].cantChooseMark.SetActive(false); - ChangeCondition(inputColorType); - } - } } public void ChangeCondition(ChooseWeaponManager.ColorType inputColorType) diff --git a/ColorlessWorld-2024-4-2/Assets/TextType.meta b/ColorlessWorld-2024-4-2/Assets/TextType.meta new file mode 100644 index 00000000..25cf6544 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/TextType.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0334b164b2255744bbee156df26c148f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF b/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF new file mode 100644 index 00000000..fccd36b8 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF differ diff --git a/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF.meta b/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF.meta new file mode 100644 index 00000000..2141c2b7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/TextType/汉仪铸字木头人简.TTF.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 846d2bc064c8faa4a858510d85bd7140 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - HYZhuZiMuTouRen + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/EditorBuildSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/EditorBuildSettings.asset index df0eb585..0bee4c59 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/EditorBuildSettings.asset +++ b/ColorlessWorld-2024-4-2/ProjectSettings/EditorBuildSettings.asset @@ -9,11 +9,11 @@ EditorBuildSettings: path: Assets/Scenes/StartMainScence.unity guid: ce85faae8daf943428771b28b09cd08e - enabled: 1 - path: Assets/Scenes/ChooseLevelScene_1.unity - guid: 14fb3be6215cc8741ab7e30767eaaca3 + path: Assets/Scenes/Map.unity + guid: cb0375b952e5e1846b145c491245dd59 - enabled: 1 path: Assets/Scenes/SampleScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + guid: 677658a2207ca7a4b9035ce785b743dd - enabled: 1 path: Assets/Scenes/Event.unity guid: 91294b7ebb9561347bb574c8beb90aa2 diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset b/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset index 1fbd632f..75366d01 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset +++ b/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset @@ -70,3 +70,6 @@ TagManager: - name: CardUI uniqueID: 3099584011 locked: 0 + - name: UIinFightSence + uniqueID: 269777783 + locked: 0