diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset index 36c3781a..80cdf8f4 100644 --- a/Assets/DefaultVolumeProfile.asset +++ b/Assets/DefaultVolumeProfile.asset @@ -1,5 +1,319 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8964706553934421680 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + response: + m_OverrideState: 1 + m_Value: 0.8 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} +--- !u!114 &-8294711927348792352 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: e021b4c809a781e468c2988c016ebbea, type: 3} + m_Name: ColorLookup + m_EditorClassIdentifier: + active: 1 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + contribution: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-7820789577468674753 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 221518ef91623a7438a71fef23660601, type: 3} + m_Name: WhiteBalance + m_EditorClassIdentifier: + active: 1 + temperature: + m_OverrideState: 1 + m_Value: 0 + tint: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-7191926889610816286 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + postExposure: + m_OverrideState: 1 + m_Value: 0 + contrast: + m_OverrideState: 1 + m_Value: 0 + colorFilter: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 1 + m_Value: 0 + saturation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-5415734101822189328 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 70afe9e12c7a7ed47911bb608a23a8ff, type: 3} + m_Name: SplitToning + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + highlights: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + balance: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-4559983662123331413 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + gaussianStart: + m_OverrideState: 1 + m_Value: 10 + gaussianEnd: + m_OverrideState: 1 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1 + highQualitySampling: + m_OverrideState: 1 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10 + aperture: + m_OverrideState: 1 + m_Value: 5.6 + focalLength: + m_OverrideState: 1 + m_Value: 50 + bladeCount: + m_OverrideState: 1 + m_Value: 5 + bladeCurvature: + m_OverrideState: 1 + m_Value: 1 + bladeRotation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-3710471849325285444 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 1 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.9 + intensity: + m_OverrideState: 1 + m_Value: 0 + scatter: + m_OverrideState: 1 + m_Value: 0.7 + clamp: + m_OverrideState: 1 + m_Value: 65472 + tint: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 1 + m_Value: 0 + downscale: + m_OverrideState: 1 + m_Value: 0 + maxIterations: + m_OverrideState: 1 + m_Value: 6 + dirtTexture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-665122592112833258 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 06437c1ff663d574d9447842ba0a72e4, type: 3} + m_Name: ScreenSpaceLensFlare + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + tintColor: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + bloomMip: + m_OverrideState: 1 + m_Value: 1 + firstFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + secondaryFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareScale: + m_OverrideState: 1 + m_Value: {x: 1, y: 1} + samples: + m_OverrideState: 1 + m_Value: 1 + sampleDimmer: + m_OverrideState: 1 + m_Value: 0.5 + vignetteEffect: + m_OverrideState: 1 + m_Value: 1 + startingPosition: + m_OverrideState: 1 + m_Value: 1.25 + scale: + m_OverrideState: 1 + m_Value: 1.5 + streaksIntensity: + m_OverrideState: 1 + m_Value: 0 + streaksLength: + m_OverrideState: 1 + m_Value: 0.5 + streaksOrientation: + m_OverrideState: 1 + m_Value: 0 + streaksThreshold: + m_OverrideState: 1 + m_Value: 0.25 + resolution: + m_OverrideState: 1 + m_Value: 4 + chromaticAbberationIntensity: + m_OverrideState: 1 + m_Value: 0.5 +--- !u!114 &-573543043432227388 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + neutralHDRRangeReductionMode: + m_OverrideState: 1 + m_Value: 2 + acesPreset: + m_OverrideState: 1 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 1 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 1 + m_Value: 0 + paperWhite: + m_OverrideState: 1 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 1 + m_Value: 1 + minNits: + m_OverrideState: 1 + m_Value: 0.005 + maxNits: + m_OverrideState: 1 + m_Value: 1000 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12,4 +326,470 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: DefaultVolumeProfile m_EditorClassIdentifier: - components: [] + components: + - {fileID: 7314099558047151963} + - {fileID: -8294711927348792352} + - {fileID: -7820789577468674753} + - {fileID: 757156498526246967} + - {fileID: -573543043432227388} + - {fileID: 446725181531353334} + - {fileID: -4559983662123331413} + - {fileID: -7191926889610816286} + - {fileID: 4813123734728417392} + - {fileID: 5763447480438274420} + - {fileID: 5120937015905254708} + - {fileID: -3710471849325285444} + - {fileID: 5378489188389367263} + - {fileID: 3235942565910036997} + - {fileID: -8964706553934421680} + - {fileID: 8888569860834867977} + - {fileID: -665122592112833258} + - {fileID: -5415734101822189328} + - {fileID: 8032282833275709512} +--- !u!114 &446725181531353334 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 558a8e2b6826cf840aae193990ba9f2e, type: 3} + m_Name: ShadowsMidtonesHighlights + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + midtones: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + highlights: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + shadowsStart: + m_OverrideState: 1 + m_Value: 0 + shadowsEnd: + m_OverrideState: 1 + m_Value: 0.3 + highlightsStart: + m_OverrideState: 1 + m_Value: 0.55 + highlightsEnd: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &757156498526246967 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + clamp: + m_OverrideState: 1 + m_Value: 0.05 +--- !u!114 &3235942565910036997 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: fb60a22f311433c4c962b888d1393f88, type: 3} + m_Name: PaniniProjection + m_EditorClassIdentifier: + active: 1 + distance: + m_OverrideState: 1 + m_Value: 0 + cropToFit: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &4813123734728417392 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + color: + m_OverrideState: 1 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0 + smoothness: + m_OverrideState: 1 + m_Value: 0.2 + rounded: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &5120937015905254708 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 5485954d14dfb9a4c8ead8edb0ded5b1, type: 3} + m_Name: LiftGammaGain + m_EditorClassIdentifier: + active: 1 + lift: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gamma: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gain: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} +--- !u!114 &5378489188389367263 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 3eb4b772797da9440885e8bd939e9560, type: 3} + m_Name: ColorCurves + m_EditorClassIdentifier: + active: 1 + master: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + red: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + green: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + blue: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsHue: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + satVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lumVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &5763447480438274420 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: cdfbdbb87d3286943a057f7791b43141, type: 3} + m_Name: ChannelMixer + m_EditorClassIdentifier: + active: 1 + redOutRedIn: + m_OverrideState: 1 + m_Value: 100 + redOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + redOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + greenOutRedIn: + m_OverrideState: 1 + m_Value: 0 + greenOutGreenIn: + m_OverrideState: 1 + m_Value: 100 + greenOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + blueOutRedIn: + m_OverrideState: 1 + m_Value: 0 + blueOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + blueOutBlueIn: + m_OverrideState: 1 + m_Value: 100 +--- !u!114 &7314099558047151963 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &8032282833275709512 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 6bd486065ce11414fa40e631affc4900, type: 3} + m_Name: ProbeVolumesOptions + m_EditorClassIdentifier: + active: 1 + normalBias: + m_OverrideState: 1 + m_Value: 0.05 + viewBias: + m_OverrideState: 1 + m_Value: 0.1 + scaleBiasWithMinProbeDistance: + m_OverrideState: 1 + m_Value: 0 + samplingNoise: + m_OverrideState: 1 + m_Value: 0.1 + animateSamplingNoise: + m_OverrideState: 1 + m_Value: 1 + leakReductionMode: + m_OverrideState: 1 + m_Value: 2 + minValidDotProductValue: + m_OverrideState: 1 + m_Value: 0.1 + occlusionOnlyReflectionNormalization: + m_OverrideState: 1 + m_Value: 1 + intensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + skyOcclusionIntensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} +--- !u!114 &8888569860834867977 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: c5e1dc532bcb41949b58bc4f2abfbb7e, type: 3} + m_Name: LensDistortion + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + xMultiplier: + m_OverrideState: 1 + m_Value: 1 + yMultiplier: + m_OverrideState: 1 + m_Value: 1 + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + scale: + m_OverrideState: 1 + m_Value: 1 diff --git a/Assets/Resources/so/ally/30201_ayano.asset b/Assets/Resources/so/ally/30201_ayano.asset index 5fbf7b3f..0d7dc66f 100644 --- a/Assets/Resources/so/ally/30201_ayano.asset +++ b/Assets/Resources/so/ally/30201_ayano.asset @@ -21,7 +21,8 @@ MonoBehaviour: ally_heroIcon: {fileID: 0} ally_heroPoster: {fileID: 21300000, guid: 6476853d10206a745a4342d139ab925b, type: 3} ally_hero_HD_image: {fileID: 21300000, guid: 5996ae5f53736de4ba099829b80bfe29, type: 3} - ally_heroThemeColor: {r: 0, g: 0, b: 0, a: 0} + ally_hero_squareProfile: {fileID: 21300000, guid: eec334d03c52af847bfa12dc839ac536, type: 3} + ally_heroThemeColor: {r: 0.10588236, g: 0.09411766, b: 0.17254902, a: 0} ally_heroDescription: "\u5B54\u5609\u5F6C\u662F\u4E00\u4F4D\u6CD5\u5E08\uFF0C\u901A\u8FC7\u63A5\u4F4F\u97F3\u7B26\u79EF\u6512\u6CD5\u529B\u503C\uFF0C\u4EE5\u91CA\u653E\u6280\u80FD\u6765\u7ED9\u961F\u53CB\u63D0\u4F9B\u53EF\u89C2\u589E\u76CA\u3002" levelStats: - levelName: Level 1 @@ -32,9 +33,10 @@ MonoBehaviour: maxMana: 100 scoreEfficiency: 0 requiredEXP: 0 - manaGainGood: 1 + skill_slot_limited: 1 + manaGainGood: 3 manaGainGreat: 2 - manaGainPerfect: 3 + manaGainPerfect: 1 manaGainOnMiss: 5 damageMultiplierGood: 0.5 damageMultiplierGreat: 0.75 @@ -48,6 +50,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 200 + skill_slot_limited: 2 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -64,6 +67,7 @@ MonoBehaviour: maxMana: 808 scoreEfficiency: 0.8 requiredEXP: 500 + skill_slot_limited: 3 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 4 @@ -80,6 +84,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 1000 + skill_slot_limited: 4 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -100,10 +105,11 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: a1c9ed5e8756d3049a41a1009f513564, type: 3} skillDescriptionsText: "\u5B54\u5609\u5F6C\u8FDB\u5165\u72C2\u66B4\uFF0C\u5927\u5E45\u63D0\u5347\u4F24\u5BB3\u3002\n\n\u4F5C\u7528\u5BF9\u8C61\uFF1A\u672C\u4F53\n\u6548\u679C\u7C7B\u578B\uFF1A\u4F24\u5BB3\u589E\u76CA3/4/5/6\u79D2\uFF0C\u751F\u547D\u503C\u6062\u590D10/20/30/40% maxHP.\n\u89E6\u53D1\u6761\u4EF6\uFF1A\u6CD5\u529B\u503C\u6EE1\u65F6\n\u6570\u503C\uFF1A2+ | 0.1*\n\n// \xB7\u975E\u4EBA\u5F62\u6001\u7684\u5B54\u5609\u5F6C\u62E5\u6709\u66F4\u9AD8\u7684\u6218\u6597\u529B" + thisSkill_levelLimit: 1 - skillGroupID: 30201002 groupName: "\u81F4\u547D\u8282\u594F" columnID: 1 @@ -111,9 +117,10 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: be131404ab19ab6458f0d176b717bc0d, type: 3} skillDescriptionsText: "\u83B7\u5F97\u53EF\u53E0\u52A0\u7684\u653B\u901F\uFF0C\u81F3\u591A6\u5C42\u3002\u6EE1\u5C42\u65F6\uFF0C\u63D0\u4F9B\u968F\u7B49\u7EA7\u589E\u957F\u7684\u653B\u51FB\u8DDD\u79BB\u3002\n\n\u4F5C\u7528\u5BF9\u8C61\uFF1A\u672C\u4F53\n\u6548\u679C\u7C7B\u578B\uFF1A\u6BCF\u6B21\u5BF9\u654C\u65B9\u5355\u4F4D\u7684\u666E\u901A\u653B\u51FB\u4F1A\u4F7F\u4F60\u653B\u901F\u589E\u52A05%\uFF0C\u81F3\u591A\u53E0\u52A06\u6B21\u3002\u6EE1\u5C42\u65F6\uFF0C\u63D0\u4F9B150+2*\u653B\u51FB\u8DDD\u79BB\u3002\n\u89E6\u53D1\u6761\u4EF6\uFF1A\u666E\u901A\u653B\u51FB\n\u6570\u503C\uFF1A150+2*\n\n// \xB71234567890" + thisSkill_levelLimit: 1 - skillGroupID: 30201003 groupName: "\u5965\u672F\u5F57\u661F" columnID: 1 @@ -121,8 +128,9 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: 160959886f709ae47b6cf60a91d4ed45, type: 3} skillDescriptionsText: + thisSkill_levelLimit: 1 - skillGroupID: 30201004 groupName: "\u4E0D\u706D\u4E4B\u63E1" columnID: 1 @@ -130,8 +138,9 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: 2c0d21484a75511429e77d2e4a73597a, type: 3} skillDescriptionsText: + thisSkill_levelLimit: 1 - skillGroupID: 30201005 groupName: "\u5148\u653B" columnID: 1 @@ -139,8 +148,9 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: f0322c66a77f7b74292d47e99cf37e9d, type: 3} skillDescriptionsText: + thisSkill_levelLimit: 1 - skillGroupID: 30201006 groupName: "\u4EE5\u7EEA\u5854\u5C14\u79CD\u5B50\u7F50" columnID: 2 @@ -148,6 +158,7 @@ MonoBehaviour: skills: - {fileID: 11400000, guid: 9c2d57fabf3a506499779b3d430f595b, type: 2} - {fileID: 11400000, guid: 75f453e0c37644343897f37b063bbfd4, type: 2} - groupIcon: {fileID: 0} + groupIcon: {fileID: 21300000, guid: 4361f6d9935395b47a2e15911871d48d, type: 3} skillDescriptionsText: - equippedSkillGroupIDs: a9d4cc01aad4cc01 + thisSkill_levelLimit: 4 + equippedSkillGroupIDs: add4cc01a9d4cc01 diff --git a/Assets/Resources/so/ally/30202_yuetao.asset b/Assets/Resources/so/ally/30202_yuetao.asset index 952fc25c..8725ad34 100644 --- a/Assets/Resources/so/ally/30202_yuetao.asset +++ b/Assets/Resources/so/ally/30202_yuetao.asset @@ -21,6 +21,8 @@ MonoBehaviour: ally_heroIcon: {fileID: 0} ally_heroPoster: {fileID: 21300000, guid: 7c696ed76f3742e45be19411f45fff5c, type: 3} ally_hero_HD_image: {fileID: 21300000, guid: 52da56d8cea342347a2ce77fa59a8238, type: 3} + ally_hero_squareProfile: {fileID: 21300000, guid: 088ee68aa14a6db40b3794a0a8b70d82, type: 3} + ally_heroThemeColor: {r: 0.62352943, g: 0.04705883, b: 0.14901961, a: 1} ally_heroDescription: levelStats: - levelName: Level 1 @@ -31,6 +33,7 @@ MonoBehaviour: maxMana: 101 scoreEfficiency: 0 requiredEXP: 0 + skill_slot_limited: 2 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -47,6 +50,7 @@ MonoBehaviour: maxMana: 666 scoreEfficiency: 0 requiredEXP: 300 + skill_slot_limited: 4 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -63,6 +67,7 @@ MonoBehaviour: maxMana: 666 scoreEfficiency: 0 requiredEXP: 666 + skill_slot_limited: 6 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -79,6 +84,7 @@ MonoBehaviour: maxMana: 666 scoreEfficiency: 0 requiredEXP: 1200 + skill_slot_limited: 7 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -93,12 +99,13 @@ MonoBehaviour: selectedSkillIndices: primarySkillIndex: 0 skillGroups: - - skillGroupID: 0 - groupName: + - skillGroupID: 30202001 + groupName: "\u66F9\u76CA\u5609\u4E4B\u529B" columnID: 0 - columnName: + columnName: "\u5C0F\u66F9\u8BF4" skills: - {fileID: 0} - groupIcon: {fileID: 0} - skillDescriptionsText: - equippedSkillGroupIDs: + groupIcon: {fileID: 21300000, guid: c159b2fe41039f24cac31d608ad62cec, type: 3} + skillDescriptionsText: "\u72C2\u7B11\u7684\u795E\u5FC5\u84DD\u8272\u5927\u820C\u5C06\u5199\u6563\u6587" + thisSkill_levelLimit: 1 + equippedSkillGroupIDs: 91d8cc01 diff --git a/Assets/Resources/so/ally/30203_moyuri.asset b/Assets/Resources/so/ally/30203_moyuri.asset index 021d8790..242c0cba 100644 --- a/Assets/Resources/so/ally/30203_moyuri.asset +++ b/Assets/Resources/so/ally/30203_moyuri.asset @@ -21,6 +21,8 @@ MonoBehaviour: ally_heroIcon: {fileID: 0} ally_heroPoster: {fileID: 21300000, guid: 25ab31db07f3cd148ad02160d7fac8e2, type: 3} ally_hero_HD_image: {fileID: 21300000, guid: 38eccadd530da15419ed0edecaf75e9a, type: 3} + ally_hero_squareProfile: {fileID: 21300000, guid: 2bc924133035d0c43a1f2abbecf93ac5, type: 3} + ally_heroThemeColor: {r: 0, g: 0, b: 0, a: 0} ally_heroDescription: "\u6C88\u4EBA\uFF0C\u5E7C\u627F\u5EAD\u8BAD\uFF0C\u5DE5\u7B14\u4E16\u5BB6\u7B2C\u4E03\u4EE3\u4F20\u4EBA\u3002\u5176\u4EBA\u4F5C\u753B\u524D\u5FC5\u711A\u9999\u9759\u5750\uFF0C\u7136\u6BCF\u9047\u80F8\u4E2D\u4E18\u58D1\u6F8E\u6E43\u65F6\uFF0C\u5219\u63B7\u7B14\u4E8E\u6848\uFF0C\u5927\u547C\u4E00\u58F0\u201C\u753B\u6765\uFF01\u201D\uFF0C\u58F0\u5982\u88C2\u5E1B\uFF0C\u6EE1\u5BA4\u751F\u98CE\u3002\u6B64\u65F6\u4F8D\u8005\u6025\u94FA\u4E08\u4E8C\u5BA3\uFF0C\u4F46\u89C1\u5979\u7D20\u624B\u6CFC\u58A8\u5982\u6025\u96E8\uFF0C\u5C71\u5DDD\u8349\u6728\u7686\u4ECE\u8155\u5E95\u5954\u817E\u800C\u51FA\uFF0C\u9877\u523B\u6210\u5377\uFF0C\u6C14\u97F5\u751F\u52A8\uFF0C\u89C2\u8005\u65E0\u4E0D\u5C4F\u606F\u3002\u6545\u6C5F\u5357\u753B\u575B\u8D60\u96C5\u53F7\u201C\u4E00\u58F0\u96F7\u201D\uFF0C\u8C13\u5176\u4E0B\u7B14\u6709\u96F7\u9706\u4E07\u94A7\u4E4B\u52BF\u3002" levelStats: - levelName: Level 1 @@ -31,6 +33,7 @@ MonoBehaviour: maxMana: 101 scoreEfficiency: 0 requiredEXP: 0 + skill_slot_limited: 0 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -47,6 +50,7 @@ MonoBehaviour: maxMana: 100 scoreEfficiency: 0 requiredEXP: 345 + skill_slot_limited: 0 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -63,6 +67,7 @@ MonoBehaviour: maxMana: 100 scoreEfficiency: 0 requiredEXP: 678 + skill_slot_limited: 0 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -79,6 +84,7 @@ MonoBehaviour: maxMana: 100 scoreEfficiency: 0 requiredEXP: 1111 + skill_slot_limited: 0 manaGainGood: 1 manaGainGreat: 2 manaGainPerfect: 3 @@ -101,4 +107,5 @@ MonoBehaviour: groupIcon: {fileID: 0} skillDescriptionsText: "\u6C88\u4EBA\u5927\u7B14\u4E00\u6325\uFF0C\u5927\u547C\u4E00\u58F0\u201C\u753B\u6765\uFF01\u201D\uFF0C\u9020\u6210\u9AD8\u989D\u4F24\u5BB3\u3002\n\n\u4F5C\u7528\u5BF9\u8C61\uFF1A\u53EC\u5524\u7269\n\u6548\u679C\u7C7B\u578B\uFF1A\u5BF9\u654C\u4EBA\u9020\u62101500+1000*\u5F53\u524D\u7B49\u7EA7\u7684\u4F24\u5BB3\u3002\n\u89E6\u53D1\u6761\u4EF6\uFF1A\u6CD5\u529B\u503C\u6EE1\u65F6\n\u6570\u503C\uFF1A1500+1000*\n\n// \xB7\u6108\u662F\u9760\u8FD1deadline\uFF0C\u91CA\u653E\u6B64\u6280\u80FD\u9700\u8981\u7684\u524D\u6447\u6108\u77ED\u3002" - equippedSkillGroupIDs: 79dccc01 + thisSkill_levelLimit: 1 + equippedSkillGroupIDs: diff --git a/Assets/Resources/so/ally/30204/lock_profile.png b/Assets/Resources/so/ally/30204/lock_profile.png new file mode 100644 index 00000000..6a78de2e Binary files /dev/null and b/Assets/Resources/so/ally/30204/lock_profile.png differ diff --git a/Assets/Resources/so/ally/30204/lock_profile.png.meta b/Assets/Resources/so/ally/30204/lock_profile.png.meta new file mode 100644 index 00000000..a8eecb1a --- /dev/null +++ b/Assets/Resources/so/ally/30204/lock_profile.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 47e3bed563854b248b684b071ccafe38 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5796064871271532235 + second: lock200_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: lock200_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5397dbc55bd309fa0800000000000000 + internalID: -5796064871271532235 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + lock200_0: -5796064871271532235 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/ally/30204_lock.asset b/Assets/Resources/so/ally/30204_lock.asset index 36ded2d9..338daac8 100644 --- a/Assets/Resources/so/ally/30204_lock.asset +++ b/Assets/Resources/so/ally/30204_lock.asset @@ -21,6 +21,8 @@ MonoBehaviour: ally_heroIcon: {fileID: 0} ally_heroPoster: {fileID: 21300000, guid: c789f3f762cd4444688a6f59bc0aa150, type: 3} ally_hero_HD_image: {fileID: 21300000, guid: f27edc042c98f264492ea474acb525e8, type: 3} + ally_hero_squareProfile: {fileID: 21300000, guid: 47e3bed563854b248b684b071ccafe38, type: 3} + ally_heroThemeColor: {r: 0, g: 0, b: 0, a: 0} ally_heroDescription: "\u6D1B\u514B\u738B\u56FD" levelStats: - levelName: Level 1 @@ -31,6 +33,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 0 + skill_slot_limited: 0 manaGainGood: 0 manaGainGreat: 0 manaGainPerfect: 0 @@ -47,6 +50,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 222 + skill_slot_limited: 0 manaGainGood: 0 manaGainGreat: 0 manaGainPerfect: 0 @@ -63,6 +67,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 444 + skill_slot_limited: 0 manaGainGood: 0 manaGainGreat: 0 manaGainPerfect: 0 @@ -79,6 +84,7 @@ MonoBehaviour: maxMana: 0 scoreEfficiency: 0 requiredEXP: 666 + skill_slot_limited: 0 manaGainGood: 0 manaGainGreat: 0 manaGainPerfect: 0 diff --git a/Assets/Resources/so/skill_allySkills/skill_icons.meta b/Assets/Resources/so/skill_allySkills/skill_icons.meta new file mode 100644 index 00000000..7791fb7b --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d3cbfc3748507445a0b3ad0940cb2ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png new file mode 100644 index 00000000..5498447b Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png.meta new file mode 100644 index 00000000..c5dd5419 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【偏科专攻】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 160959886f709ae47b6cf60a91d4ed45 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1342354027601045163 + second: "\u3010\u504F\u79D1\u4E13\u653B\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u504F\u79D1\u4E13\u653B\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ba6a9f140eff0a210800000000000000 + internalID: 1342354027601045163 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u504F\u79D1\u4E13\u653B\u3011_0": 1342354027601045163 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png new file mode 100644 index 00000000..a3d9e52f Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png.meta new file mode 100644 index 00000000..8071491d --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【建立天才的国度】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 2c0d21484a75511429e77d2e4a73597a +TextureImporter: + internalIDToNameTable: + - first: + 213: 1134437912411493675 + second: "\u3010\u5EFA\u7ACB\u5929\u624D\u7684\u56FD\u5EA6\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u5EFA\u7ACB\u5929\u624D\u7684\u56FD\u5EA6\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b25d50555455ebf00800000000000000 + internalID: 1134437912411493675 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u5EFA\u7ACB\u5929\u624D\u7684\u56FD\u5EA6\u3011_0": 1134437912411493675 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png new file mode 100644 index 00000000..6aab875b Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png.meta new file mode 100644 index 00000000..9594909e --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 II】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 10f859893f3b45b488abfbae3b3b6429 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6060851944853864940 + second: "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 II\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 II\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 41effb6944783eba0800000000000000 + internalID: -6060851944853864940 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 II\u3011_0": -6060851944853864940 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png new file mode 100644 index 00000000..34b26bca Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png.meta new file mode 100644 index 00000000..c13832b0 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【引爆灵感神经元 I】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 3b045c68afc968745a598df1b1927aa7 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6957055087507186825 + second: "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 I\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 I\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 77b5f4a0243937f90800000000000000 + internalID: -6957055087507186825 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u5F15\u7206\u7075\u611F\u795E\u7ECF\u5143 I\u3011_0": -6957055087507186825 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png new file mode 100644 index 00000000..8e89cc4f Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png.meta new file mode 100644 index 00000000..4a8c6e05 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【形作清流】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: be131404ab19ab6458f0d176b717bc0d +TextureImporter: + internalIDToNameTable: + - first: + 213: -2980384771398797032 + second: "\u3010\u5F62\u4F5C\u6E05\u6D41\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u5F62\u4F5C\u6E05\u6D41\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8197ac657db83a6d0800000000000000 + internalID: -2980384771398797032 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u5F62\u4F5C\u6E05\u6D41\u3011_0": -2980384771398797032 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png new file mode 100644 index 00000000..7a261a50 Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png.meta new file mode 100644 index 00000000..3d5f67a5 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【愈勇好胜】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: f0322c66a77f7b74292d47e99cf37e9d +TextureImporter: + internalIDToNameTable: + - first: + 213: 6689105351413157035 + second: "\u3010\u6108\u52C7\u597D\u80DC\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u6108\u52C7\u597D\u80DC\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: bac452070e974dc50800000000000000 + internalID: 6689105351413157035 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u6108\u52C7\u597D\u80DC\u3011_0": 6689105351413157035 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png new file mode 100644 index 00000000..2248e77b Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png.meta new file mode 100644 index 00000000..0a55d9de --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【愈发坚定】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 4361f6d9935395b47a2e15911871d48d +TextureImporter: + internalIDToNameTable: + - first: + 213: -5551018247983287206 + second: "\u3010\u6108\u53D1\u575A\u5B9A\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u6108\u53D1\u575A\u5B9A\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a54be336052d6f2b0800000000000000 + internalID: -5551018247983287206 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u6108\u53D1\u575A\u5B9A\u3011_0": -5551018247983287206 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png new file mode 100644 index 00000000..a7fd79a2 Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png.meta new file mode 100644 index 00000000..f42ee893 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【扮演吉祥物】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: a1c9ed5e8756d3049a41a1009f513564 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3241786260051423016 + second: "\u3010\u626E\u6F14\u5409\u7965\u7269\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u626E\u6F14\u5409\u7965\u7269\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8d094eb729cd203d0800000000000000 + internalID: -3241786260051423016 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u626E\u6F14\u5409\u7965\u7269\u3011_0": -3241786260051423016 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png new file mode 100644 index 00000000..5466c364 Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png.meta new file mode 100644 index 00000000..710320f3 --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【无畏之举】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 86cc99e13ebc99a448561c111ff11dd2 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3721329456937936584 + second: "\u3010\u65E0\u754F\u4E4B\u4E3E\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u65E0\u754F\u4E4B\u4E3E\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 839540b439e2b5cc0800000000000000 + internalID: -3721329456937936584 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u65E0\u754F\u4E4B\u4E3E\u3011_0": -3721329456937936584 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png new file mode 100644 index 00000000..403a649f Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png.meta new file mode 100644 index 00000000..191c5f1a --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【牺牲换效率】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ab8331cd2b685354298083fae2fa6c11 +TextureImporter: + internalIDToNameTable: + - first: + 213: -4212297795411093299 + second: "\u3010\u727A\u7272\u6362\u6548\u7387\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u727A\u7272\u6362\u6548\u7387\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: dc85c580979ea85c0800000000000000 + internalID: -4212297795411093299 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u727A\u7272\u6362\u6548\u7387\u3011_0": -4212297795411093299 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png b/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png new file mode 100644 index 00000000..11c706df Binary files /dev/null and b/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png differ diff --git a/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png.meta b/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png.meta new file mode 100644 index 00000000..88590b7c --- /dev/null +++ b/Assets/Resources/so/skill_allySkills/skill_icons/【舌战】.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c159b2fe41039f24cac31d608ad62cec +TextureImporter: + internalIDToNameTable: + - first: + 213: 4224805544709372245 + second: "\u3010\u820C\u6218\u3011_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: "\u3010\u820C\u6218\u3011_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 500 + height: 500 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 559b089424681aa30800000000000000 + internalID: 4224805544709372245 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u3010\u820C\u6218\u3011_0": 4224805544709372245 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Songs_Select.unity b/Assets/Scenes/Songs_Select.unity index f05ba0c6..e7014edc 100644 --- a/Assets/Scenes/Songs_Select.unity +++ b/Assets/Scenes/Songs_Select.unity @@ -818,6 +818,151 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 48067318} m_CullTransparentMesh: 1 +--- !u!1 &53476763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 53476764} + - component: {fileID: 53476767} + - component: {fileID: 53476766} + - component: {fileID: 53476765} + m_Layer: 0 + m_Name: confirmTeamSelecting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &53476764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53476763} + 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: 633403043} + m_Father: {fileID: 1527514825} + 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: 713.1, y: -400} + m_SizeDelta: {x: 404, y: 153} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &53476765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53476763} + 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: 53476766} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 761473987} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 979720592} + m_TargetAssemblyTypeName: load_teammatesProfile, Assembly-CSharp + m_MethodName: update_teammates_profile + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &53476766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53476763} + 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: 2e50456176456914689a4cb7309dc170, 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 &53476767 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53476763} + m_CullTransparentMesh: 1 --- !u!1 &54722882 GameObject: m_ObjectHideFlags: 0 @@ -2393,6 +2538,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 240602871} m_CullTransparentMesh: 1 +--- !u!1 &251081093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 251081094} + - component: {fileID: 251081096} + - component: {fileID: 251081095} + m_Layer: 5 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &251081094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251081093} + 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: 527025464} + 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.062, y: 0.0621} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &251081095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251081093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.058823533, g: 0.8941177, b: 0.9921569, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &251081096 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251081093} + m_CullTransparentMesh: 1 --- !u!1 &275273346 GameObject: m_ObjectHideFlags: 0 @@ -4020,81 +4240,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 430223020} m_CullTransparentMesh: 1 ---- !u!1 &435448797 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 435448798} - - component: {fileID: 435448800} - - component: {fileID: 435448799} - m_Layer: 5 - m_Name: teamSettings_teammateProfile3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &435448798 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435448797} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 928623237} - 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: 535, y: -76.3} - m_SizeDelta: {x: 53, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &435448799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435448797} - 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: 3b13e906e5ce05646bb7453cddc43670, 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 &435448800 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435448797} - m_CullTransparentMesh: 1 --- !u!1 &443831635 GameObject: m_ObjectHideFlags: 0 @@ -5205,6 +5350,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 522732286} m_CullTransparentMesh: 1 +--- !u!1 &527025463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 527025464} + - component: {fileID: 527025465} + - component: {fileID: 527025466} + m_Layer: 5 + m_Name: teamSettings_teammateProfile3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &527025464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527025463} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 251081094} + m_Father: {fileID: 979720590} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &527025465 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527025463} + m_CullTransparentMesh: 1 +--- !u!114 &527025466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527025463} + 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: 1a62adf36834dd04181a6dd61344f8b8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &529449786 GameObject: m_ObjectHideFlags: 0 @@ -6435,7 +6656,7 @@ MonoBehaviour: m_Top: 30 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: -10 + m_Spacing: -30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -6548,81 +6769,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &612146403 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 612146404} - - component: {fileID: 612146406} - - component: {fileID: 612146405} - m_Layer: 5 - m_Name: teamSettings_teammateProfile4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &612146404 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 612146403} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 928623237} - 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: 600, y: -76.3} - m_SizeDelta: {x: 53, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &612146405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 612146403} - 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: 3b13e906e5ce05646bb7453cddc43670, 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 &612146406 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 612146403} - m_CullTransparentMesh: 1 --- !u!1 &615836162 GameObject: m_ObjectHideFlags: 0 @@ -6660,81 +6806,6 @@ RectTransform: m_AnchoredPosition: {x: -0.000030518, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &618372337 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 618372338} - - component: {fileID: 618372340} - - component: {fileID: 618372339} - m_Layer: 5 - m_Name: teamSettings_teammateProfile2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &618372338 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 618372337} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 928623237} - 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: 470, y: -76.3} - m_SizeDelta: {x: 53, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &618372339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 618372337} - 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: 3b13e906e5ce05646bb7453cddc43670, 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 &618372340 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 618372337} - m_CullTransparentMesh: 1 --- !u!1 &619102155 GameObject: m_ObjectHideFlags: 0 @@ -6921,6 +6992,85 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &633403042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633403043} + - component: {fileID: 633403045} + - component: {fileID: 633403044} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &633403043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633403042} + 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: 53476764} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 6.0000267, y: -9} + m_SizeDelta: {x: -32.000053, y: -42.000004} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &633403044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633403042} + 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: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3} + m_FontSize: 36 + 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: "\u786E\u8BA4\u7F16\u961F" +--- !u!222 &633403045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633403042} + m_CullTransparentMesh: 1 --- !u!1 &657414857 GameObject: m_ObjectHideFlags: 0 @@ -8386,6 +8536,81 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6498284107731038263, guid: aa952509a571b5a41b89d776b76ac807, type: 3} m_PrefabInstance: {fileID: 6609058366026993853} m_PrefabAsset: {fileID: 0} +--- !u!1 &764922071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 764922072} + - component: {fileID: 764922074} + - component: {fileID: 764922073} + m_Layer: 5 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &764922072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764922071} + 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: 1264274073} + 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.062, y: 0.0621} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &764922073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764922071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.058823533, g: 0.8941177, b: 0.9921569, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &764922074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764922071} + m_CullTransparentMesh: 1 --- !u!1 &777622825 GameObject: m_ObjectHideFlags: 0 @@ -11187,11 +11412,7 @@ RectTransform: m_Children: - {fileID: 522732287} - {fileID: 1467062573} - - {fileID: 2145804833} - - {fileID: 1900229337} - - {fileID: 618372338} - - {fileID: 435448798} - - {fileID: 612146404} + - {fileID: 979720590} - {fileID: 978192743} m_Father: {fileID: 834550947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11435,8 +11656,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -502, y: 428} - m_SizeDelta: {x: 594.8362, y: 100} + m_AnchoredPosition: {x: -243.97589, y: 428} + m_SizeDelta: {x: 1110.8844, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &962962213 MonoBehaviour: @@ -11451,7 +11672,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -11471,7 +11692,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9009\u62E9\u4F60\u7684\u540C\u4F19..." + m_Text: "\u725B\u987F\u9AD8\u65AF\u6BD4\u6211\u63D0\u524D\u51FA\u751F\u662F\u7B28\u9E1F\u5148\u98DE\u8FD8\u662F\u907F\u6211\u950B\u8292..." --- !u!222 &962962214 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11695,6 +11916,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978192742} m_CullTransparentMesh: 1 +--- !u!1 &979720589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 979720590} + - component: {fileID: 979720591} + - component: {fileID: 979720592} + m_Layer: 5 + m_Name: teammates_profilesHorizontalLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &979720590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979720589} + 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: 2145804833} + - {fileID: 1271562745} + - {fileID: 527025464} + - {fileID: 1683598198} + - {fileID: 1264274073} + m_Father: {fileID: 928623237} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1279.58, y: -617} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &979720591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979720589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &979720592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979720589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1764c09e2d730fd42b7a2d1f24161bfb, type: 3} + m_Name: + m_EditorClassIdentifier: + teammate_profile_01: {fileID: 2145804834} + teammate_profile_02: {fileID: 1271562747} + teammate_profile_03: {fileID: 527025466} + teammate_profile_04: {fileID: 1683598200} + teammate_profile_05: {fileID: 1264274071} + teammate_profile_boarder_01: {fileID: 2080832031} + teammate_profile_boarder_02: {fileID: 1650560196} + teammate_profile_boarder_03: {fileID: 251081095} + teammate_profile_boarder_04: {fileID: 1028134841} + teammate_profile_boarder_05: {fileID: 764922073} + levelColor_C: {r: 0.99215686, g: 0.98039216, b: 0.54509807, a: 0} + levelColor_B: {r: 0.92156863, g: 0.7137255, b: 1, a: 0} + levelColor_A: {r: 0.6392157, g: 0.9764706, b: 0.9490196, a: 0} + levelColor_S: {r: 0.7058824, g: 1, b: 0.6392157, a: 0} --- !u!1 &979863369 GameObject: m_ObjectHideFlags: 0 @@ -12341,6 +12656,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1028134839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1028134840} + - component: {fileID: 1028134842} + - component: {fileID: 1028134841} + m_Layer: 5 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1028134840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028134839} + 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: 1683598198} + 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.062, y: 0.0621} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1028134841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028134839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.058823533, g: 0.8941177, b: 0.9921569, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1028134842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028134839} + m_CullTransparentMesh: 1 --- !u!1 &1034897017 GameObject: m_ObjectHideFlags: 0 @@ -13577,7 +13967,7 @@ MonoBehaviour: skillCardPrefab: {fileID: 6849663232819926772, guid: cd57e902147b2744ea30e7e412013adc, type: 3} contentParent: {fileID: 595796616} columnHeaderPrefab: {fileID: 8543087319720739685, guid: 0907fe9ccb5bc114c9403f9f1d8e4c4e, type: 3} - columnSpacing: 10 + columnSpacing: 0 columnChildAlignment: 0 columnChildControlWidth: 1 columnChildControlHeight: 1 @@ -13585,7 +13975,7 @@ MonoBehaviour: columnPaddingRight: 0 columnPaddingTop: 0 columnPaddingBottom: 0 - columnVerticalSpacing: -15 + columnVerticalSpacing: -30 skillCardUseLayoutElement: 1 skillCardPreferredWidth: 120 skillCardPreferredHeight: 40 @@ -15219,6 +15609,158 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245531101} m_CullTransparentMesh: 1 +--- !u!1 &1264274070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1264274073} + - component: {fileID: 1264274072} + - component: {fileID: 1264274071} + m_Layer: 5 + m_Name: teamSettings_teammateProfile5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1264274071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1264274070} + 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: 1a62adf36834dd04181a6dd61344f8b8, 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 &1264274072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1264274070} + m_CullTransparentMesh: 1 +--- !u!224 &1264274073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1264274070} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 764922072} + m_Father: {fileID: 979720590} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1271562744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271562745} + - component: {fileID: 1271562746} + - component: {fileID: 1271562747} + m_Layer: 5 + m_Name: teamSettings_teammateProfile2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1271562745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271562744} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1650560195} + m_Father: {fileID: 979720590} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1271562746 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271562744} + m_CullTransparentMesh: 1 +--- !u!114 &1271562747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271562744} + 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: 1a62adf36834dd04181a6dd61344f8b8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1366441508 GameObject: m_ObjectHideFlags: 0 @@ -16310,17 +16852,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1593528872} - m_TargetAssemblyTypeName: TeamManager, Assembly-CSharp - m_MethodName: openTeamSettingPanel - m_Mode: 1 + - m_Target: {fileID: 761473987} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 0 + m_BoolArgument: 1 m_CallState: 2 --- !u!1 &1469822599 GameObject: @@ -16956,6 +17498,7 @@ RectTransform: - {fileID: 962962212} - {fileID: 761822186} - {fileID: 1215614092} + - {fileID: 53476764} m_Father: {fileID: 761473988} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -18057,7 +18600,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 8998712664844134382, guid: 08ec25d1fa9582042b66477e54c0d67f, type: 3} + m_Sprite: {fileID: 21300000, guid: 8136a262f526d9148bf2a0a168a62faa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18386,7 +18929,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 8998712664844134382, guid: 08ec25d1fa9582042b66477e54c0d67f, type: 3} + m_Sprite: {fileID: 21300000, guid: 7bf411781be0bcd4dabbf71f0332e049, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18690,6 +19233,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1626843226} m_CullTransparentMesh: 1 +--- !u!1 &1650560194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1650560195} + - component: {fileID: 1650560197} + - component: {fileID: 1650560196} + m_Layer: 5 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1650560195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650560194} + 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: 1271562745} + 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.062, y: 0.0621} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1650560196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650560194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.058823533, g: 0.8941177, b: 0.9921569, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1650560197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650560194} + m_CullTransparentMesh: 1 --- !u!1 &1652951586 GameObject: m_ObjectHideFlags: 0 @@ -19557,6 +20175,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682307012} m_CullTransparentMesh: 1 +--- !u!1 &1683598197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1683598198} + - component: {fileID: 1683598199} + - component: {fileID: 1683598200} + m_Layer: 5 + m_Name: teamSettings_teammateProfile4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1683598198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1683598197} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1028134840} + m_Father: {fileID: 979720590} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1683598199 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1683598197} + m_CullTransparentMesh: 1 +--- !u!114 &1683598200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1683598197} + 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: 1a62adf36834dd04181a6dd61344f8b8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1687375882 GameObject: m_ObjectHideFlags: 0 @@ -22018,81 +22712,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1879916748} m_CullTransparentMesh: 1 ---- !u!1 &1900229336 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1900229337} - - component: {fileID: 1900229339} - - component: {fileID: 1900229338} - m_Layer: 5 - m_Name: teamSettings_teammateProfile1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1900229337 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900229336} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 928623237} - 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: 405, y: -76.3} - m_SizeDelta: {x: 53, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1900229338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900229336} - 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: 3b13e906e5ce05646bb7453cddc43670, 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 &1900229339 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900229336} - m_CullTransparentMesh: 1 --- !u!1 &1902451275 GameObject: m_ObjectHideFlags: 0 @@ -23966,6 +24585,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2080832029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2080832030} + - component: {fileID: 2080832032} + - component: {fileID: 2080832031} + m_Layer: 5 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2080832030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080832029} + 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: 2145804833} + 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.062, y: 0.0621} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2080832031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080832029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.058823533, g: 0.8941177, b: 0.9921569, 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2080832032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080832029} + m_CullTransparentMesh: 1 --- !u!1 &2081596340 GameObject: m_ObjectHideFlags: 0 @@ -24880,7 +25574,7 @@ GameObject: - component: {fileID: 2145804835} - component: {fileID: 2145804834} m_Layer: 5 - m_Name: teamSettings_captainProfile + m_Name: teamSettings_teammateProfile1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24893,17 +25587,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145804832} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 928623237} + m_Children: + - {fileID: 2080832030} + m_Father: {fileID: 979720590} 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: 330, y: -66.1} - m_SizeDelta: {x: 79, y: 79} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2145804834 MonoBehaviour: @@ -25474,6 +26169,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1527514825} m_Modifications: + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: availableColor.b + value: 0.03867334 + objectReference: {fileID: 0} + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: availableColor.g + value: 0.5660378 + objectReference: {fileID: 0} + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: availableColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: unavailableColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: unavailableColor.g + value: 0.049833357 + objectReference: {fileID: 0} + - target: {fileID: 3805578168692550042, guid: aa952509a571b5a41b89d776b76ac807, type: 3} + propertyPath: unavailableColor.r + value: 0.6132076 + objectReference: {fileID: 0} - target: {fileID: 4611464830852860383, guid: aa952509a571b5a41b89d776b76ac807, type: 3} propertyPath: m_Name value: detailsPrefab diff --git a/Assets/artworks/selectYourSongFirst/boarder.png b/Assets/artworks/selectYourSongFirst/boarder.png new file mode 100644 index 00000000..fcd6e0a2 Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/boarder.png differ diff --git a/Assets/artworks/selectYourSongFirst/boarder.png.meta b/Assets/artworks/selectYourSongFirst/boarder.png.meta new file mode 100644 index 00000000..740c0f78 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/boarder.png.meta @@ -0,0 +1,234 @@ +fileFormatVersion: 2 +guid: c7c2fe3c72ded9244bf6b5506cc84f41 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7112958055763286072 + second: "\u672A\u6807\u9898-1 (2)_0" + - first: + 213: -8731791400406729856 + second: "\u672A\u6807\u9898-1 (2)_1" + - first: + 213: -6961432280494039559 + second: "\u672A\u6807\u9898-1 (2)_2" + - first: + 213: 2858579096839627782 + second: "\u672A\u6807\u9898-1 (2)_3" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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\u6807\u9898-1 (2)_0" + rect: + serializedVersion: 2 + x: 0 + y: 159 + width: 41 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8c7e9f79552b94d90800000000000000 + internalID: -7112958055763286072 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u6807\u9898-1 (2)_1" + rect: + serializedVersion: 2 + x: 159 + y: 159 + width: 41 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 08b32fdfbf172d680800000000000000 + internalID: -8731791400406729856 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u6807\u9898-1 (2)_2" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 41 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9fd17316936046f90800000000000000 + internalID: -6961432280494039559 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u672A\u6807\u9898-1 (2)_3" + rect: + serializedVersion: 2 + x: 159 + y: 0 + width: 41 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 604ab7d0b86bba720800000000000000 + internalID: 2858579096839627782 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u672A\u6807\u9898-1 (2)_0": -7112958055763286072 + "\u672A\u6807\u9898-1 (2)_1": -8731791400406729856 + "\u672A\u6807\u9898-1 (2)_2": -6961432280494039559 + "\u672A\u6807\u9898-1 (2)_3": 2858579096839627782 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/decision_bottom.png b/Assets/artworks/selectYourSongFirst/decision_bottom.png new file mode 100644 index 00000000..f98fdec2 Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/decision_bottom.png differ diff --git a/Assets/artworks/selectYourSongFirst/decision_bottom.png.meta b/Assets/artworks/selectYourSongFirst/decision_bottom.png.meta new file mode 100644 index 00000000..b5b94e8b --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/decision_bottom.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 7bf411781be0bcd4dabbf71f0332e049 +TextureImporter: + internalIDToNameTable: + - first: + 213: -2974362203136603196 + second: decision (1)_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: decision (1)_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 580 + height: 290 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4cbc1b8c551f8b6d0800000000000000 + internalID: -2974362203136603196 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + decision (1)_0: -2974362203136603196 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/basicInfoBars.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/basicInfoBars.cs index 123f1c3b..5f0ce708 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/basicInfoBars.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/basicInfoBars.cs @@ -13,6 +13,7 @@ public class basicInfoBars : MonoBehaviour public Image damageResistanceImage; public Image basicManaImage; public Image scoreEffeciencyImage; + public Image skillAmountLimitImage; public Image missDamageImage; [Header("maxValues")] public int maxAttackValue = 999; @@ -20,6 +21,7 @@ public class basicInfoBars : MonoBehaviour public float maxDamageResistanceValue = 1f; public int maxBasicManaValue = 999; public float maxScoreEfficiencyValue = 1f; + public int maxSkillAmountLimitValue = 10; public int maxMissDamageValue = 99; // Start is called once before the first execution of Update after the MonoBehaviour is created @@ -93,4 +95,14 @@ public class basicInfoBars : MonoBehaviour missDamageImage.fillAmount = clampedValue / maxMissDamageValue; } } + + // üƽ + public void SetSkillAmountLimit(int value) + { + if (skillAmountLimitImage != null) + { + float clampedValue = Mathf.Clamp(value, 0, maxSkillAmountLimitValue); + skillAmountLimitImage.fillAmount = clampedValue / maxSkillAmountLimitValue; + } + } } diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/character_detailInformation.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/character_detailInformation.cs index 99d0ceca..ba5ca9c2 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/character_detailInformation.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/character_detailInformation.cs @@ -19,6 +19,8 @@ public class character_detailInformation : MonoBehaviour public RatioBar ratioBar; [Header("shutdown")] public Button shut_button; + [Header("ɫͼ")] + public Image mainTheme_fadeImage; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -59,11 +61,12 @@ public class character_detailInformation : MonoBehaviour int maxMana = levelInfo.maxMana; float scoreEfficiency = levelInfo.scoreEfficiency; float missHpLoss = levelInfo.missHpLossBase; + int skillSlotLimited = levelInfo.skill_slot_limited; // basic_infoText if (basic_infoText != null) { - basic_infoText.text = $"{attack}\n{maxHP}\n{damageResistance * 100}%\n{maxMana}\n{scoreEfficiency * 100}%\n\n{missHpLoss}"; + basic_infoText.text = $"{attack}\n{maxHP}\n{damageResistance * 100}%\n{maxMana}\n{scoreEfficiency * 100}%\n{skillSlotLimited}\n{missHpLoss}"; } // basicInfoBarsý @@ -74,6 +77,7 @@ public class character_detailInformation : MonoBehaviour infoBars.SetDamageResistance(damageResistance); infoBars.SetBasicMana(maxMana); infoBars.SetScoreEfficiency(scoreEfficiency); + infoBars.SetSkillAmountLimit(skillSlotLimited); infoBars.SetMissDamage((int)missHpLoss); // missDamageint } @@ -89,6 +93,14 @@ public class character_detailInformation : MonoBehaviour ratioBar.SetManaAndDamage(heroSO); } } + + // ɫͼ + if (mainTheme_fadeImage != null) + { + Color themeColor = heroSO.ally_heroThemeColor; + themeColor.a = 1f; // ȷ͸Ϊ1ʹɼ + mainTheme_fadeImage.color = themeColor; + } } } diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefab.prefab b/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefab.prefab index 5269ed5a..2ed6246a 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefab.prefab +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefab.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 153.3, y: 161.6} - m_SizeDelta: {x: 223.6511, y: 15} + m_AnchoredPosition: {x: 148.26155, y: 161.6} + m_SizeDelta: {x: 233.7279, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2235889295855993711 CanvasRenderer: @@ -376,6 +376,8 @@ MonoBehaviour: item_typeText: {fileID: 9206827753968619961} item_statusText: {fileID: 1369813031075670775} item_detailInformationText: {fileID: 2034402806027055942} + availableColor: {r: 0, g: 0.5647059, b: 0.039215688, a: 0} + unavailableColor: {r: 0.6117647, g: 0.050980393, b: 0, a: 0} --- !u!1 &5994834139812127226 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefabController.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefabController.cs index 1cd211c7..dbb51d35 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefabController.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/detailsPrefabController.cs @@ -11,6 +11,10 @@ public class detailsPrefabController : MonoBehaviour public Text item_statusText; public Text item_detailInformationText; + [Header("colors")] + public Color availableColor; + public Color unavailableColor; + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/heroDetail_informationPanel.prefab b/Assets/artworks/selectYourSongFirst/heroes_level_image/heroDetail_informationPanel.prefab index 21e2b7be..39cb9a59 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/heroDetail_informationPanel.prefab +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/heroDetail_informationPanel.prefab @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.6901961, g: 0.6901961, b: 0.6901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -145,8 +145,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 11.5123, y: -20.1} - m_SizeDelta: {x: 2283.481, y: 1032} + m_AnchoredPosition: {x: 11.5123, y: 96.02061} + m_SizeDelta: {x: 2283.481, y: 1264.2412} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2073246582347666116 CanvasRenderer: @@ -223,6 +223,115 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &176614282656972641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4168124988842280344} + - component: {fileID: 7105336951393266954} + - component: {fileID: 4421636164686512092} + - component: {fileID: 97658162172274248} + m_Layer: 0 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4168124988842280344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176614282656972641} + 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: 3601713102362192618} + - {fileID: 90116038175144831} + - {fileID: 291172706183138005} + m_Father: {fileID: 5377393360791770380} + 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: -590.5875, y: -49.908} + m_SizeDelta: {x: 1272.947, y: 948.005} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7105336951393266954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176614282656972641} + m_CullTransparentMesh: 1 +--- !u!114 &4421636164686512092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176614282656972641} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &97658162172274248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176614282656972641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 5462794312765599695} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 3601713102362192618} + m_HorizontalScrollbar: {fileID: 698007964763496538} + m_VerticalScrollbar: {fileID: 1209094107894937135} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &224048558574408939 GameObject: m_ObjectHideFlags: 0 @@ -503,6 +612,42 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &858315780798172659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4961535777319690161} + m_Layer: 0 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4961535777319690161 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858315780798172659} + 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: 6343323878675638866} + m_Father: {fileID: 90116038175144831} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &991710494002099323 GameObject: m_ObjectHideFlags: 0 @@ -877,7 +1022,7 @@ GameObject: - component: {fileID: 5088274863555740262} - component: {fileID: 580225464074904303} m_Layer: 0 - m_Name: empty + m_Name: skillAmountLimitImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -923,7 +1068,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.47799802, g: 0.38203096, b: 0.8018868, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1049,8 +1194,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -530.6, y: 0} - m_SizeDelta: {x: 862, y: 578} + m_AnchoredPosition: {x: -381.05, y: 0} + m_SizeDelta: {x: 1161.1, y: 578} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &861744974703580439 CanvasRenderer: @@ -1073,7 +1218,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1127,6 +1272,96 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1891662796159665089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3601713102362192618} + - component: {fileID: 9169299552920355889} + - component: {fileID: 3293383216445022640} + - component: {fileID: 1541765198066182934} + m_Layer: 0 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3601713102362192618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891662796159665089} + 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: 5462794312765599695} + m_Father: {fileID: 4168124988842280344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &9169299552920355889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891662796159665089} + m_CullTransparentMesh: 1 +--- !u!114 &3293383216445022640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891662796159665089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1541765198066182934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891662796159665089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &1906853921426917167 GameObject: m_ObjectHideFlags: 0 @@ -1810,6 +2045,42 @@ Transform: - {fileID: 3415469117581421086} m_Father: {fileID: 7586078242362044983} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3127487449928652310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5806234891303014125} + m_Layer: 0 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5806234891303014125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3127487449928652310} + 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: 4070975966302756310} + m_Father: {fileID: 291172706183138005} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3193944421120636770 GameObject: m_ObjectHideFlags: 0 @@ -2031,9 +2302,11 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3002602319014394336} + - {fileID: 171721856589296495} - {fileID: 5341838598323357223} - {fileID: 8851426970456244649} - {fileID: 2735806106093742259} + - {fileID: 5377393360791770380} m_Father: {fileID: 9024872250127776600} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2041,6 +2314,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3668022214840186091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 90116038175144831} + - component: {fileID: 2514813456632200216} + - component: {fileID: 5075403512403466859} + - component: {fileID: 698007964763496538} + m_Layer: 0 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &90116038175144831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3668022214840186091} + 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: 4961535777319690161} + m_Father: {fileID: 4168124988842280344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!222 &2514813456632200216 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3668022214840186091} + m_CullTransparentMesh: 1 +--- !u!114 &5075403512403466859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3668022214840186091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &698007964763496538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3668022214840186091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5453563296087958961} + m_HandleRect: {fileID: 6343323878675638866} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3696374339810437098 GameObject: m_ObjectHideFlags: 0 @@ -2146,6 +2545,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7412665265852764828} + - {fileID: 7973809635580840477} - {fileID: 2585524205079368300} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2175,6 +2575,7 @@ MonoBehaviour: levelBar: {fileID: 3462392200046160186} ratioBar: {fileID: 1432672323854574985} shut_button: {fileID: 69102263217225498} + mainTheme_fadeImage: {fileID: 4250280401923292371} --- !u!1 &3807896802573251032 GameObject: m_ObjectHideFlags: 0 @@ -2361,8 +2762,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 942, y: 300.8} - m_SizeDelta: {x: 32, y: 31.5758} + m_AnchoredPosition: {x: 713.0999, y: -400} + m_SizeDelta: {x: 404, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3480545071927269994 CanvasRenderer: @@ -2392,7 +2793,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 2e50456176456914689a4cb7309dc170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2521,6 +2922,82 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 1 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4352646834712745618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 171721856589296495} + - component: {fileID: 7449909000373568059} + - component: {fileID: 3067149024980540031} + m_Layer: 0 + m_Name: bobottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &171721856589296495 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352646834712745618} + 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: 2505415364220733930} + m_Father: {fileID: 7412665265852764828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7449909000373568059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352646834712745618} + m_CullTransparentMesh: 1 +--- !u!114 &3067149024980540031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352646834712745618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6117647} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4567706977629063286 GameObject: m_ObjectHideFlags: 0 @@ -2555,8 +3032,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -132.11327, y: 0} - m_SizeDelta: {x: 663.2377, y: 578} + m_AnchoredPosition: {x: -84.0078, y: 0} + m_SizeDelta: {x: 567.0267, y: 578} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8031334733024856323 CanvasRenderer: @@ -2672,6 +3149,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4742580110548256887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 291172706183138005} + - component: {fileID: 5906167974762170946} + - component: {fileID: 4612062678304960294} + - component: {fileID: 1209094107894937135} + m_Layer: 0 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &291172706183138005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742580110548256887} + 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: 5806234891303014125} + m_Father: {fileID: 4168124988842280344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &5906167974762170946 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742580110548256887} + m_CullTransparentMesh: 1 +--- !u!114 &4612062678304960294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742580110548256887} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1209094107894937135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742580110548256887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 553249716254386913} + m_HandleRect: {fileID: 4070975966302756310} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4760771826108971804 GameObject: m_ObjectHideFlags: 0 @@ -2782,6 +3385,219 @@ Transform: - {fileID: 5268228252153452762} m_Father: {fileID: 7412665265852764828} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5037342797561714955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7973809635580840477} + - component: {fileID: 6335025843776602631} + - component: {fileID: 7959830302376272461} + - component: {fileID: 3327481200373387325} + m_Layer: 0 + m_Name: confirmTeamSelecting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7973809635580840477 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5037342797561714955} + 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: 3316264249846663942} + m_Father: {fileID: 9024872250127776600} + 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: 713.09985, y: -425} + m_SizeDelta: {x: 404, y: 153} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6335025843776602631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5037342797561714955} + m_CullTransparentMesh: 1 +--- !u!114 &7959830302376272461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5037342797561714955} + 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: 2e50456176456914689a4cb7309dc170, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3327481200373387325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5037342797561714955} + 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: 7959830302376272461} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &5163760115609137901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2505415364220733930} + - component: {fileID: 5974443392382258486} + - component: {fileID: 1152862713588167435} + m_Layer: 0 + m_Name: "\u70B9\u51FB\u5DE6\u4E0B\u89D2\u4E00\u53E3\u6C14\u770B\u5230\u5927\u7ED3\u5C40" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2505415364220733930 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163760115609137901} + 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: 3930929868867392573} + m_Father: {fileID: 171721856589296495} + 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: -767.1, y: -310} + m_SizeDelta: {x: 265.363, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5974443392382258486 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163760115609137901} + m_CullTransparentMesh: 1 +--- !u!114 &1152862713588167435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163760115609137901} + 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.9245283, g: 0.9245283, b: 0.9245283, 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: cc180dff846d13a4d88ddaed6f77e5cd, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 209 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u5DE6\u4E0B\u89D2\u4E00\u53E3\u6C14\u770B\u5230\u5927\u7ED3\u5C40" --- !u!1 &5315623646045580223 GameObject: m_ObjectHideFlags: 0 @@ -2857,6 +3673,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5363025221678100077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6343323878675638866} + - component: {fileID: 3721018211909845062} + - component: {fileID: 5453563296087958961} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6343323878675638866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363025221678100077} + 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: 4961535777319690161} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3721018211909845062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363025221678100077} + m_CullTransparentMesh: 1 +--- !u!114 &5453563296087958961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363025221678100077} + 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!1 &5386466300001696239 GameObject: m_ObjectHideFlags: 0 @@ -3011,6 +3902,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5504975289347412994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3930929868867392573} + - component: {fileID: 7357666271696178616} + - component: {fileID: 665840870939448856} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3930929868867392573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504975289347412994} + 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: 2505415364220733930} + 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: -163.7, y: 0} + m_SizeDelta: {x: 52.733, y: 43.815} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7357666271696178616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504975289347412994} + m_CullTransparentMesh: 1 +--- !u!114 &665840870939448856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5504975289347412994} + 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: 3402fec81e4ef9f478fe548a2f306e9a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5778505032922534092 GameObject: m_ObjectHideFlags: 0 @@ -3163,7 +4129,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 578.6476, y: -2.3234} - m_SizeDelta: {x: 762.7249, y: 575.3} + m_SizeDelta: {x: 763, y: 575} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1713387230471927467 CanvasRenderer: @@ -3311,6 +4277,53 @@ MonoBehaviour: S_image: {fileID: 307002124912759812} ratioText: {fileID: 5449622074817161137} remainingExpText: {fileID: 3551134426493658335} +--- !u!1 &6457973197886014763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5377393360791770380} + - component: {fileID: 7135245076184874492} + m_Layer: 0 + m_Name: skillDisplay_scrollView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5377393360791770380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6457973197886014763} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -270.9165, y: 21.518555, z: -5.342015} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4168124988842280344} + m_Father: {fileID: 7412665265852764828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7135245076184874492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6457973197886014763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 218774c47fa995543b7b31421e3b9205, type: 3} + m_Name: + m_EditorClassIdentifier: + skillDetailPrefab: {fileID: 5575579192340344948, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + contentParent: {fileID: 5462794312765599695} --- !u!1 &6485095574425392142 GameObject: m_ObjectHideFlags: 0 @@ -3772,6 +4785,159 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7054524828388004664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4070975966302756310} + - component: {fileID: 6680413994782193119} + - component: {fileID: 553249716254386913} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4070975966302756310 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7054524828388004664} + 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: 5806234891303014125} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6680413994782193119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7054524828388004664} + m_CullTransparentMesh: 1 +--- !u!114 &553249716254386913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7054524828388004664} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7198305797104604374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5462794312765599695} + - component: {fileID: 4185095827868276780} + - component: {fileID: 8194382636684342633} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5462794312765599695 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198305797104604374} + 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: 3176455123568386249} + m_Father: {fileID: 3601713102362192618} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &4185095827868276780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198305797104604374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &8194382636684342633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7198305797104604374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &7219687277145288852 GameObject: m_ObjectHideFlags: 0 @@ -4185,6 +5351,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5802322361957273500} + - {fileID: 530726772192076956} - {fileID: 3246082607275696502} - {fileID: 1527282177780124470} - {fileID: 91769583997914591} @@ -4246,6 +5413,95 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &7727176276321387377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 530726772192076956} + - component: {fileID: 8176189701282234786} + - component: {fileID: 2467147224296974603} + - component: {fileID: 8376072146510637449} + m_Layer: 0 + m_Name: bottomBlur + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &530726772192076956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7727176276321387377} + 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: 5341838598323357223} + 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.0049438, y: -2.3234} + m_SizeDelta: {x: 1920, y: 575.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8176189701282234786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7727176276321387377} + m_CullTransparentMesh: 1 +--- !u!114 &2467147224296974603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7727176276321387377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.97647065, g: 0.97647065, b: 0.97647065, a: 0.38431373} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8376072146510637449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7727176276321387377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &7772278566580882782 GameObject: m_ObjectHideFlags: 0 @@ -4481,8 +5737,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.5850007, y: 1.0749991} - m_SizeDelta: {x: -1.1699984, y: 2.150002} + m_AnchoredPosition: {x: 6.0000305, y: -8.999999} + m_SizeDelta: {x: -32.00005, y: -42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5658314108832833474 CanvasRenderer: @@ -4514,8 +5770,8 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_FontSize: 36 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -4525,7 +5781,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\xD7" + m_Text: "\u5173\u95ED" --- !u!1 &8094427602489068192 GameObject: m_ObjectHideFlags: 0 @@ -4914,7 +6170,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u57FA\u7840\u653B\u51FB\u529B\uFF1A\n\u6700\u5927\u751F\u547D\u503C\uFF1A\n\u4F24\u5BB3\u6297\u6027\uFF1A\n\u57FA\u7840\u6CD5\u529B\uFF1A\n\u5F97\u5206\u6548\u7387\uFF1A\n\nmiss\u57FA\u7840\u53D7\u4F24\uFF1A" + m_Text: "\u57FA\u7840\u653B\u51FB\u529B\uFF1A\n\u6700\u5927\u751F\u547D\u503C\uFF1A\n\u4F24\u5BB3\u6297\u6027\uFF1A\n\u57FA\u7840\u6CD5\u529B\uFF1A\n\u5F97\u5206\u6548\u7387\uFF1A\n\u6280\u80FD\u4E0A\u9650\uFF1A\nmiss\u57FA\u7840\u53D7\u4F24\uFF1A" --- !u!1 &8536813150622878089 GameObject: m_ObjectHideFlags: 0 @@ -4978,12 +6234,14 @@ MonoBehaviour: damageResistanceImage: {fileID: 8581243108697890749} basicManaImage: {fileID: 8591803348492067010} scoreEffeciencyImage: {fileID: 3969739652163239825} + skillAmountLimitImage: {fileID: 580225464074904303} missDamageImage: {fileID: 7975007176007977860} maxAttackValue: 999 maxHP_Value: 999 maxDamageResistanceValue: 1 maxBasicManaValue: 999 maxScoreEfficiencyValue: 1 + maxSkillAmountLimitValue: 10 maxMissDamageValue: 99 --- !u!114 &8990920716367156418 MonoBehaviour: @@ -5090,6 +6348,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1 +--- !u!1 &8673746514765317747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3316264249846663942} + - component: {fileID: 5989316884626615031} + - component: {fileID: 5227382830718418641} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3316264249846663942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673746514765317747} + 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: 7973809635580840477} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 6.0000267, y: -9} + m_SizeDelta: {x: -32.000053, y: -42.000004} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5989316884626615031 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673746514765317747} + m_CullTransparentMesh: 1 +--- !u!114 &5227382830718418641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673746514765317747} + 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: 12800000, guid: dfa10de3e2846524089b5073175cd151, type: 3} + m_FontSize: 36 + 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: "\u786E\u8BA4\u7F16\u961F" --- !u!1 &8794845078458632603 GameObject: m_ObjectHideFlags: 0 @@ -5149,7 +6486,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.38431373} + m_Color: {r: 0, g: 0, b: 0, a: 0.49019608} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5189,7 +6526,7 @@ GameObject: m_Component: - component: {fileID: 7581932578821767491} m_Layer: 0 - m_Name: empty + m_Name: skillAmountLimit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5304,6 +6641,7 @@ MonoBehaviour: 0 + 0 0' --- !u!1 &9039672488668158130 @@ -5418,3 +6756,109 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -16.82} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &5159030271848957391 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5462794312765599695} + m_Modifications: + - target: {fileID: 5575579192340344948, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_Name + value: skill_detail_prefab_inHeroDetail + objectReference: {fileID: 0} + - target: {fileID: 5575579192340344948, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_SizeDelta.x + value: 1255.5 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 627.75 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} +--- !u!224 &3176455123568386249 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7749999690041009414, guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1, type: 3} + m_PrefabInstance: {fileID: 5159030271848957391} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons.meta new file mode 100644 index 00000000..d349b4ec --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae369c0b6559e674381299177f4edf5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png new file mode 100644 index 00000000..5eb6c8b8 Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png differ diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png.meta new file mode 100644 index 00000000..ec484098 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/lock.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: d6c1017e6bb4db647837c0b69e568f7a +TextureImporter: + internalIDToNameTable: + - first: + 213: 4663309393762378642 + second: lock (1)_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: lock (1)_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 293e2f4bf2767b040800000000000000 + internalID: 4663309393762378642 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + lock (1)_0: 4663309393762378642 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png new file mode 100644 index 00000000..48b95446 Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png differ diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png.meta new file mode 100644 index 00000000..8c60cc86 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/off.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 9dd3414b0d3ab3c4688fd936bf5d179d +TextureImporter: + internalIDToNameTable: + - first: + 213: -6804654954444095153 + second: off_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: off_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f41024d1f520191a0800000000000000 + internalID: -6804654954444095153 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + off_0: -6804654954444095153 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png new file mode 100644 index 00000000..ec032d27 Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png differ diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png.meta new file mode 100644 index 00000000..aa5d8075 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/iconDefaultIcons/sangedian.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 66801968c2d91024b99fa9bd30c8d417 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8700343863278529912 + second: sangedian_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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: sangedian_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 200 + height: 200 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 87d6772b5a4ddb870800000000000000 + internalID: 8700343863278529912 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + sangedian_0: 8700343863278529912 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/loadDetailsPrefab.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/loadDetailsPrefab.cs index bfaf83e9..e585330e 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/loadDetailsPrefab.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/loadDetailsPrefab.cs @@ -55,6 +55,22 @@ public class loadDetailsPrefab : MonoBehaviour if (currentController.item_statusText != null) currentController.item_statusText.text = status; if (currentController.item_detailInformationText != null) currentController.item_detailInformationText.text = description; + // ״̬ıɫ + if (currentController.item_statusText != null) + { + Color statusColor; + if (status == "ܿ" || status == "ѡ" || status == "") + { + statusColor = currentController.availableColor; + } + else + { + statusColor = currentController.unavailableColor; + } + statusColor.a = 1f; // ȷ͸Ϊ1ʹɼ + currentController.item_statusText.color = statusColor; + } + // λò߽ RectTransform rt = currentDetailsInstance.GetComponent(); if (rt != null) diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/loadSkillsSelect.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/loadSkillsSelect.cs index c43a4576..a9fc58d2 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/loadSkillsSelect.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/loadSkillsSelect.cs @@ -249,16 +249,24 @@ public class loadSkillsSelect : MonoBehaviour public void UpdateSkillCardSelections() { - if (currentHeroSO == null) return; - var equipped = new System.Collections.Generic.HashSet(currentHeroSO.equippedSkillGroupIDs); - foreach (Transform child in contentParent) + if (currentHeroSO == null || contentParent == null) return; + + // Defensive: handle null equipped list + var equippedIds = currentHeroSO.equippedSkillGroupIDs ?? new int[0]; + var equipped = new System.Collections.Generic.HashSet(equippedIds); + + // Ensure layout is rebuilt so all instantiated children are available and their LayoutElements applied + UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(contentParent); + + // Get all slots under contentParent (including nested containers and inactive objects) + var slots = contentParent.GetComponentsInChildren(true); + if (slots == null || slots.Length == 0) return; + + foreach (var slot in slots) { - var slot = child.GetComponentInChildren(); - if (slot != null) - { - slot.isSelected = equipped.Contains(slot.skillCard_skillID); - slot.ApplyState(); - } + if (slot == null) continue; + slot.isSelected = equipped.Contains(slot.skillCard_skillID); + slot.ApplyState(); } } } diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs new file mode 100644 index 00000000..e88e773e --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs @@ -0,0 +1,184 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections.Generic; +using System.Linq; + +public class load_skill_detail_prefab_inHeroDetailPrefab : MonoBehaviour +{ + public static load_skill_detail_prefab_inHeroDetailPrefab Instance { get; private set; } + + [Header("Prefab / UI")] + public GameObject skillDetailPrefab; // prefab must have skill_detail_prefab_inHeroDetail component + public RectTransform contentParent; // container where skill detail prefabs will be instantiated (e.g., Scroll View Content) + + void Awake() + { + if (Instance == null) Instance = this; + else Destroy(gameObject); + } + + // Clear existing instantiated skill details + public void Clear() + { + if (contentParent == null) return; + for (int i = contentParent.childCount - 1; i >= 0; i--) + { + var c = contentParent.GetChild(i); +#if UNITY_EDITOR + if (!Application.isPlaying) DestroyImmediate(c.gameObject); + else Destroy(c.gameObject); +#else + Destroy(c.gameObject); +#endif + } + } + + // Load equipped skill details for a given hero SO id and instantiate skill detail prefabs + public void LoadSkillDetails(int heroId) + { + Debug.Log($"load_skill_detail_prefab_inHeroDetailPrefab.LoadSkillDetails called with heroId={heroId}"); + Clear(); + if (skillDetailPrefab == null) + { + Debug.LogWarning("load_skill_detail_prefab_inHeroDetailPrefab: skillDetailPrefab is not assigned in Inspector"); + return; + } + if (contentParent == null) + { + Debug.LogWarning("load_skill_detail_prefab_inHeroDetailPrefab: contentParent is not assigned in Inspector"); + return; + } + if (heroId <= 0) + { + Debug.LogWarning("load_skill_detail_prefab_inHeroDetailPrefab: invalid heroId"); + return; + } + + AllyHero_SO found = null; + try + { + var arr = Resources.LoadAll(""); + foreach (var a in arr) + { + if (a != null && a.ally_heroID == heroId) { found = a; break; } + } + } + catch (System.Exception ex) + { + Debug.LogError($"load_skill_detail_prefab_inHeroDetailPrefab: Resources.LoadAll threw: {ex}"); + } + + if (found == null) + { + Debug.LogWarning($"load_skill_detail_prefab_inHeroDetailPrefab: could not find AllyHero_SO for id={heroId}. Ensure the SO is in a Resources folder."); + return; + } + + // Get equipped skill group IDs (filter out 0) + var equippedIds = (found.equippedSkillGroupIDs ?? new int[0]).Where(id => id != 0).ToList(); + + // Get current level info + var levelInfo = found.GetEffectiveLevelForCurrentEXP(); + int currentMaxSlots = levelInfo?.skill_slot_limited ?? 0; + + // Get max slots from highest level + int maxSlotsOverall = 0; + if (found.levelStats != null && found.levelStats.Count > 0) + { + // Assume levelStats is sorted by requiredEXP ascending, so last is highest + maxSlotsOverall = found.levelStats[found.levelStats.Count - 1].skill_slot_limited; + } + + int created = 0; + for (int i = 0; i < maxSlotsOverall; i++) + { + if (i < equippedIds.Count) + { + // Instantiate equipped skill + int skillId = equippedIds[i]; + SkillGroup group = found.GetSkillGroupByID(skillId); + if (group == null) + { + Debug.LogWarning($"load_skill_detail_prefab_inHeroDetailPrefab: could not find SkillGroup for skillId={skillId} in heroId={heroId}"); + continue; + } + + var go = Instantiate(skillDetailPrefab, contentParent); + var detail = go.GetComponent(); + if (detail == null) + { + Debug.LogWarning("load_skill_detail_prefab_inHeroDetailPrefab: instantiated prefab missing skill_detail_prefab_inHeroDetail component"); + continue; + } + + // Populate fields for equipped skill + if (detail.skill_info_image != null) + { + detail.skill_info_image.sprite = group.groupIcon; + detail.skill_info_image.color = group.groupIcon != null ? new Color(1f, 1f, 1f, 1f) : new Color(1f, 1f, 1f, 0f); + } + if (detail.skill_info_name != null) + { + detail.skill_info_name.text = group.groupName ?? string.Empty; + } + if (detail.skill_info_description != null) + { + detail.skill_info_description.text = group.skillDescriptionsText ?? string.Empty; + } + + created++; + } + else + { + // Instantiate empty slot + var go = Instantiate(skillDetailPrefab, contentParent); + var detail = go.GetComponent(); + if (detail == null) + { + Debug.LogWarning("load_skill_detail_prefab_inHeroDetailPrefab: instantiated prefab missing skill_detail_prefab_inHeroDetail component"); + continue; + } + + // Populate fields for empty slot + if (i < currentMaxSlots) + { + // Available slot + if (detail.skill_info_image != null) + { + detail.skill_info_image.sprite = detail.skill_slot_available_image; + detail.skill_info_image.color = detail.skill_slot_available_image != null ? Color.white : new Color(1f, 1f, 1f, 0f); + } + if (detail.skill_info_name != null) + { + detail.skill_info_name.text = "ܲλ"; + } + if (detail.skill_info_description != null) + { + detail.skill_info_description.text = "ܲλУƼװһ"; + } + } + else + { + // Locked slot + if (detail.skill_info_image != null) + { + detail.skill_info_image.sprite = detail.skill_slot_locked_image; + detail.skill_info_image.color = detail.skill_slot_locked_image != null ? Color.white : new Color(1f, 1f, 1f, 0f); + } + if (detail.skill_info_name != null) + { + detail.skill_info_name.text = "ܲλ"; + } + if (detail.skill_info_description != null) + { + detail.skill_info_description.text = "Խ²λ"; + } + } + + created++; + } + } + + Debug.Log($"load_skill_detail_prefab_inHeroDetailPrefab: instantiated {created} skill detail prefabs for heroId={heroId}"); + } +} diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs.meta new file mode 100644 index 00000000..ecf3455d --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/load_skill_detail_prefab_inHeroDetailPrefab.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 218774c47fa995543b7b31421e3b9205 \ No newline at end of file diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/skillItem_prefab.prefab b/Assets/artworks/selectYourSongFirst/heroes_level_image/skillItem_prefab.prefab index 32e6c498..300b08cf 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/skillItem_prefab.prefab +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/skillItem_prefab.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1027150294156609432} - component: {fileID: 8451071590114106180} - component: {fileID: 7151068784241930387} + - component: {fileID: 223412468558196702} m_Layer: 0 m_Name: skillName m_TagString: Untagged @@ -35,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 120, y: 30} + m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8451071590114106180 CanvasRenderer: @@ -69,9 +70,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: cc180dff846d13a4d88ddaed6f77e5cd, type: 3} m_FontSize: 15 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 151 + m_BestFit: 1 + m_MinSize: 4 + m_MaxSize: 15 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -79,6 +80,20 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6280\u80FD\u540D\u79F0" +--- !u!114 &223412468558196702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981037611364859245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 --- !u!1 &4988234301424525429 GameObject: m_ObjectHideFlags: 0 @@ -111,13 +126,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1027150294156609432} - - {fileID: 3105447207061763408} m_Father: {fileID: 6728874159946636146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 120, y: 30} + m_AnchoredPosition: {x: 15, y: 0} + m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6783521660050107131 CanvasRenderer: @@ -230,6 +244,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8437657956846986280} + - {fileID: 3105447207061763408} - {fileID: 4688030792267625363} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -263,6 +279,81 @@ MonoBehaviour: isSelected: 0 heroId: 0 isReadOnly: 0 +--- !u!1 &7330218100932204269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8437657956846986280} + - component: {fileID: 3658629851583884412} + - component: {fileID: 994354326771089352} + m_Layer: 0 + m_Name: bottomShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8437657956846986280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7330218100932204269} + 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: 6728874159946636146} + 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: -39, y: -1} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3658629851583884412 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7330218100932204269} + m_CullTransparentMesh: 1 +--- !u!114 &994354326771089352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7330218100932204269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.4392157} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7891944755686443198 GameObject: m_ObjectHideFlags: 0 @@ -293,11 +384,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4688030792267625363} + m_Father: {fileID: 6728874159946636146} 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: -45, y: 0} + m_AnchoredPosition: {x: -40, y: 0} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5651005210691825991 @@ -321,14 +412,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6679245, g: 0.6679245, b: 0.6679245, a: 1} + m_Color: {r: 0.990566, g: 0.990566, b: 0.990566, 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_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs new file mode 100644 index 00000000..b6cf59ce --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using UnityEngine.UI; + +public class skill_detail_prefab_inHeroDetail : MonoBehaviour +{ + [Header("prefabInfos")] + public Image skill_info_image; + public Text skill_info_name; + public Text skill_info_description; + + [Header("defaultImages")] + public Sprite default_skill_image; + public Sprite skill_slot_available_image; + public Sprite skill_slot_unavailable_image; + public Sprite skill_slot_locked_image; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs.meta new file mode 100644 index 00000000..e0c56f4c --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8dd22ffc78dad03418ef9e3fff3a6d1f \ No newline at end of file diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab new file mode 100644 index 00000000..284eca58 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab @@ -0,0 +1,445 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &338916312725217567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8725241624818700542} + - component: {fileID: 4124427729845495542} + - component: {fileID: 6295515879753058719} + m_Layer: 0 + m_Name: skillInfoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8725241624818700542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338916312725217567} + 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: 7749999690041009414} + 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: 100.84909, y: -25.2972} + m_SizeDelta: {x: 1030.2424, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4124427729845495542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338916312725217567} + m_CullTransparentMesh: 1 +--- !u!114 &6295515879753058719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338916312725217567} + 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.9254902, g: 0.9254902, b: 0.9254902, 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: 775c674e81662c644b64550d2e8f74e0, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 48 + m_Alignment: 6 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5B54\u5609\u5F6C\u518D\u6B21\u66F4\u6539\u9700\u6C42\u65F6\uFF0C\u989D\u5916\u6478\u4E00\u5F20\u724C\u3002\n\u69FD\u4F4D\u7A7A\u95F2\u4E2D\u3002\u63A8\u8350\u60A8\u88C5\u914D\u4E00\u4E2A\u53EF\u7528\u6280\u80FD\u3002\n\u69FD\u4F4D\u5DF2\u9501\u5B9A\u3002\u5347\u7EA7\u4EE5\u89E3\u9501\u8BE5\u69FD\u4F4D\u3002" +--- !u!1 &467368590629320919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2102418086174114411} + - component: {fileID: 6787124985996953894} + - component: {fileID: 8866495854987004560} + m_Layer: 0 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2102418086174114411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 467368590629320919} + 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: 1097740655041088334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 175, y: 175} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6787124985996953894 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 467368590629320919} + m_CullTransparentMesh: 1 +--- !u!114 &8866495854987004560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 467368590629320919} + 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: c7c2fe3c72ded9244bf6b5506cc84f41, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4158255331876823296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3402633476703254850} + - component: {fileID: 8745787801725443741} + - component: {fileID: 6831060202394386689} + m_Layer: 0 + m_Name: skillName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3402633476703254850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158255331876823296} + 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: 7749999690041009414} + 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: -67.6337, y: 45} + m_SizeDelta: {x: 693.277, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8745787801725443741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158255331876823296} + m_CullTransparentMesh: 1 +--- !u!114 &6831060202394386689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158255331876823296} + 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.9245283, g: 0.9245283, b: 0.9245283, 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: dfa10de3e2846524089b5073175cd151, type: 3} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 48 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6280\u80FD\u540D / \u7A7A\u95F2\u69FD\u4F4D / \u9501\u5B9A\u69FD\u4F4D" +--- !u!1 &5512514823739788927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1227634720023912104} + - component: {fileID: 5125611924385008718} + - component: {fileID: 2580755516874286836} + m_Layer: 0 + m_Name: boarder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1227634720023912104 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5512514823739788927} + 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: 7749999690041009414} + 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: 84.8645, y: 0} + m_SizeDelta: {x: 1027.1226, y: 175} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5125611924385008718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5512514823739788927} + m_CullTransparentMesh: 1 +--- !u!114 &2580755516874286836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5512514823739788927} + 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: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5575579192340344948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7749999690041009414} + - component: {fileID: 788204036056720652} + m_Layer: 0 + m_Name: skill_detail_prefab_inHeroDetail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7749999690041009414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5575579192340344948} + 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: 1097740655041088334} + - {fileID: 3402633476703254850} + - {fileID: 8725241624818700542} + - {fileID: 1227634720023912104} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1255.5, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &788204036056720652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5575579192340344948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dd22ffc78dad03418ef9e3fff3a6d1f, type: 3} + m_Name: + m_EditorClassIdentifier: + skill_info_image: {fileID: 1986399476140300407} + skill_info_name: {fileID: 6831060202394386689} + skill_info_description: {fileID: 6295515879753058719} + default_skill_image: {fileID: 0} + skill_slot_available_image: {fileID: 21300000, guid: 66801968c2d91024b99fa9bd30c8d417, type: 3} + skill_slot_unavailable_image: {fileID: 21300000, guid: 9dd3414b0d3ab3c4688fd936bf5d179d, type: 3} + skill_slot_locked_image: {fileID: 21300000, guid: d6c1017e6bb4db647837c0b69e568f7a, type: 3} +--- !u!1 &6873625182721615882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1097740655041088334} + - component: {fileID: 3418678292816670251} + - component: {fileID: 1986399476140300407} + m_Layer: 0 + m_Name: skill_icno_Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1097740655041088334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873625182721615882} + 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: 2102418086174114411} + m_Father: {fileID: 7749999690041009414} + 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: -526.7, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3418678292816670251 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873625182721615882} + m_CullTransparentMesh: 1 +--- !u!114 &1986399476140300407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873625182721615882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab.meta b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab.meta new file mode 100644 index 00000000..50e122e6 --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/skill_detail_prefab_inHeroDetail.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d3fa0ef2bea3774e831fa12a9d7c7d1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/slotPrefab.prefab b/Assets/artworks/selectYourSongFirst/heroes_level_image/slotPrefab.prefab index d38eabf7..5c3bc543 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/slotPrefab.prefab +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/slotPrefab.prefab @@ -410,7 +410,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: -50, y: -21.63324} + m_AnchoredPosition: {x: -87.5, y: -345} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1481319262819956495 @@ -431,14 +431,14 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 40 + m_Spacing: -35 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_ReverseArrangement: 1 --- !u!1 &4429112831358588495 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_heroSlots.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_heroSlots.cs index d704aa71..5593731a 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_heroSlots.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_heroSlots.cs @@ -356,6 +356,12 @@ public class slots_heroSlots : MonoBehaviour, IDropHandler, IBeginDragHandler, I // if currentSelectedCharacterCard exists, keep unchanged // else ensure slots reflect team manager data by calling ResetTeamCharacter if selection exists } + + // Sync with newTeamSelector after swap + if (newTeamSelector.Instance != null) + { + newTeamSelector.Instance.UpdateAndSaveSelectedHeroes(); + } } public void SetSlot(int id, string name, Sprite sprite) @@ -445,6 +451,12 @@ public class slots_heroSlots : MonoBehaviour, IDropHandler, IBeginDragHandler, I skillSlot.isSelected = true; // Since equipped skillSlot.isReadOnly = true; // Set to read-only for display in hero slot skillSlot.ApplyState(); + + // Disable the bottom image for hero slot display + if (skillSlot.skillCard_bottomImage != null) + { + skillSlot.skillCard_bottomImage.gameObject.SetActive(false); + } } } } @@ -531,6 +543,12 @@ public class slots_heroSlots : MonoBehaviour, IDropHandler, IBeginDragHandler, I detailScript.characterSO = heroSO; } + // Load skill details using the new script + if (load_skill_detail_prefab_inHeroDetailPrefab.Instance != null) + { + load_skill_detail_prefab_inHeroDetailPrefab.Instance.LoadSkillDetails(heroSlot_heroID); + } + Debug.Log($"Displayed details for hero ID {heroSlot_heroID}"); } } diff --git a/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_skillSlots.cs b/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_skillSlots.cs index 074883b0..ffaaea90 100644 --- a/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_skillSlots.cs +++ b/Assets/artworks/selectYourSongFirst/heroes_level_image/slots_skillSlots.cs @@ -4,6 +4,7 @@ using UnityEngine.EventSystems; #if UNITY_EDITOR using UnityEditor; #endif +using System.Linq; public class slots_skillSlots : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler { @@ -73,6 +74,32 @@ public class slots_skillSlots : MonoBehaviour, IPointerClickHandler, IPointerEnt Debug.LogWarning($"slots_skillSlots.ToggleSelect: δҵ hero SO, heroId={heroId}"); } + // ǷѡҪѡδѡУ + if (!isSelected) + { + // ȡǰȼļܲλ + var levelInfo = so?.GetEffectiveLevelForCurrentEXP(); + int maxSlots = levelInfo?.skill_slot_limited ?? int.MaxValue; // δãĬ + int currentEquipped = so?.equippedSkillGroupIDs.Where(id => id != 0).Count() ?? 0; + + if (currentEquipped >= maxSlots) + { + Debug.LogWarning($"slots_skillSlots.ToggleSelect: ܲλ ({currentEquipped}/{maxSlots}), ޷ѡ"); + return; // л״̬ + } + + // ȡĵȼ + var skillGroup = so?.GetSkillGroupByID(skillCard_skillID); + int requiredLevel = skillGroup?.thisSkill_levelLimit ?? 1; + int currentLevel = levelInfo?.levelID ?? 0; + + if (currentLevel < requiredLevel) + { + Debug.LogWarning($"slots_skillSlots.ToggleSelect: ȼ ({currentLevel}/{requiredLevel}), ޷ѡ {skillCard_skillID}"); + return; // л״̬ + } + } + // л״̬ isSelected = !isSelected; ApplyState(); @@ -158,7 +185,33 @@ public class slots_skillSlots : MonoBehaviour, IPointerClickHandler, IPointerEnt string type = ""; string name = group.groupName ?? "δ֪"; - string status = ""; // Ը߼ж + + // 鼼ܿ + string status; + var levelInfo = hero.GetEffectiveLevelForCurrentEXP(); + int maxSlots = levelInfo?.skill_slot_limited ?? int.MaxValue; + int currentEquipped = hero.equippedSkillGroupIDs.Where(id => id != 0).Count(); + int requiredLevel = group.thisSkill_levelLimit; + int currentLevel = levelInfo?.levelID ?? 0; + + if (currentLevel < requiredLevel) + { + string levelName = GetLevelName(requiredLevel); + status = $"Ҫȼ{levelName}"; + } + else if (currentEquipped >= maxSlots) + { + status = "Ѵ"; + } + else if (isSelected) + { + status = "ѡ"; + } + else + { + status = "ܿ"; + } + string description = group.skillDescriptionsText ?? ""; loadDetailsPrefab.Instance.ShowDetails(type, name, status, description, Input.mousePosition); @@ -183,4 +236,17 @@ public class slots_skillSlots : MonoBehaviour, IPointerClickHandler, IPointerEnt } return null; } + + // levelIDȡȼ + private string GetLevelName(int levelID) + { + switch (levelID) + { + case 1: return "C"; + case 2: return "B"; + case 3: return "A"; + case 4: return "S"; + default: return "δ֪"; + } + } } diff --git a/Assets/artworks/selectYourSongFirst/idol_bottom.png b/Assets/artworks/selectYourSongFirst/idol_bottom.png new file mode 100644 index 00000000..3cbd3a4f Binary files /dev/null and b/Assets/artworks/selectYourSongFirst/idol_bottom.png differ diff --git a/Assets/artworks/selectYourSongFirst/idol_bottom.png.meta b/Assets/artworks/selectYourSongFirst/idol_bottom.png.meta new file mode 100644 index 00000000..afd4e56f --- /dev/null +++ b/Assets/artworks/selectYourSongFirst/idol_bottom.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 8136a262f526d9148bf2a0a168a62faa +TextureImporter: + internalIDToNameTable: + - first: + 213: 7908220503739782890 + second: "\u672A\u6807\u9898-2 (2)_0" + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + 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\u6807\u9898-2 (2)_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 580 + height: 290 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ae6deda06a4afbd60800000000000000 + internalID: 7908220503739782890 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + "\u672A\u6807\u9898-2 (2)_0": 7908220503739782890 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/Combat/SkillGroup.cs b/Assets/scripts/Combat/SkillGroup.cs index 95f0a0c8..00ccecff 100644 --- a/Assets/scripts/Combat/SkillGroup.cs +++ b/Assets/scripts/Combat/SkillGroup.cs @@ -29,6 +29,9 @@ public class SkillGroup [Tooltip("A multiline description for this skill group. Use this to store notes or an overview that can be shown at runtime.")] public string skillDescriptionsText = ""; + [Tooltip("This skill group requires the hero to reach at least this level (1-4) to be selectable.")] + public int thisSkill_levelLimit = 1; + // Backwards-compatible accessor that previously returned a per-skill description. // Now returns the single group-level text so callers can still obtain a description string. public string GetSkillDescription(int index) diff --git a/Assets/scripts/Data/AllyHero_SO.cs b/Assets/scripts/Data/AllyHero_SO.cs index 4c5d2dc8..8dc0c793 100644 --- a/Assets/scripts/Data/AllyHero_SO.cs +++ b/Assets/scripts/Data/AllyHero_SO.cs @@ -21,6 +21,8 @@ public class AllyHero_SO : ScriptableObject public Sprite ally_heroPoster; [Header("ɫͨ")] public Sprite ally_hero_HD_image; + [Header("ɫͷ")] + public Sprite ally_hero_squareProfile; [Header("ɫ")] public Color ally_heroThemeColor; @@ -46,7 +48,7 @@ public class AllyHero_SO : ScriptableObject [Tooltip("ֵ")] public int maxHP = 100; - [Tooltip("˺ (0..1), ڼ˺")] + [Tooltip("˺ (0-1), ڼ˺")] public float damageResistance = 0f; [Tooltip("ֵ")] @@ -59,7 +61,10 @@ public class AllyHero_SO : ScriptableObject [Tooltip("ȼ辭")] public int requiredEXP; - // --- ÿȼĹвڽ --- + [Header("ȼƽܲλ")] + [Tooltip("ȼƽܲλ")] + public int skill_slot_limited; + [Header("Note-hit shared parameters")] [Tooltip("Good жʱõķֵ")] public int manaGainGood = 1; diff --git a/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs b/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs new file mode 100644 index 00000000..17cdba92 --- /dev/null +++ b/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs @@ -0,0 +1,136 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections.Generic; + +public class load_teammatesProfile : MonoBehaviour +{ + [Header("ɫͷ")] + public Image teammate_profile_01; + public Image teammate_profile_02; + public Image teammate_profile_03; + public Image teammate_profile_04; + public Image teammate_profile_05; + + [Header("boarder")] + public Image teammate_profile_boarder_01; + public Image teammate_profile_boarder_02; + public Image teammate_profile_boarder_03; + public Image teammate_profile_boarder_04; + public Image teammate_profile_boarder_05; + + [Header("Level Colors")] + public Color levelColor_C; + public Color levelColor_B; + public Color levelColor_A; + public Color levelColor_S; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + update_teammates_profile(); + } + + public void update_teammates_profile() + { + // Load selected hero IDs from PlayerPrefs + int heroId1 = PlayerPrefs.GetInt("selected_heroSlot01_heroID", 0); + int heroId2 = PlayerPrefs.GetInt("selected_heroSlot02_heroID", 0); + int heroId3 = PlayerPrefs.GetInt("selected_heroSlot03_heroID", 0); + int heroId4 = PlayerPrefs.GetInt("selected_heroSlot04_heroID", 0); + int heroId5 = PlayerPrefs.GetInt("selected_heroSlot05_heroID", 0); + + // Set sprites for each profile image + teammate_profile_01.sprite = GetHeroSquareProfile(heroId1); + teammate_profile_02.sprite = GetHeroSquareProfile(heroId2); + teammate_profile_03.sprite = GetHeroSquareProfile(heroId3); + teammate_profile_04.sprite = GetHeroSquareProfile(heroId4); + teammate_profile_05.sprite = GetHeroSquareProfile(heroId5); + + // Set border colors based on hero level + teammate_profile_boarder_01.color = GetBorderColor(GetHeroLevel(heroId1)); + teammate_profile_boarder_02.color = GetBorderColor(GetHeroLevel(heroId2)); + teammate_profile_boarder_03.color = GetBorderColor(GetHeroLevel(heroId3)); + teammate_profile_boarder_04.color = GetBorderColor(GetHeroLevel(heroId4)); + teammate_profile_boarder_05.color = GetBorderColor(GetHeroLevel(heroId5)); + } + + private Sprite GetHeroSquareProfile(int heroId) + { + if (heroId == 0) return null; + + // Load all AllyHero_SO and find the one with matching ID + var allHeroes = Resources.LoadAll(""); + foreach (var hero in allHeroes) + { + if (hero != null && hero.ally_heroID == heroId) + { + return hero.ally_hero_squareProfile; + } + } + return null; // Not found + } + + private string GetHeroLevel(int heroId) + { + if (heroId == 0) return "C"; // default + + var allHeroes = Resources.LoadAll(""); + AllyHero_SO hero = null; + foreach (var h in allHeroes) + { + if (h != null && h.ally_heroID == heroId) + { + hero = h; + break; + } + } + if (hero == null) return "C"; + + return GetRatingFromSO(hero); + } + + private string GetRatingFromSO(AllyHero_SO so) + { + if (so == null || so.levelStats == null || so.levelStats.Count == 0) return "C"; + + // Build a sorted copy by requiredEXP ascending + List sorted = new List(); + foreach (var l in so.levelStats) if (l != null) sorted.Add(l); + sorted.Sort((a, b) => a.requiredEXP.CompareTo(b.requiredEXP)); + + int currentExp = so.ally_currentEXP; + int selectedIndex = 0; + for (int i = 0; i < sorted.Count; i++) + { + if (currentExp >= sorted[i].requiredEXP) + { + selectedIndex = i; + } + else + { + break; + } + } + + // Map indices to ratings: index 0 -> C, 1 -> B, 2 -> A, 3+ -> S + if (selectedIndex <= 0) return "C"; + if (selectedIndex == 1) return "B"; + if (selectedIndex == 2) return "A"; + return "S"; + } + + private Color GetBorderColor(string level) + { + Color color; + switch (level) + { + case "C": color = levelColor_C; break; + case "B": color = levelColor_B; break; + case "A": color = levelColor_A; break; + case "S": color = levelColor_S; break; + default: color = Color.white; break; + } + color.a = 1f; + return color; + } +} diff --git a/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs.meta b/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs.meta new file mode 100644 index 00000000..a10f55be --- /dev/null +++ b/Assets/scripts/selectYourSongFirst/load_teammatesProfile.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1764c09e2d730fd42b7a2d1f24161bfb \ No newline at end of file