diff --git a/Assets/GameMain/Animations.meta b/Assets/GameMain/Animations.meta new file mode 100644 index 0000000..21560ce --- /dev/null +++ b/Assets/GameMain/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f21133c63a69e9e44866acdb7c013554 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Animations/BlockWalk.anim b/Assets/GameMain/Animations/BlockWalk.anim new file mode 100644 index 0000000..47c27c3 --- /dev/null +++ b/Assets/GameMain/Animations/BlockWalk.anim @@ -0,0 +1,1197 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlockWalk + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + - serializedVersion: 3 + time: 0.1 + value: {x: 24.748737, y: 0, z: 0} + inSlope: {x: 194.37613, y: 0, z: 0} + outSlope: {x: 194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 35, y: 0, z: 0} + inSlope: {x: -0.000012015796, y: 0, z: 0} + outSlope: {x: -0.000012015796, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 24.748737, y: 0, z: 0} + inSlope: {x: -194.37613, y: 0, z: 0} + outSlope: {x: -194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: -24.748741, y: 0, z: 0} + inSlope: {x: -194.3761, y: 0, z: 0} + outSlope: {x: -194.3761, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6 + value: {x: -35, y: 0, z: 0} + inSlope: {x: 0.0000032780229, y: 0, z: 0} + outSlope: {x: 0.0000032780229, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: -24.748728, y: 0, z: 0} + inSlope: {x: 194.37619, y: 0, z: 0} + outSlope: {x: 194.37619, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + path: root/torso/arm-left + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + - serializedVersion: 3 + time: 0.1 + value: {x: -24.748737, y: 0, z: 0} + inSlope: {x: -194.37613, y: 0, z: 0} + outSlope: {x: -194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: -35, y: 0, z: 0} + inSlope: {x: 0.000012015796, y: 0, z: 0} + outSlope: {x: 0.000012015796, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: -24.748737, y: 0, z: 0} + inSlope: {x: 194.37613, y: 0, z: 0} + outSlope: {x: 194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 24.748741, y: 0, z: 0} + inSlope: {x: 194.3761, y: 0, z: 0} + outSlope: {x: 194.3761, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6 + value: {x: 35, y: 0, z: 0} + inSlope: {x: -0.0000032780229, y: 0, z: 0} + outSlope: {x: -0.0000032780229, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: 24.748728, y: 0, z: 0} + inSlope: {x: -194.37619, y: 0, z: 0} + outSlope: {x: -194.37619, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + path: root/torso/arm-right + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + - serializedVersion: 3 + time: 0.1 + value: {x: -24.748737, y: 0, z: 0} + inSlope: {x: -194.37613, y: 0, z: 0} + outSlope: {x: -194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: -35, y: 0, z: 0} + inSlope: {x: 0.000012015796, y: 0, z: 0} + outSlope: {x: 0.000012015796, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: -24.748737, y: 0, z: 0} + inSlope: {x: 194.37613, y: 0, z: 0} + outSlope: {x: 194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 24.748741, y: 0, z: 0} + inSlope: {x: 194.3761, y: 0, z: 0} + outSlope: {x: 194.3761, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6 + value: {x: 35, y: 0, z: 0} + inSlope: {x: -0.0000032780229, y: 0, z: 0} + outSlope: {x: -0.0000032780229, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: 24.748728, y: 0, z: 0} + inSlope: {x: -194.37619, y: 0, z: 0} + outSlope: {x: -194.37619, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + path: root/leg-left + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + - serializedVersion: 3 + time: 0.1 + value: {x: 24.748737, y: 0, z: 0} + inSlope: {x: 194.37613, y: 0, z: 0} + outSlope: {x: 194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 35, y: 0, z: 0} + inSlope: {x: -0.000012015796, y: 0, z: 0} + outSlope: {x: -0.000012015796, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 24.748737, y: 0, z: 0} + inSlope: {x: -194.37613, y: 0, z: 0} + outSlope: {x: -194.37613, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0, z: 0} + inSlope: {x: -274.88937, y: 0, z: 0} + outSlope: {x: -274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: -24.748741, y: 0, z: 0} + inSlope: {x: -194.3761, y: 0, z: 0} + outSlope: {x: -194.3761, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6 + value: {x: -35, y: 0, z: 0} + inSlope: {x: 0.0000032780229, y: 0, z: 0} + outSlope: {x: 0.0000032780229, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: -24.748728, y: 0, z: 0} + inSlope: {x: 194.37619, y: 0, z: 0} + outSlope: {x: 194.37619, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 274.88937, y: 0, z: 0} + outSlope: {x: 274.88937, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0, z: 0} + outWeight: {x: 0, y: 0, z: 0} + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + path: root/leg-right + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 2 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 474005655 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2578365886 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3348450511 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4240814580 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 24.748737 + inSlope: 194.37613 + outSlope: 194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 35 + inSlope: -0.000012015796 + outSlope: -0.000012015796 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 24.748737 + inSlope: -194.37613 + outSlope: -194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: -24.748741 + inSlope: -194.3761 + outSlope: -194.3761 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: -35 + inSlope: 0.0000032780229 + outSlope: 0.0000032780229 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: -24.748728 + inSlope: 194.37619 + outSlope: 194.37619 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: -24.748737 + inSlope: -194.37613 + outSlope: -194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: -35 + inSlope: 0.000012015796 + outSlope: 0.000012015796 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: -24.748737 + inSlope: 194.37613 + outSlope: 194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 24.748741 + inSlope: 194.3761 + outSlope: 194.3761 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: 35 + inSlope: -0.0000032780229 + outSlope: -0.0000032780229 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: 24.748728 + inSlope: -194.37619 + outSlope: -194.37619 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: -24.748737 + inSlope: -194.37613 + outSlope: -194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: -35 + inSlope: 0.000012015796 + outSlope: 0.000012015796 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: -24.748737 + inSlope: 194.37613 + outSlope: 194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 24.748741 + inSlope: 194.3761 + outSlope: 194.3761 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: 35 + inSlope: -0.0000032780229 + outSlope: -0.0000032780229 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: 24.748728 + inSlope: -194.37619 + outSlope: -194.37619 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 24.748737 + inSlope: 194.37613 + outSlope: 194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 35 + inSlope: -0.000012015796 + outSlope: -0.000012015796 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 24.748737 + inSlope: -194.37613 + outSlope: -194.37613 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: -274.88937 + outSlope: -274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: -24.748741 + inSlope: -194.3761 + outSlope: -194.3761 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: -35 + inSlope: 0.0000032780229 + outSlope: 0.0000032780229 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: -24.748728 + inSlope: 194.37619 + outSlope: 194.37619 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 274.88937 + outSlope: 274.88937 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 1 + m_PostInfinity: 1 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: root/torso/arm-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: root/torso/arm-right + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: root/leg-left + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: root/leg-right + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameMain/Animations/BlockWalk.anim.meta b/Assets/GameMain/Animations/BlockWalk.anim.meta new file mode 100644 index 0000000..a1d1d4c --- /dev/null +++ b/Assets/GameMain/Animations/BlockWalk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48b991333c789da4fa2efc2b7e8445b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Animations/BlockWalk.controller b/Assets/GameMain/Animations/BlockWalk.controller new file mode 100644 index 0000000..8979ea5 --- /dev/null +++ b/Assets/GameMain/Animations/BlockWalk.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5942117302223635929 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 48b991333c789da4fa2efc2b7e8445b8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlockWalk + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2140376133886906566} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2140376133886906566 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5942117302223635929} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5942117302223635929} diff --git a/Assets/GameMain/Animations/BlockWalk.controller.meta b/Assets/GameMain/Animations/BlockWalk.controller.meta new file mode 100644 index 0000000..3f1ccb8 --- /dev/null +++ b/Assets/GameMain/Animations/BlockWalk.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3ce815497995f24fa20acc7f9383e55 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Configs/ResourceCollection.xml b/Assets/GameMain/Configs/ResourceCollection.xml index 464dfe8..80d1856 100644 --- a/Assets/GameMain/Configs/ResourceCollection.xml +++ b/Assets/GameMain/Configs/ResourceCollection.xml @@ -2,6 +2,7 @@ + @@ -11,6 +12,7 @@ + @@ -31,15 +33,20 @@ + + + + + @@ -57,6 +64,7 @@ + @@ -66,16 +74,24 @@ + + + + + + + + @@ -88,19 +104,23 @@ + + + + @@ -108,18 +128,25 @@ + + + + + + + @@ -133,7 +160,9 @@ + + diff --git a/Assets/GameMain/DataTables/tbglobalconfig.bytes b/Assets/GameMain/DataTables/tbglobalconfig.bytes index d245a7e..3b36df5 100644 Binary files a/Assets/GameMain/DataTables/tbglobalconfig.bytes and b/Assets/GameMain/DataTables/tbglobalconfig.bytes differ diff --git a/Assets/GameMain/DataTables/tbglobalconfig.json b/Assets/GameMain/DataTables/tbglobalconfig.json index cbdf399..5184bcf 100644 --- a/Assets/GameMain/DataTables/tbglobalconfig.json +++ b/Assets/GameMain/DataTables/tbglobalconfig.json @@ -32,7 +32,7 @@ "damageTextYOffset": 1100, "entityAsyncTimeout": 30000, "critMultiplier": 1.5, - "enemyBodyRadius": 450, + "enemyBodyRadius": 0.45, "enemySeparationIterations": 2 } ] \ No newline at end of file diff --git a/Assets/GameMain/DataTables/tblevelexperienceconfig.bytes b/Assets/GameMain/DataTables/tblevelexperienceconfig.bytes index ee9bcf5..86df1f8 100644 --- a/Assets/GameMain/DataTables/tblevelexperienceconfig.bytes +++ b/Assets/GameMain/DataTables/tblevelexperienceconfig.bytes @@ -1 +1,2 @@ - 全能者dny€…€’€¡€±€Ã€Ö€ì���:�Y�|�¢�Ë�ù‚,‚d‚¡‚äƒ.ƒƒÙ„;„¨……¢†2†Ñ‡ˆ?‰‰ûŠúŒ�HŽœ�‘®“s•d—ˆ™âœyŸR¢t¥æ©°­Û²q·|½ ÀC#ÀIÚÀQ=ÀY\ÀbLÀl Àvðè€�人dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^  \ No newline at end of file + + 全能者dny€…€’€¡€±€Ã€Ö€ì���:�Y�|�¢�Ë�ù‚,‚d‚¡‚äƒ.ƒƒÙ„;„¨……¢†2†Ñ‡ˆ?‰‰ûŠúŒ�HŽœ�‘®“s•d—ˆ™âœyŸR¢t¥æ©°­Û²q·|½ ÀC#ÀIÚÀQ=ÀY\ÀbLÀl Àvðè€�人dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 游侠dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 守å�«dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 猎手dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 学者dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^  拾è�’者dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 斗士dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^  机械师dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^ 医师dp}€Œ€�€°€Å€Ý€ø��7�\�†�´�é‚#‚e‚¯ƒƒ]ƒÅ„8„º…K…‡pˆT‰TŠs‹´�Ž®�q’j” —™ßœú t¤Y¨¶­˜³¹2À@ÀG¿ÀP[ÀYÿÀdÌÀpäÀ~pÀ�œÀž›À±£ÀÆôÀÞÔÀù‘Á„Á9Á^  \ No newline at end of file diff --git a/Assets/GameMain/DataTables/tblevelexperienceconfig.json b/Assets/GameMain/DataTables/tblevelexperienceconfig.json index 0640088..e93f678 100644 --- a/Assets/GameMain/DataTables/tblevelexperienceconfig.json +++ b/Assets/GameMain/DataTables/tblevelexperienceconfig.json @@ -126,5 +126,517 @@ "Lv58": 71556, "Lv59": 80143, "Lv60": 89760 + }, + { + "key": "游侠", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "守å�«", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "猎手", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "学者", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "拾è�’者", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "斗士", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "机械师", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 + }, + { + "key": "医师", + "Lv0": 100, + "Lv1": 112, + "Lv2": 125, + "Lv3": 140, + "Lv4": 157, + "Lv5": 176, + "Lv6": 197, + "Lv7": 221, + "Lv8": 248, + "Lv9": 277, + "Lv10": 311, + "Lv11": 348, + "Lv12": 390, + "Lv13": 436, + "Lv14": 489, + "Lv15": 547, + "Lv16": 613, + "Lv17": 687, + "Lv18": 769, + "Lv19": 861, + "Lv20": 965, + "Lv21": 1080, + "Lv22": 1210, + "Lv23": 1355, + "Lv24": 1518, + "Lv25": 1700, + "Lv26": 1904, + "Lv27": 2132, + "Lv28": 2388, + "Lv29": 2675, + "Lv30": 2996, + "Lv31": 3356, + "Lv32": 3758, + "Lv33": 4209, + "Lv34": 4714, + "Lv35": 5280, + "Lv36": 5914, + "Lv37": 6623, + "Lv38": 7418, + "Lv39": 8308, + "Lv40": 9305, + "Lv41": 10422, + "Lv42": 11672, + "Lv43": 13073, + "Lv44": 14642, + "Lv45": 16399, + "Lv46": 18367, + "Lv47": 20571, + "Lv48": 23039, + "Lv49": 25804, + "Lv50": 28900, + "Lv51": 32368, + "Lv52": 36252, + "Lv53": 40603, + "Lv54": 45475, + "Lv55": 50932, + "Lv56": 57044, + "Lv57": 63889, + "Lv58": 71556, + "Lv59": 80143, + "Lv60": 89760 } ] \ No newline at end of file diff --git a/Assets/GameMain/DataTables/tbroleconfig.bytes b/Assets/GameMain/DataTables/tbroleconfig.bytes index 14cdde0..f01fa08 100644 Binary files a/Assets/GameMain/DataTables/tbroleconfig.bytes and b/Assets/GameMain/DataTables/tbroleconfig.bytes differ diff --git a/Assets/GameMain/DataTables/tbroleconfig.json b/Assets/GameMain/DataTables/tbroleconfig.json index acc56b3..12271ff 100644 --- a/Assets/GameMain/DataTables/tbroleconfig.json +++ b/Assets/GameMain/DataTables/tbroleconfig.json @@ -17,7 +17,7 @@ } ], "initialItems": [], - "prefab": "Player", + "texture": "Role101", "sprite": "全能者" }, { @@ -27,7 +27,135 @@ "coin": 5, "statModifierConfigs": [], "initialItems": [], - "prefab": "Player", + "texture": "Role102", "sprite": "è€�人" + }, + { + "name": "游侠", + "maxHealth": 100, + "speed": 6.2, + "coin": 9, + "statModifierConfigs": [ + { + "statType": 14, + "value": 0.08, + "modifierType": 200 + } + ], + "initialItems": [], + "texture": "Role103", + "sprite": "游侠" + }, + { + "name": "守å�«", + "maxHealth": 110, + "speed": 5.8, + "coin": 8, + "statModifierConfigs": [ + { + "statType": 1, + "value": 0.08, + "modifierType": 200 + } + ], + "initialItems": [], + "texture": "Role104", + "sprite": "守å�«" + }, + { + "name": "猎手", + "maxHealth": 100, + "speed": 6, + "coin": 9, + "statModifierConfigs": [ + { + "statType": 11, + "value": 0.5, + "modifierType": 100 + } + ], + "initialItems": [], + "texture": "Role105", + "sprite": "猎手" + }, + { + "name": "学者", + "maxHealth": 95, + "speed": 6, + "coin": 11, + "statModifierConfigs": [ + { + "statType": 16, + "value": 1, + "modifierType": 100 + } + ], + "initialItems": [], + "texture": "Role106", + "sprite": "学者" + }, + { + "name": "拾è�’者", + "maxHealth": 100, + "speed": 6, + "coin": 12, + "statModifierConfigs": [ + { + "statType": 15, + "value": 1, + "modifierType": 100 + } + ], + "initialItems": [], + "texture": "Role107", + "sprite": "拾è�’者" + }, + { + "name": "斗士", + "maxHealth": 105, + "speed": 5.8, + "coin": 8, + "statModifierConfigs": [ + { + "statType": 4, + "value": 0.05, + "modifierType": 200 + } + ], + "initialItems": [], + "texture": "Role108", + "sprite": "斗士" + }, + { + "name": "机械师", + "maxHealth": 100, + "speed": 5.9, + "coin": 10, + "statModifierConfigs": [ + { + "statType": 8, + "value": 0.05, + "modifierType": 200 + } + ], + "initialItems": [], + "texture": "Role109", + "sprite": "机械师" + }, + { + "name": "医师", + "maxHealth": 105, + "speed": 5.9, + "coin": 9, + "statModifierConfigs": [ + { + "statType": 2, + "value": 1, + "modifierType": 100 + } + ], + "initialItems": [], + "texture": "Role110", + "sprite": "医师" } ] \ No newline at end of file diff --git a/Assets/GameMain/DataTables/tbspriteconfig.bytes b/Assets/GameMain/DataTables/tbspriteconfig.bytes index ff8a7b1..23fd145 100644 Binary files a/Assets/GameMain/DataTables/tbspriteconfig.bytes and b/Assets/GameMain/DataTables/tbspriteconfig.bytes differ diff --git a/Assets/GameMain/DataTables/tbspriteconfig.json b/Assets/GameMain/DataTables/tbspriteconfig.json index d24a980..6b78927 100644 --- a/Assets/GameMain/DataTables/tbspriteconfig.json +++ b/Assets/GameMain/DataTables/tbspriteconfig.json @@ -134,6 +134,136 @@ "atlasPath": "Item.png", "spriteIndex": 1201 }, + { + "key": "游侠", + "atlasPath": "Item.png", + "spriteIndex": 1202 + }, + { + "key": "守å�«", + "atlasPath": "Item.png", + "spriteIndex": 1203 + }, + { + "key": "猎手", + "atlasPath": "Item.png", + "spriteIndex": 1204 + }, + { + "key": "学者", + "atlasPath": "Item.png", + "spriteIndex": 1205 + }, + { + "key": "拾è�’者", + "atlasPath": "Item.png", + "spriteIndex": 1206 + }, + { + "key": "斗士", + "atlasPath": "Item.png", + "spriteIndex": 1207 + }, + { + "key": "机械师", + "atlasPath": "Item.png", + "spriteIndex": 1208 + }, + { + "key": "医师", + "atlasPath": "Item.png", + "spriteIndex": 1209 + }, + { + "key": "Role101", + "atlasPath": "Mesh/Role101.png", + "spriteIndex": -1 + }, + { + "key": "Role102", + "atlasPath": "Mesh/Role102.png", + "spriteIndex": -1 + }, + { + "key": "Role103", + "atlasPath": "Mesh/Role103.png", + "spriteIndex": -1 + }, + { + "key": "Role104", + "atlasPath": "Mesh/Role104.png", + "spriteIndex": -1 + }, + { + "key": "Role105", + "atlasPath": "Mesh/Role105.png", + "spriteIndex": -1 + }, + { + "key": "Role106", + "atlasPath": "Mesh/Role106.png", + "spriteIndex": -1 + }, + { + "key": "Role107", + "atlasPath": "Mesh/Role107.png", + "spriteIndex": -1 + }, + { + "key": "Role108", + "atlasPath": "Mesh/Role108.png", + "spriteIndex": -1 + }, + { + "key": "Role109", + "atlasPath": "Mesh/Role109.png", + "spriteIndex": -1 + }, + { + "key": "Role110", + "atlasPath": "Mesh/Role110.png", + "spriteIndex": -1 + }, + { + "key": "Role111", + "atlasPath": "Mesh/Role111.png", + "spriteIndex": -1 + }, + { + "key": "Role112", + "atlasPath": "Mesh/Role112.png", + "spriteIndex": -1 + }, + { + "key": "Role113", + "atlasPath": "Mesh/Role113.png", + "spriteIndex": -1 + }, + { + "key": "Role114", + "atlasPath": "Mesh/Role114.png", + "spriteIndex": -1 + }, + { + "key": "Role115", + "atlasPath": "Mesh/Role115.png", + "spriteIndex": -1 + }, + { + "key": "Role116", + "atlasPath": "Mesh/Role116.png", + "spriteIndex": -1 + }, + { + "key": "Role117", + "atlasPath": "Mesh/Role117.png", + "spriteIndex": -1 + }, + { + "key": "Role118", + "atlasPath": "Mesh/Role118.png", + "spriteIndex": -1 + }, { "key": "肌肉", "atlasPath": "Item.png", diff --git a/Assets/GameMain/Entities/Player.prefab b/Assets/GameMain/Entities/Player.prefab index 25b64a3..641614a 100644 --- a/Assets/GameMain/Entities/Player.prefab +++ b/Assets/GameMain/Entities/Player.prefab @@ -24,13 +24,115 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 50638171685441296} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.72, y: 1.5, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &108802346359919410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3624736759206987910} + - component: {fileID: 1165113262612185514} + m_Layer: 7 + m_Name: Backpack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3624736759206987910 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108802346359919410} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7645808286821957614} + - {fileID: 5661072248332867436} + - {fileID: 8046822235215098476} + - {fileID: 4149661712638700245} + - {fileID: 5429551983429523606} + - {fileID: 2395797268595685132} + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1165113262612185514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108802346359919410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2980af28a40c84247a688f6b684dd4c3, type: 3} + m_Name: + m_EditorClassIdentifier: + _weaponSlots: + - {fileID: 7645808286821957614} + - {fileID: 5661072248332867436} + - {fileID: 8046822235215098476} + - {fileID: 4149661712638700245} + - {fileID: 5429551983429523606} + - {fileID: 2395797268595685132} +--- !u!1 &522579759168298097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1317907895540233254} + - component: {fileID: 973455679661965003} + m_Layer: 7 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1317907895540233254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522579759168298097} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &973455679661965003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522579759168298097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f754cc5f339dcfa4aaec3aa32260c4b8, type: 3} + m_Name: + m_EditorClassIdentifier: + _direction: {x: 0, y: 0, z: 0} --- !u!1 &526023732862709228 GameObject: m_ObjectHideFlags: 0 @@ -55,12 +157,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526023732862709228} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.72, y: 1.5, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &886755583121495434 GameObject: @@ -86,13 +188,102 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 886755583121495434} serializedVersion: 2 - 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: 1.5, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1885222791838039712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2341097226739322379} + - component: {fileID: 4141447124081657317} + m_Layer: 7 + m_Name: Absorb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2341097226739322379 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885222791838039712} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4141447124081657317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885222791838039712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46f46350fed64d8389ebb4ae72b65796, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3768818133864751084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7597864336377014678} + - component: {fileID: 2998088147214679119} + m_Layer: 7 + m_Name: Skin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7597864336377014678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3768818133864751084} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2157991835625772996} + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2998088147214679119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3768818133864751084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f3d7be5910a4a0499f0a5cf0f870e96, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5243258899397488202 GameObject: m_ObjectHideFlags: 0 @@ -117,13 +308,57 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5243258899397488202} serializedVersion: 2 - 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: 1.5, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5401036452770183881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 362979970816567916} + - component: {fileID: 4236936027031693245} + m_Layer: 7 + m_Name: Health + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &362979970816567916 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5401036452770183881} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4236936027031693245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5401036452770183881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce4964a40efccaa4fb22df63713b567b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6372140121958224629 GameObject: m_ObjectHideFlags: 0 @@ -148,12 +383,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6372140121958224629} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6961884676133552519 GameObject: @@ -179,14 +414,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6961884676133552519} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8294607788038773239} + m_Father: {fileID: 3624736759206987910} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7236974499178575928 +--- !u!1 &7971981207778321820 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -194,35 +429,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8294607788038773239} + - component: {fileID: 7219179554550639176} + - component: {fileID: 1901028000331987341} m_Layer: 7 - m_Name: WeaponSlots + m_Name: Movement m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8294607788038773239 +--- !u!4 &7219179554550639176 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7236974499178575928} + m_GameObject: {fileID: 7971981207778321820} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7645808286821957614} - - {fileID: 5661072248332867436} - - {fileID: 8046822235215098476} - - {fileID: 4149661712638700245} - - {fileID: 5429551983429523606} - - {fileID: 2395797268595685132} + m_Children: [] m_Father: {fileID: 9112716898534404901} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1901028000331987341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7971981207778321820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9366dc6d1e945058db4c74cb557ae41, type: 3} + m_Name: + m_EditorClassIdentifier: + _model: {fileID: 7597864336377014678} + _animator: {fileID: 7481041446745649686} + _turnSpeed: 720 --- !u!1 &8198962528757305497 GameObject: m_ObjectHideFlags: 0 @@ -232,16 +477,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9112716898534404901} - - component: {fileID: 6822287017757374257} - - component: {fileID: 4750262518011961108} - component: {fileID: 5589126412102302619} - component: {fileID: 2658714253019925332} - - component: {fileID: 8169181699668835961} - - component: {fileID: 5456587199021485293} - - component: {fileID: 582203051508165858} - - component: {fileID: 4988822728923805024} - - component: {fileID: 4321355627424240428} - - component: {fileID: 7894423710682551789} + - component: {fileID: 7957014610582915568} m_Layer: 7 m_Name: Player m_TagString: Player @@ -262,59 +500,15 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8294607788038773239} + - {fileID: 7597864336377014678} + - {fileID: 1317907895540233254} + - {fileID: 7219179554550639176} + - {fileID: 362979970816567916} + - {fileID: 3624736759206987910} + - {fileID: 2341097226739322379} + - {fileID: 7049885701700373672} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6822287017757374257 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4750262518011961108 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c4f37184fcb9306428d7d002f7dca96d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!54 &5589126412102302619 Rigidbody: m_ObjectHideFlags: 0 @@ -362,10 +556,10 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 - m_Height: 2 + m_Height: 2.7 m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &8169181699668835961 + m_Center: {x: 0, y: 1.35, z: 0} +--- !u!114 &7957014610582915568 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -374,88 +568,172 @@ MonoBehaviour: m_GameObject: {fileID: 8198962528757305497} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f754cc5f339dcfa4aaec3aa32260c4b8, type: 3} + m_Script: {fileID: 11500000, guid: fb474f3f35451124b830a5d5cf7b367c, type: 3} m_Name: m_EditorClassIdentifier: - _direction: {x: 0, y: 0, z: 0} ---- !u!114 &5456587199021485293 + _entries: + - _key: Input + _target: {fileID: 522579759168298097} + - _key: Movement + _target: {fileID: 7971981207778321820} + - _key: Skin + _target: {fileID: 3768818133864751084} + - _key: Health + _target: {fileID: 5401036452770183881} + - _key: Backpack + _target: {fileID: 108802346359919410} + - _key: Absorb + _target: {fileID: 1885222791838039712} + - _key: Stat + _target: {fileID: 8297549161097438435} + - _key: WeaponSlots + _target: {fileID: 0} +--- !u!1 &8297549161097438435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7049885701700373672} + - component: {fileID: 8348675923546620038} + m_Layer: 7 + m_Name: Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7049885701700373672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8297549161097438435} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9112716898534404901} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8348675923546620038 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9baf591df06b9bb44ba5313457ba84b3, type: 3} - m_Name: - m_EditorClassIdentifier: - _isMoving: 0 - _direction: {x: 0, y: 0, z: 0} - _cachedTransform: {fileID: 0} - _avoidEnemyOverlap: 0 - _enemyBodyRadius: 0.45 - _separationIterations: 2 - _speedBase: 0 ---- !u!114 &582203051508165858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} + m_GameObject: {fileID: 8297549161097438435} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5befb68803e86e248873416ce662184b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4988822728923805024 -MonoBehaviour: +--- !u!1001 &1907278124724760623 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7597864336377014678} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + propertyPath: m_Name + value: character-a + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7481041446745649686} + m_SourcePrefab: {fileID: 100100000, guid: 10a73280edc68574f8d713a2ea8d19c3, type: 3} +--- !u!1 &1637457074224532862 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + m_PrefabInstance: {fileID: 1907278124724760623} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7481041446745649686 +Animator: + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} + m_GameObject: {fileID: 1637457074224532862} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce4964a40efccaa4fb22df63713b567b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4321355627424240428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c3ce815497995f24fa20acc7f9383e55, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &2157991835625772996 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 10a73280edc68574f8d713a2ea8d19c3, + type: 3} + m_PrefabInstance: {fileID: 1907278124724760623} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2980af28a40c84247a688f6b684dd4c3, type: 3} - m_Name: - m_EditorClassIdentifier: - _weaponSlots: - - {fileID: 7645808286821957614} - - {fileID: 5661072248332867436} - - {fileID: 8046822235215098476} - - {fileID: 4149661712638700245} - - {fileID: 5429551983429523606} - - {fileID: 2395797268595685132} ---- !u!114 &7894423710682551789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8198962528757305497} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 46f46350fed64d8389ebb4ae72b65796, type: 3} - m_Name: - m_EditorClassIdentifier: - _absorbRangeBase: 3 - _absorbSpeed: 8 - _collectDistance: 0.35 - _maxDetectCount: 64 - _detectLayerMask: - serializedVersion: 2 - m_Bits: 8192 diff --git a/Assets/GameMain/Fonts/ShopPurchaseText.mat b/Assets/GameMain/Materials/MainTMPFont Normal.mat similarity index 99% rename from Assets/GameMain/Fonts/ShopPurchaseText.mat rename to Assets/GameMain/Materials/MainTMPFont Normal.mat index f073396..98e7746 100644 --- a/Assets/GameMain/Fonts/ShopPurchaseText.mat +++ b/Assets/GameMain/Materials/MainTMPFont Normal.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShopPurchaseText + m_Name: MainTMPFont Normal m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/GameMain/Fonts/ShopPurchaseText.mat.meta b/Assets/GameMain/Materials/MainTMPFont Normal.mat.meta similarity index 100% rename from Assets/GameMain/Fonts/ShopPurchaseText.mat.meta rename to Assets/GameMain/Materials/MainTMPFont Normal.mat.meta diff --git a/Assets/GameMain/Meshes.meta b/Assets/GameMain/Meshes.meta new file mode 100644 index 0000000..a78fcc1 --- /dev/null +++ b/Assets/GameMain/Meshes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d42e28a8c7c110479b4d206914792ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Meshes/character.fbx b/Assets/GameMain/Meshes/character.fbx new file mode 100644 index 0000000..68602db Binary files /dev/null and b/Assets/GameMain/Meshes/character.fbx differ diff --git a/Assets/GameMain/Meshes/character.fbx.meta b/Assets/GameMain/Meshes/character.fbx.meta new file mode 100644 index 0000000..efe58b8 --- /dev/null +++ b/Assets/GameMain/Meshes/character.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 10a73280edc68574f8d713a2ea8d19c3 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs new file mode 100644 index 0000000..b4f69bb --- /dev/null +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs @@ -0,0 +1,31 @@ +using GameFramework; +using GameFramework.Event; + +namespace SepCore.Event +{ + public class ItemTooltipCombineEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(ItemTooltipCombineEventArgs).GetHashCode(); + + public override int Id => EventId; + + public int Index; + + public ItemTooltipCombineEventArgs() + { + Index = -1; + } + + public static ItemTooltipCombineEventArgs Create(int index) + { + var args = ReferencePool.Acquire(); + args.Index = index; + return args; + } + + public override void Clear() + { + Index = -1; + } + } +} diff --git a/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs.meta new file mode 100644 index 0000000..f32bca4 --- /dev/null +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipCombineEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06cccd1f29419fe4c866ffda3aea61af +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Base/Gen/GlobalConfig.cs b/Assets/GameMain/Scripts/Base/Gen/GlobalConfig.cs index ebed467..3991df9 100644 --- a/Assets/GameMain/Scripts/Base/Gen/GlobalConfig.cs +++ b/Assets/GameMain/Scripts/Base/Gen/GlobalConfig.cs @@ -50,7 +50,7 @@ public sealed partial class GlobalConfig : Luban.BeanBase DamageTextYOffset = _buf.ReadInt(); EntityAsyncTimeout = _buf.ReadInt(); CritMultiplier = _buf.ReadFloat(); - EnemyBodyRadius = _buf.ReadInt(); + EnemyBodyRadius = _buf.ReadFloat(); EnemySeparationIterations = _buf.ReadInt(); } @@ -192,7 +192,7 @@ public sealed partial class GlobalConfig : Luban.BeanBase /// /// 敌人碰撞å�Šå¾„ /// - public readonly int EnemyBodyRadius; + public readonly float EnemyBodyRadius; /// /// 敌人分离迭代次数 /// diff --git a/Assets/GameMain/Scripts/Base/Gen/LevelExperienceConfig.cs b/Assets/GameMain/Scripts/Base/Gen/LevelExperienceConfig.cs index f587c7b..2e6d2a7 100644 --- a/Assets/GameMain/Scripts/Base/Gen/LevelExperienceConfig.cs +++ b/Assets/GameMain/Scripts/Base/Gen/LevelExperienceConfig.cs @@ -17,6 +17,7 @@ public sealed partial class LevelExperienceConfig : Luban.BeanBase public LevelExperienceConfig(ByteBuf _buf) { Key = _buf.ReadString(); + Key_Ref = null; Lv0 = _buf.ReadInt(); Lv1 = _buf.ReadInt(); Lv2 = _buf.ReadInt(); @@ -89,6 +90,7 @@ public sealed partial class LevelExperienceConfig : Luban.BeanBase /// 角色å�� /// public readonly string Key; + public RoleConfig Key_Ref; public readonly int Lv0; public readonly int Lv1; public readonly int Lv2; @@ -156,7 +158,7 @@ public sealed partial class LevelExperienceConfig : Luban.BeanBase public void ResolveRef(Tables tables) { - + Key_Ref = tables.TbRoleConfig.GetOrDefault(Key); diff --git a/Assets/GameMain/Scripts/Base/Gen/RoleConfig.cs b/Assets/GameMain/Scripts/Base/Gen/RoleConfig.cs index 9bd501d..0bbe7a5 100644 --- a/Assets/GameMain/Scripts/Base/Gen/RoleConfig.cs +++ b/Assets/GameMain/Scripts/Base/Gen/RoleConfig.cs @@ -22,8 +22,8 @@ public sealed partial class RoleConfig : Luban.BeanBase Coin = _buf.ReadInt(); {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);StatModifierConfigs = new System.Collections.Generic.List(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { StatModifierConfig _e0; _e0 = StatModifierConfig.DeserializeStatModifierConfig(_buf); StatModifierConfigs.Add(_e0);}} {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);InitialItems = new System.Collections.Generic.List(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { int _e0; _e0 = _buf.ReadInt(); InitialItems.Add(_e0);}} - Prefab = _buf.ReadString(); - Prefab_Ref = null; + Texture = _buf.ReadString(); + Texture_Ref = null; Sprite = _buf.ReadString(); Sprite_Ref = null; } @@ -42,8 +42,8 @@ public sealed partial class RoleConfig : Luban.BeanBase /// public readonly System.Collections.Generic.List StatModifierConfigs; public readonly System.Collections.Generic.List InitialItems; - public readonly string Prefab; - public EntityConfig Prefab_Ref; + public readonly string Texture; + public SpriteConfig Texture_Ref; public readonly string Sprite; public SpriteConfig Sprite_Ref; @@ -58,7 +58,7 @@ public sealed partial class RoleConfig : Luban.BeanBase foreach (var _e in StatModifierConfigs) { _e?.ResolveRef(tables); } - Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab); + Texture_Ref = tables.TbSpriteConfig.GetOrDefault(Texture); Sprite_Ref = tables.TbSpriteConfig.GetOrDefault(Sprite); } @@ -71,7 +71,7 @@ public sealed partial class RoleConfig : Luban.BeanBase + "coin:" + Coin + "," + "statModifierConfigs:" + Luban.StringUtil.CollectionToString(StatModifierConfigs) + "," + "initialItems:" + Luban.StringUtil.CollectionToString(InitialItems) + "," - + "prefab:" + Prefab + "," + + "texture:" + Texture + "," + "sprite:" + Sprite + "," + "}"; } diff --git a/Assets/GameMain/Scripts/Base/Gen/TbGlobalConfig.cs b/Assets/GameMain/Scripts/Base/Gen/TbGlobalConfig.cs index c84b401..d37d5ea 100644 --- a/Assets/GameMain/Scripts/Base/Gen/TbGlobalConfig.cs +++ b/Assets/GameMain/Scripts/Base/Gen/TbGlobalConfig.cs @@ -161,7 +161,7 @@ public partial class TbGlobalConfig /// /// 敌人碰撞å�Šå¾„ /// - public int EnemyBodyRadius => _data.EnemyBodyRadius; + public float EnemyBodyRadius => _data.EnemyBodyRadius; /// /// 敌人分离迭代次数 /// diff --git a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs index b2cb1f3..bbc138f 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs @@ -27,6 +27,7 @@ namespace SepCore.UI View.infoText.text = _context.Description; View.textFormatText.Set(_context.Price); View.recycleButton.gameObject.SetActive(_context.ShowRecycleButton); + View.combineButton.gameObject.SetActive(_context.ShowCombineButton); View.iconArea.SetRarity(_context.Rarity); ResizeToFitContent(); @@ -54,6 +55,14 @@ namespace SepCore.UI } } + public void OnCombineButtonClick() + { + if (_context != null) + { + GameEntry.Event.Fire(this, ItemTooltipCombineEventArgs.Create(_context.Index)); + } + } + public void OnCancelButtonClick() { GameEntry.Event.Fire(this, ItemTooltipHideEventArgs.Create()); @@ -68,6 +77,7 @@ namespace SepCore.UI _listenersBound = true; View.recycleButton.onClick.AddListener(OnRecycleButtonClick); + View.combineButton.onClick.AddListener(OnCombineButtonClick); View.cancelButton.onClick.AddListener(OnCancelButtonClick); } @@ -83,7 +93,12 @@ namespace SepCore.UI descriptionSize.y = View.infoText.preferredHeight; View.infoText.rectTransform.sizeDelta = descriptionSize; float descriptionHeight = Mathf.Max(0f, View.infoText.preferredHeight); - float targetHeight = _fixedTopHeight + descriptionHeight + _fixedBottomHeight; + float bottomHeight = _fixedBottomHeight; + if (_context != null && _context.ShowCombineButton) + { + bottomHeight += 100f; + } + float targetHeight = _fixedTopHeight + descriptionHeight + bottomHeight; Vector2 size = new Vector2(_fixedWidth, targetHeight); View.contentRectTransform.sizeDelta = size; diff --git a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipView.cs b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipView.cs index 0dd8303..29ac040 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipView.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipView.cs @@ -12,6 +12,7 @@ namespace SepCore.UI [SerializeField] public global::TMPro.TextMeshProUGUI typeText; [SerializeField] public global::TMPro.TextMeshProUGUI infoText; [SerializeField] public global::SepCore.UI.CommonButton recycleButton; + [SerializeField] public global::SepCore.UI.CommonButton combineButton; [SerializeField] public global::SepCore.UI.FormatTextUI textFormatText; [SerializeField] public global::SepCore.UI.CommonButton cancelButton; } diff --git a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipContext.cs b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipContext.cs index 8cb6216..c56a3ab 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipContext.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipContext.cs @@ -15,6 +15,7 @@ namespace SepCore.UI public string Description; public int Price; public bool ShowRecycleButton; + public bool ShowCombineButton; public ItemBasicTooltipContext() { @@ -27,6 +28,7 @@ namespace SepCore.UI Description = string.Empty; Price = 0; ShowRecycleButton = false; + ShowCombineButton = false; } public ItemBasicTooltipContext(ItemTooltipRawData rawData) : this() @@ -41,6 +43,7 @@ namespace SepCore.UI Rarity = rawData.Rarity; Price = rawData.Price; ShowRecycleButton = rawData.OnRecycle != null; + ShowCombineButton = rawData.CanCombine; if (ItemType == ItemType.Weapon && rawData.WeaponData != null) { diff --git a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipController.cs b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipController.cs index 877d278..7aa6ae5 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipController.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipController.cs @@ -12,6 +12,7 @@ namespace SepCore.UI protected override UIFormType UIFormType => UIFormType.ItemTooltipForm; private Action _onRecycle; + private Action _onCombine; private bool _subscribed = false; @@ -19,7 +20,9 @@ namespace SepCore.UI { if (_subscribed) return; GameEntry.Event.Subscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle); + GameEntry.Event.Subscribe(ItemTooltipCombineEventArgs.EventId, ItemTooltipCombine); GameEntry.Event.Subscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); + GameEntry.Event.Subscribe(DisplayItemLockEventArgs.EventId, DisplayItemLock); _subscribed = true; } @@ -27,7 +30,9 @@ namespace SepCore.UI { if (!_subscribed) return; GameEntry.Event.Unsubscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle); + GameEntry.Event.Unsubscribe(ItemTooltipCombineEventArgs.EventId, ItemTooltipCombine); GameEntry.Event.Unsubscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); + GameEntry.Event.Unsubscribe(DisplayItemLockEventArgs.EventId, DisplayItemLock); _subscribed = false; } @@ -75,12 +80,14 @@ namespace SepCore.UI } _onRecycle = rawData.OnRecycle; + _onCombine = rawData.OnCombine; await OpenFormAsync(context, timeout); } public override async UniTask CloseUIAsync(object userData = null, float timeout = 30f) { _onRecycle = null; + _onCombine = null; await base.CloseUIAsync(userData, timeout); } @@ -94,6 +101,19 @@ namespace SepCore.UI #region Event Handlers + private void DisplayItemLock(object sender, GameEventArgs e) + { + if (e is not DisplayItemLockEventArgs) + { + return; + } + + if (Form != null && Form.Visible) + { + Form.SetMaskEnabled(true); + } + } + private void ItemTooltipRecycle(object sender, GameEventArgs e) { if (e is not ItemTooltipRecycleEventArgs args) @@ -104,6 +124,16 @@ namespace SepCore.UI _onRecycle?.Invoke(args.Index, args.Price); } + private void ItemTooltipCombine(object sender, GameEventArgs e) + { + if (e is not ItemTooltipCombineEventArgs args) + { + return; + } + + _onCombine?.Invoke(args.Index); + } + private void ItemTooltipHide(object sender, GameEventArgs e) { if (e is not ItemTooltipHideEventArgs args) return; diff --git a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs index f85076b..958ff30 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs @@ -1,4 +1,5 @@ using UnityEngine; +using SepCore.Event; using UnityGameFramework.Runtime; namespace SepCore.UI @@ -14,10 +15,16 @@ namespace SepCore.UI private ItemTooltipContext _context; private Vector3 _targetPos; + public void SetMaskEnabled(bool enabled) + { + View.maskImage.enabled = enabled; + } + public void RefreshUI(ItemTooltipContext context) { _context = context; _targetPos = ConvertWorldToAnchored(_context.TargetPos); + View.maskImage.enabled = false; foreach (RarityPanel panel in _rarityPanels) { @@ -54,6 +61,7 @@ namespace SepCore.UI protected override void OnClose(bool isShutdown, object userData) { + View.maskImage.enabled = false; _context = null; base.OnClose(isShutdown, userData); } diff --git a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipView.cs b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipView.cs index 78b38ce..5520785 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipView.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipView.cs @@ -7,6 +7,7 @@ namespace SepCore.UI public partial class ItemTooltipView : MonoBehaviour { [SerializeField] public global::UnityEngine.RectTransform contentRectTransform; + [SerializeField] public global::UnityEngine.UI.Image maskImage; [SerializeField] public global::SepCore.UI.ItemBasicTooltipForm basicForm; [SerializeField] public global::SepCore.UI.ItemDetailTooltipForm detailForm; } diff --git a/Assets/GameMain/Scripts/Presentation/Shop/ShopController.cs b/Assets/GameMain/Scripts/Presentation/Shop/ShopController.cs index caac7ea..e66460f 100644 --- a/Assets/GameMain/Scripts/Presentation/Shop/ShopController.cs +++ b/Assets/GameMain/Scripts/Presentation/Shop/ShopController.cs @@ -30,6 +30,7 @@ namespace SepCore.UI GameEntry.Event.Subscribe(DisplayItemHoverEventArgs.EventId, DisplayItemHover); GameEntry.Event.Subscribe(DisplayItemLockEventArgs.EventId, DisplayItemLock); GameEntry.Event.Subscribe(DisplayItemHideEventArgs.EventId, DisplayItemHide); + GameEntry.Event.Subscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); GameEntry.Event.Subscribe(PlayerCoinChangeEventArgs.EventId, PlayerCoinChange); GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormComplete); } @@ -42,6 +43,7 @@ namespace SepCore.UI GameEntry.Event.Unsubscribe(DisplayItemHoverEventArgs.EventId, DisplayItemHover); GameEntry.Event.Unsubscribe(DisplayItemLockEventArgs.EventId, DisplayItemLock); GameEntry.Event.Unsubscribe(DisplayItemHideEventArgs.EventId, DisplayItemHide); + GameEntry.Event.Unsubscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); GameEntry.Event.Unsubscribe(PlayerCoinChangeEventArgs.EventId, PlayerCoinChange); GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormComplete); } @@ -184,6 +186,7 @@ namespace SepCore.UI return false; } + bool canCombine = _useCase.CanCombineWeapon(index, out _, out _); rawData = new ItemTooltipRawData { TargetPos = targetPos, @@ -193,6 +196,8 @@ namespace SepCore.UI ItemType = ItemType.Weapon, Price = _useCase.CalculateRecyclePrice(weapon.WeaponData.Price), OnRecycle = RecycleWeapon, + CanCombine = canCombine, + OnCombine = CombineWeapon, LastWaveDamage = weapon.WeaponData.LastWaveDamage, CurrentTagCounts = GetEquippedTagCounts(), }; @@ -272,13 +277,40 @@ namespace SepCore.UI return; } - int currentCount = Mathf.Max(0, Context.WeaponListContext.CurrentCount - 1); - Context.WeaponListContext.CurrentCount = currentCount; - + Context.WeaponListContext = BuildDisplayListContext(DisplayListAreaType.Weapon, _rawData.WeaponItems, _rawData.WeaponMaxCount); Context.NeedRefreshWeaponList = true; Context.StatContext = BuildStatContext(_useCase.CreateStatRawData()); Context.NeedRefreshStat = true; RefreshUI(Form, Context); + _tooltipLocked = false; + GameEntry.UIRouter.CloseUIAsync(UIFormType.ItemTooltipForm).Forget(); + } + + private void CombineWeapon(int index) + { + OnCombineWeaponAsync(index).Forget(); + } + + private async UniTaskVoid OnCombineWeaponAsync(int index) + { + if (_useCase == null || Context == null) + { + Log.Error("ShopController.OnCombineWeaponAsync() controller state is invalid."); + return; + } + + bool success = await _useCase.TryCombineWeaponAsync(index); + if (!success) + { + return; + } + + Context.WeaponListContext = BuildDisplayListContext(DisplayListAreaType.Weapon, _rawData.WeaponItems, _rawData.WeaponMaxCount); + Context.NeedRefreshWeaponList = true; + Context.StatContext = BuildStatContext(_useCase.CreateStatRawData()); + Context.NeedRefreshStat = true; + RefreshUI(Form, Context); + _tooltipLocked = false; GameEntry.UIRouter.CloseUIAsync(UIFormType.ItemTooltipForm).Forget(); } @@ -394,6 +426,13 @@ namespace SepCore.UI RefreshUI(Form, Context); } + private void ItemTooltipHide(object sender, GameEventArgs e) + { + if (e is not ItemTooltipHideEventArgs) return; + + _tooltipLocked = false; + } + private void OpenUIFormComplete(object sender, GameEventArgs e) { if (e is not OpenUIFormSuccessEventArgs ne) return; diff --git a/Assets/GameMain/Scripts/Procedure/DebugPanel/RuntimeDebugPanelComponent.cs b/Assets/GameMain/Scripts/Procedure/DebugPanel/RuntimeDebugPanelComponent.cs index f6d2137..3ffbd00 100644 --- a/Assets/GameMain/Scripts/Procedure/DebugPanel/RuntimeDebugPanelComponent.cs +++ b/Assets/GameMain/Scripts/Procedure/DebugPanel/RuntimeDebugPanelComponent.cs @@ -23,6 +23,7 @@ namespace SepCore.DebugPanel private const float CornerTapWindow = 0.6f; private const int RequiredCornerTapCount = 3; private const int DebugHealAmount = 200; + private const string PlayerHealthChildKey = "Health"; [Header("Window Content")] [SerializeField] private bool _showBuffSection = true; @@ -235,7 +236,7 @@ namespace SepCore.DebugPanel GUILayout.Label("Battle Debug"); ProcedureGame procedure = GameEntry.Procedure.CurrentProcedure as ProcedureGame; Player player = FindPlayer(); - HealthComponent playerHealth = player != null ? player.GetComponent() : null; + HealthComponent playerHealth = GetPlayerHealth(player); if (procedure == null) { @@ -440,12 +441,39 @@ namespace SepCore.DebugPanel Player player = FindPlayer(); if (player == null) return; - HealthComponent playerHealth = player.GetComponent(); + HealthComponent playerHealth = GetPlayerHealth(player); + if (playerHealth == null) return; + RestorePlayerHealthToMax(playerHealth); } + private static HealthComponent GetPlayerHealth(Player player) + { + if (player == null) + { + return null; + } + + ChildrenMap childrenMap = player.GetComponent(); + if (childrenMap != null) + { + GameObject healthObject = childrenMap.Get(PlayerHealthChildKey); + if (healthObject != null) + { + HealthComponent healthComponent = healthObject.GetComponent(); + if (healthComponent != null) + { + return healthComponent; + } + } + } + + return player.GetComponent(); + } + private static void AddPlayerHealth(HealthComponent playerHealth, int amount) { + if (playerHealth == null) return; if (amount <= 0) return; if (playerHealth.CurrentHealth <= 0) return; @@ -461,6 +489,7 @@ namespace SepCore.DebugPanel private static void RestorePlayerHealthToMax(HealthComponent playerHealth) { + if (playerHealth == null) return; if (playerHealth.CurrentHealth <= 0) return; int maxHealth = playerHealth.MaxHealth; @@ -472,6 +501,7 @@ namespace SepCore.DebugPanel private static void PublishPlayerHealthChanged(HealthComponent playerHealth) { + if (playerHealth == null) return; GameEntry.Event.Fire(null, PlayerHealthChangeEventArgs.Create(0, playerHealth.CurrentHealth, playerHealth.MaxHealth)); } diff --git a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs index 6e5b6e1..3415552 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using Cysharp.Threading.Tasks; using SepCore.Definition; using SepCore.Entity; @@ -24,6 +25,7 @@ namespace SepCore.Procedure public override bool UseNativeDialog => false; private PlayerData _currentPlayerData; + private CancellationTokenSource _entryCancellation; public int CurrentLevel = 1; private GameStateType _currentGameState = GameStateType.None; @@ -89,7 +91,8 @@ namespace SepCore.Procedure CurrentLevel = 1; _currentPlayerData = new PlayerData(-1); - EnterAsync(procedureOwner).Forget(); + _entryCancellation = new CancellationTokenSource(); + EnterAsync(procedureOwner, _entryCancellation.Token).Forget(); } protected override void OnUpdate(IFsm procedureOwner, float elapseSeconds, @@ -101,6 +104,9 @@ namespace SepCore.Procedure protected override void OnLeave(IFsm procedureOwner, bool isShutdown) { + _entryCancellation.Cancel(); + _entryCancellation.Dispose(); + if (_gameStates != null) { foreach (var state in _gameStates.Values) @@ -109,8 +115,11 @@ namespace SepCore.Procedure } _gameStates.Clear(); + _gameStates = null; } + _currentGameState = GameStateType.None; + GameEntry.UIRouter.CloseUIAsync(UIFormType.HudForm).Forget(); GameEntry.CameraModule?.SetTarget(null); @@ -122,21 +131,34 @@ namespace SepCore.Procedure #endregion - private async UniTaskVoid EnterAsync(IFsm procedureOwner) + private async UniTaskVoid EnterAsync(IFsm procedureOwner, + CancellationToken cancellationToken) { try { - Player = await GameEntry.Entity.ShowPlayerAsync(_currentPlayerData); + Player player = await GameEntry.Entity.ShowPlayerAsync(_currentPlayerData); + if (cancellationToken.IsCancellationRequested) + { + GameEntry.Entity.HideEntity(player); + return; + } + + Player = player; GameEntry.CameraModule?.SetTarget(Player != null ? Player.CachedTransform : null); await GameEntry.UIRouter.OpenUIAsync(UIFormType.HudForm); + cancellationToken.ThrowIfCancellationRequested(); string selectedRoleName = procedureOwner.GetData("SelectedRoleName").Value; var role = GameEntry.Luban.Get(selectedRoleName); var expConfig = GameEntry.Luban.Get(selectedRoleName); - Player.InitRole(role, expConfig); + await player.InitRoleAsync(role, expConfig, cancellationToken); + cancellationToken.ThrowIfCancellationRequested(); InitGameState(); } + catch (OperationCanceledException) + { + } catch (Exception exception) { Log.Error("ProcedureGame.EnterAsync() failed with exception '{0}'.", exception); diff --git a/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs index 99fe984..2331224 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using SepCore.Battle; +using SepCore.CustomUtility; using SepCore.Definition; using SepCore.Entity; using UnityEngine; @@ -49,7 +50,7 @@ namespace SepCore.Components _weapons = new List(WeaponCapacity); _props = new List(); - _statComponent = GetComponent(); + _statComponent = player.StatComponent; _synergyManager.Initialize(); } @@ -76,12 +77,64 @@ namespace SepCore.Components if (result) { GameEntry.Entity.DetachEntity(weapon.Id, _player.Id); + RealignWeaponSlots(); _synergyManager.RefreshSynergies(_weapons, _statComponent.Pipeline); } return result; } + public void RealignWeaponSlots() + { + if (_weaponSlots == null || _player == null) return; + + for (int i = 0; i < _weapons.Count; i++) + { + if (i < _weaponSlots.Length && _weapons[i] != null) + { + GameEntry.Entity.AttachEntity(_weapons[i].Id, _player.Id, _weaponSlots[i]); + } + } + } + + public bool CanCombineWeapon(int index, out int matchIndex, out WeaponConfig nextTierConfig) + { + matchIndex = -1; + nextTierConfig = null; + + if (_weapons == null || index < 0 || index >= _weapons.Count) + { + return false; + } + + WeaponBase target = _weapons[index]; + if (target?.WeaponData == null) + { + return false; + } + + if (!WeaponUtility.TryGetNextTierConfig(target.WeaponData.Config, out nextTierConfig)) + { + return false; + } + + for (int i = 0; i < _weapons.Count; i++) + { + if (i == index) continue; + WeaponBase other = _weapons[i]; + if (other?.WeaponData == null) continue; + + if (other.WeaponData.WeaponType == target.WeaponData.WeaponType && + other.WeaponData.Rarity == target.WeaponData.Rarity) + { + matchIndex = i; + return true; + } + } + + return false; + } + public bool AttachProp(PropItem prop) { _props.Add(prop); diff --git a/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs b/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs new file mode 100644 index 0000000..c457798 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityGameFramework.Runtime; + +namespace SepCore.Components +{ + [DisallowMultipleComponent] + public class ChildrenMap : MonoBehaviour + { + [Serializable] + public class Entry + { + [SerializeField] private string _key = string.Empty; + [SerializeField] private GameObject _target = null; + + public string Key => _key; + public GameObject Target => _target; + + public Entry() + { + } + + public Entry(string key, GameObject target) + { + _key = key; + _target = target; + } + } + + [SerializeField] private List _entries = new List(); + + private Dictionary _map; + + private void Awake() + { + InitMap(); + } + + public GameObject Get(string key) + { + if (_map == null) + { + InitMap(); + } + + if (string.IsNullOrEmpty(key)) + { + Log.Error("[ChildrenMap] Key is null or empty when getting child on '{0}'.", gameObject.name); + return null; + } + + if (!_map.TryGetValue(key, out GameObject target)) + { + Log.Error("[ChildrenMap] Key '{0}' not found on '{1}'.", key, gameObject.name); + return null; + } + + if (target == null) + { + Log.Error("[ChildrenMap] Target GameObject for key '{0}' is null on '{1}'.", key, gameObject.name); + return null; + } + + return target; + } + + private void InitMap() + { + if (_map != null) + { + return; + } + + _map = new Dictionary(_entries.Count); + for (int i = 0; i < _entries.Count; i++) + { + Entry entry = _entries[i]; + if (entry == null) + { + continue; + } + + if (string.IsNullOrEmpty(entry.Key)) + { + Log.Error("[ChildrenMap] Key is null or empty on '{0}'.", gameObject.name); + continue; + } + + if (_map.ContainsKey(entry.Key)) + { + Log.Error("[ChildrenMap] Duplicate key '{0}' on '{1}'.", entry.Key, gameObject.name); + continue; + } + + _map.Add(entry.Key, entry.Target); + } + } + +#if UNITY_EDITOR + private void OnValidate() + { + if (_entries == null) + { + return; + } + + var seenKeys = new HashSet(); + for (int i = 0; i < _entries.Count; i++) + { + Entry entry = _entries[i]; + if (entry == null || string.IsNullOrEmpty(entry.Key)) + { + continue; + } + + if (!seenKeys.Add(entry.Key)) + { + Debug.LogWarning($"[ChildrenMap] Duplicate key '{entry.Key}' detected on '{gameObject.name}'.", this); + } + } + } +#endif + } +} diff --git a/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs.meta new file mode 100644 index 0000000..0c03d59 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/ChildrenMap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fb474f3f35451124b830a5d5cf7b367c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs index 1cc7b55..b7f2fcc 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs @@ -37,16 +37,9 @@ namespace SepCore.Components _cachedTransform = target; _direction = Vector3.forward; _avoidEnemyOverlap = avoidEnemyOverlap; - float defaultRadius = GameEntry.Luban != null && GameEntry.Luban.IsReady - ? GameEntry.Luban.Global.EnemyBodyRadius / 1000f - : 0.5f; - int defaultIterations = GameEntry.Luban != null && GameEntry.Luban.IsReady - ? GameEntry.Luban.Global.EnemySeparationIterations - : 4; - - _enemyBodyRadius = Mathf.Max(0.01f, enemyBodyRadius ?? defaultRadius); - _separationIterations = Mathf.Max(1, separationIterations ?? defaultIterations); - + _enemyBodyRadius = GameEntry.Luban.Global.EnemyBodyRadius; + _separationIterations = GameEntry.Luban.Global.EnemySeparationIterations; + TryGetComponent(out _player); TryGetComponent(out _enemy); diff --git a/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs new file mode 100644 index 0000000..18d66eb --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs @@ -0,0 +1,111 @@ +using SepCore.Definition; +using UnityEngine; + +namespace SepCore.Components +{ + public class PlayerMovementComponent : MonoBehaviour + { + private static readonly int WalkStateHash = Animator.StringToHash("Base Layer.Walk"); + + [SerializeField] private Transform _model = null; + [SerializeField] private Animator _animator = null; + [SerializeField] private float _turnSpeed = 720f; + + private Transform _target; + private StatComponent _statComponent; + private Vector3 _direction; + private Quaternion _initialModelRotation = Quaternion.identity; + private bool _canMove; + private bool _isWalking; + + public float Speed => _statComponent.GetStatValue(StatType.MoveSpeed); + public Vector3 Direction => _direction; + public bool IsMoving => _isWalking; + + public void OnInit(float speed, Transform target, StatComponent statComponent) + { + _target = target; + _statComponent = statComponent; + _statComponent.Pipeline.SetBaseValue(StatType.MoveSpeed, speed); + _initialModelRotation = _model.localRotation; + _direction = Vector3.zero; + _canMove = false; + _isWalking = false; + _animator.applyRootMotion = false; + _animator.Rebind(); + ResetWalkPose(); + } + + public void SetMove(bool canMove) + { + _canMove = canMove; + if (!canMove) + { + _direction = Vector3.zero; + SetWalking(false); + } + } + + public void SetDirection(Vector3 direction) + { + direction.y = 0f; + _direction = Vector3.ClampMagnitude(direction, 1f); + } + + public void OnUpdate(float elapseSeconds, float realElapseSeconds) + { + if (!_canMove || elapseSeconds <= 0f) + { + return; + } + + float speed = Speed; + bool walking = speed > 0f && _direction.sqrMagnitude > Mathf.Epsilon; + SetWalking(walking); + if (!walking) + { + return; + } + + _target.position += _direction * (speed * elapseSeconds); + Quaternion rotation = Quaternion.LookRotation(_direction, Vector3.up); + _model.rotation = Quaternion.RotateTowards(_model.rotation, rotation, _turnSpeed * elapseSeconds); + } + + public void OnReset() + { + _canMove = false; + _isWalking = false; + _direction = Vector3.zero; + _target = null; + _statComponent = null; + _model.localRotation = _initialModelRotation; + ResetWalkPose(); + } + + private void SetWalking(bool walking) + { + if (_isWalking == walking) + { + return; + } + + _isWalking = walking; + if (walking) + { + _animator.speed = 1f; + } + else + { + ResetWalkPose(); + } + } + + private void ResetWalkPose() + { + _animator.speed = 0f; + _animator.Play(WalkStateHash, 0, 0f); + _animator.Update(0f); + } + } +} diff --git a/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs.meta new file mode 100644 index 0000000..9a2915d --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/PlayerMovementComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9366dc6d1e945058db4c74cb557ae41 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs new file mode 100644 index 0000000..0bf1711 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs @@ -0,0 +1,128 @@ +using System; +using System.Threading; +using Cysharp.Threading.Tasks; +using SepCore.AsyncTask; +using SepCore.CustomUtility; +using SepCore.Definition; +using UnityEngine; +using UnityGameFramework.Runtime; + +namespace SepCore.Components +{ + public class SkinComponent : MonoBehaviour + { + private static readonly int BaseMapPropertyId = Shader.PropertyToID("_BaseMap"); + + private MeshRenderer[] _renderers; + private Material _instanceMaterial; + private Texture2D _loadedTexture; + private int _generation; + + public async UniTask OnInitAsync(RoleConfig role, CancellationToken cancellationToken = default) + { + int generation = ++_generation; + + EnsureRenderersAndMaterial(); + SetRenderersVisible(false); + _instanceMaterial.SetTexture(BaseMapPropertyId, null); + ReleaseLoadedTexture(); + + cancellationToken.ThrowIfCancellationRequested(); + + string textureAssetName = AssetUtility.GetSpriteAsset(role.Texture_Ref.AtlasPath); + Texture2D texture; + try + { + texture = await GameEntry.Resource.LoadAssetAsync(textureAssetName); + } + catch (Exception exception) when (!(exception is OperationCanceledException)) + { + Log.Error("SkinComponent.OnInitAsync: Failed to load skin texture '{0}'. {1}", textureAssetName, + exception.Message); + throw; + } + + if (generation != _generation || cancellationToken.IsCancellationRequested) + { + GameEntry.Resource.UnloadAsset(texture); + throw new OperationCanceledException(cancellationToken); + } + + _loadedTexture = texture; + _instanceMaterial.SetTexture(BaseMapPropertyId, _loadedTexture); + SetRenderersVisible(true); + } + + public void OnReset() + { + _generation++; + + if (_renderers != null) + { + SetRenderersVisible(false); + } + + if (_instanceMaterial != null) + { + _instanceMaterial.SetTexture(BaseMapPropertyId, null); + } + + ReleaseLoadedTexture(); + } + + private void OnDestroy() + { + OnReset(); + + if (_instanceMaterial == null) + { + return; + } + + if (Application.isPlaying) + { + Destroy(_instanceMaterial); + } + else + { + DestroyImmediate(_instanceMaterial); + } + + _instanceMaterial = null; + } + + private void EnsureRenderersAndMaterial() + { + if (_renderers != null) + { + return; + } + + _renderers = GetComponentsInChildren(true); + _instanceMaterial = new Material(_renderers[0].sharedMaterial); + for (int i = 0; i < _renderers.Length; i++) + { + _renderers[i].sharedMaterial = _instanceMaterial; + } + } + + private void SetRenderersVisible(bool visible) + { + for (int i = 0; i < _renderers.Length; i++) + { + _renderers[i].enabled = visible; + } + } + + private void ReleaseLoadedTexture() + { + if (_loadedTexture == null) + { + return; + } + + GameEntry.Resource.UnloadAsset(_loadedTexture); + _loadedTexture = null; + } + } +} diff --git a/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs.meta b/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs.meta new file mode 100644 index 0000000..0fb76a4 --- /dev/null +++ b/Assets/GameMain/Scripts/Runtime/Components/SkinComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f3d7be5910a4a0499f0a5cf0f870e96 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Runtime/EntityLogic/Player.cs index a214da1..9da2289 100644 --- a/Assets/GameMain/Scripts/Runtime/EntityLogic/Player.cs +++ b/Assets/GameMain/Scripts/Runtime/EntityLogic/Player.cs @@ -7,6 +7,7 @@ using SepCore.Definition; using SepCore.Entity; using SepCore.CustomUtility; using SepCore.AsyncTask; +using UnityGameFramework.Runtime; namespace SepCore.Entity { @@ -15,10 +16,11 @@ namespace SepCore.Entity protected override TargetableObjectData _targetableObjectData => _playerData; private InputComponent _inputComponent; - private MovementComponent _movementComponent; + private PlayerMovementComponent _movementComponent; private AbsorbComponent _absorbComponent; private StatComponent _statComponent; private BackpackComponent _backpackComponent; + private SkinComponent _skinComponent; private PlayerData _playerData; /// @@ -135,6 +137,47 @@ namespace SepCore.Entity return true; } + public bool CanCombineWeapon(int index, out int matchIndex, out WeaponConfig nextTierConfig) + { + return _backpackComponent.CanCombineWeapon(index, out matchIndex, out nextTierConfig); + } + + public async UniTask CombineWeaponsAsync(WeaponBase weaponA, WeaponBase weaponB, WeaponConfig nextTierConfig, float? timeout = null) + { + if (weaponA == null || weaponB == null || nextTierConfig == null) + { + return null; + } + + using (_statComponent.Pipeline.BeginBatchUpdate()) + { + _backpackComponent.DetachWeapon(weaponA); + GameEntry.Entity.HideEntity(weaponA); + + _backpackComponent.DetachWeapon(weaponB); + GameEntry.Entity.HideEntity(weaponB); + + int id = GameEntry.Entity.NextId(); + var weaponData = EntityDataFactory.Create(id, nextTierConfig, Id, CampType.Player); + + float actualTimeout = timeout ?? (GameEntry.Luban.Global.EntityAsyncTimeout / 1000f); + WeaponBase newWeapon = await GameEntry.Entity.ShowWeaponAsync(weaponData, actualTimeout); + if (newWeapon == null) + { + Log.Error("Player.CombineWeaponsAsync: Failed to show new weapon {0}.", nextTierConfig.Id); + return null; + } + + if (!_backpackComponent.AttachWeapon(newWeapon)) + { + GameEntry.Entity.HideEntity(newWeapon); + return null; + } + + return newWeapon; + } + } + public bool Enable { get => _enable; @@ -156,11 +199,13 @@ namespace SepCore.Entity _backpackComponent.SetWeaponState(_enable && _weaponEnabled); } - public void InitRole(RoleConfig role, LevelExperienceConfig expConfig) + public async UniTask InitRoleAsync(RoleConfig role, LevelExperienceConfig expConfig, + CancellationToken cancellationToken = default) { - // MovementComponent + await _skinComponent.OnInitAsync(role, cancellationToken); + + // PlayerMovementComponent _movementComponent.OnInit(role.Speed, this.CachedTransform, _statComponent); - _movementComponent.SetMove(true); // HealthComponent _healthComponent.OnInit(role.MaxHealth, _statComponent); @@ -168,7 +213,6 @@ namespace SepCore.Entity // BackpackComponent Coin = role.Coin; _backpackComponent.OnInit(this); - AddWeaponAsync(EntityDataFactory.Create(GameEntry.Entity.NextId(), WeaponType.Knife, Id, _playerData.Camp)).Forget(); // StatComponent foreach (var modifier in role.StatModifierConfigs) @@ -178,6 +222,8 @@ namespace SepCore.Entity _expRequires = expConfig.ToTargetLevelArray(); + await AddWeaponAsync(EntityDataFactory.Create(GameEntry.Entity.NextId(), WeaponType.Knife, Id, _playerData.Camp)); + // Fire Events GameEntry.Event.Fire(this, PlayerHealthChangeEventArgs.Create(0, _healthComponent.CurrentHealth, _healthComponent.MaxHealth)); @@ -198,11 +244,14 @@ namespace SepCore.Entity { base.OnInit(userData); - _inputComponent = GetComponent(); - _movementComponent = GetComponent(); - _absorbComponent = GetComponent(); - _statComponent = GetComponent(); - _backpackComponent = GetComponent(); + ChildrenMap childrenMap = GetComponent(); + _inputComponent = childrenMap.Get("Input").GetComponent(); + _movementComponent = childrenMap.Get("Movement").GetComponent(); + _healthComponent = childrenMap.Get("Health").GetComponent(); + _absorbComponent = childrenMap.Get("Absorb").GetComponent(); + _statComponent = childrenMap.Get("Stat").GetComponent(); + _backpackComponent = childrenMap.Get("Backpack").GetComponent(); + _skinComponent = childrenMap.Get("Skin").GetComponent(); } protected override void OnShow(object userData) @@ -217,9 +266,10 @@ namespace SepCore.Entity } _inputComponent.OnInit(); - _inputComponent.SetListening(true); + _inputComponent.SetListening(false); _absorbComponent.OnInit(this); _weaponEnabled = true; + _enable = false; _currentLevel = 0; } @@ -229,6 +279,7 @@ namespace SepCore.Entity base.OnUpdate(elapseSeconds, realElapseSeconds); _movementComponent.SetDirection(_inputComponent.Direction); + _movementComponent.OnUpdate(elapseSeconds, realElapseSeconds); _absorbComponent.OnUpdate(elapseSeconds, realElapseSeconds); } @@ -240,6 +291,7 @@ namespace SepCore.Entity _statComponent.OnReset(); _backpackComponent.OnReset(); _absorbComponent.OnReset(); + _skinComponent.OnReset(); base.OnHide(isShutdown, userData); } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs index 8ba8cf4..160c1d2 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs @@ -23,6 +23,8 @@ namespace SepCore.UI public int Price; public Vector3 TargetPos; public Action OnRecycle; + public bool CanCombine; + public Action OnCombine; public int LastWaveDamage; public IReadOnlyDictionary CurrentTagCounts; } diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs index a226759..000c3e7 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs @@ -351,5 +351,26 @@ namespace SepCore.UI { return Mathf.FloorToInt(basePrice * GameEntry.Luban.Global.WeaponRecycleRate); } + + public bool CanCombineWeapon(int index, out int matchIndex, out WeaponConfig nextTierConfig) + { + return _player.CanCombineWeapon(index, out matchIndex, out nextTierConfig); + } + + public async UniTask TryCombineWeaponAsync(int index) + { + if (!_player.CanCombineWeapon(index, out int matchIndex, out WeaponConfig nextTierConfig)) + { + Log.Warning("ShopUseCase.TryCombineWeaponAsync: Cannot combine weapon at index {0}.", index); + return false; + } + + var weapons = _player.Weapons; + WeaponBase weaponA = weapons[index]; + WeaponBase weaponB = weapons[matchIndex]; + + WeaponBase newWeapon = await _player.CombineWeaponsAsync(weaponA, weaponB, nextTierConfig); + return newWeapon != null; + } } } diff --git a/Assets/GameMain/Textures/Mesh.meta b/Assets/GameMain/Textures/Mesh.meta new file mode 100644 index 0000000..401c3e4 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e8b553b29c01ca46bfecc0edaeb0f97 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role101.png b/Assets/GameMain/Textures/Mesh/Role101.png new file mode 100644 index 0000000..7c054d8 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role101.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role101.png.meta b/Assets/GameMain/Textures/Mesh/Role101.png.meta new file mode 100644 index 0000000..01c7ef7 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role101.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5999b1a493725f442b7d421c798dd60d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role102.png b/Assets/GameMain/Textures/Mesh/Role102.png new file mode 100644 index 0000000..9d7f85c Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role102.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role102.png.meta b/Assets/GameMain/Textures/Mesh/Role102.png.meta new file mode 100644 index 0000000..f1d8c36 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role102.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6dfa6812152d1634a9b4734cb6b0a519 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role103.png b/Assets/GameMain/Textures/Mesh/Role103.png new file mode 100644 index 0000000..ecf680d Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role103.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role103.png.meta b/Assets/GameMain/Textures/Mesh/Role103.png.meta new file mode 100644 index 0000000..3e15ef7 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role103.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6aadace48dc77c847b7c099474224e74 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role104.png b/Assets/GameMain/Textures/Mesh/Role104.png new file mode 100644 index 0000000..809546b Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role104.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role104.png.meta b/Assets/GameMain/Textures/Mesh/Role104.png.meta new file mode 100644 index 0000000..03c4dfa --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role104.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a79df2001f85b0241978062046959579 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role105.png b/Assets/GameMain/Textures/Mesh/Role105.png new file mode 100644 index 0000000..68f3cf5 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role105.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role105.png.meta b/Assets/GameMain/Textures/Mesh/Role105.png.meta new file mode 100644 index 0000000..8793c4c --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role105.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0b710be67da28da438ffebabdb3e0dfd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role106.png b/Assets/GameMain/Textures/Mesh/Role106.png new file mode 100644 index 0000000..38fe589 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role106.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role106.png.meta b/Assets/GameMain/Textures/Mesh/Role106.png.meta new file mode 100644 index 0000000..854870f --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role106.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 61e526493d4236642b2ca91f7cc837b3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role107.png b/Assets/GameMain/Textures/Mesh/Role107.png new file mode 100644 index 0000000..6cb06fd Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role107.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role107.png.meta b/Assets/GameMain/Textures/Mesh/Role107.png.meta new file mode 100644 index 0000000..11ece15 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role107.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a93002dc50df54c4fbca38a6c236067a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role108.png b/Assets/GameMain/Textures/Mesh/Role108.png new file mode 100644 index 0000000..fdda30b Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role108.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role108.png.meta b/Assets/GameMain/Textures/Mesh/Role108.png.meta new file mode 100644 index 0000000..976560c --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role108.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9ef7256ec6841284ca6bdf822cd0cc88 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role109.png b/Assets/GameMain/Textures/Mesh/Role109.png new file mode 100644 index 0000000..19ec6cb Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role109.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role109.png.meta b/Assets/GameMain/Textures/Mesh/Role109.png.meta new file mode 100644 index 0000000..67e7fe2 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role109.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7cdfdc685a90bb54eaeac22646bd90eb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role110.png b/Assets/GameMain/Textures/Mesh/Role110.png new file mode 100644 index 0000000..7c74a3c Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role110.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role110.png.meta b/Assets/GameMain/Textures/Mesh/Role110.png.meta new file mode 100644 index 0000000..a4ea384 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role110.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b74691d8fd149e6478fabf7d3de47e28 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role111.png b/Assets/GameMain/Textures/Mesh/Role111.png new file mode 100644 index 0000000..ad7e356 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role111.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role111.png.meta b/Assets/GameMain/Textures/Mesh/Role111.png.meta new file mode 100644 index 0000000..aa80f4d --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role111.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 81b31443f1503614587091db4168c99f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role112.png b/Assets/GameMain/Textures/Mesh/Role112.png new file mode 100644 index 0000000..c4a7996 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role112.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role112.png.meta b/Assets/GameMain/Textures/Mesh/Role112.png.meta new file mode 100644 index 0000000..493352a --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role112.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 346b4468d1023984aae1345c19fd9c93 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role113.png b/Assets/GameMain/Textures/Mesh/Role113.png new file mode 100644 index 0000000..8b98e3d Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role113.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role113.png.meta b/Assets/GameMain/Textures/Mesh/Role113.png.meta new file mode 100644 index 0000000..d02e134 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role113.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 4b6da2608e1d43d43b2643239b10ecf8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role114.png b/Assets/GameMain/Textures/Mesh/Role114.png new file mode 100644 index 0000000..5ad3310 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role114.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role114.png.meta b/Assets/GameMain/Textures/Mesh/Role114.png.meta new file mode 100644 index 0000000..9c85b3c --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role114.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 98fb980d152571745835dc17b9bb5545 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role115.png b/Assets/GameMain/Textures/Mesh/Role115.png new file mode 100644 index 0000000..e777659 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role115.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role115.png.meta b/Assets/GameMain/Textures/Mesh/Role115.png.meta new file mode 100644 index 0000000..098a3ac --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role115.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1a6179beaac9c1f409f960a16c9cff17 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role116.png b/Assets/GameMain/Textures/Mesh/Role116.png new file mode 100644 index 0000000..43eddd9 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role116.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role116.png.meta b/Assets/GameMain/Textures/Mesh/Role116.png.meta new file mode 100644 index 0000000..caf1505 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role116.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b0d84c768342eb644aca08728a1ce643 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role117.png b/Assets/GameMain/Textures/Mesh/Role117.png new file mode 100644 index 0000000..f4d1224 Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role117.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role117.png.meta b/Assets/GameMain/Textures/Mesh/Role117.png.meta new file mode 100644 index 0000000..2ca4813 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role117.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: dcac1b005a25d7441922ac347bfff602 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Textures/Mesh/Role118.png b/Assets/GameMain/Textures/Mesh/Role118.png new file mode 100644 index 0000000..76171dc Binary files /dev/null and b/Assets/GameMain/Textures/Mesh/Role118.png differ diff --git a/Assets/GameMain/Textures/Mesh/Role118.png.meta b/Assets/GameMain/Textures/Mesh/Role118.png.meta new file mode 100644 index 0000000..761efc6 --- /dev/null +++ b/Assets/GameMain/Textures/Mesh/Role118.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: df4e34d303cf7554b9ab04c6aa2fb611 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab index 808d905..57a2f2c 100644 --- a/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab +++ b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab @@ -73,6 +73,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: contentRectTransform: {fileID: 7543853000780573685} + maskImage: {fileID: 5908513204242294122} basicForm: {fileID: 4814609797652970109} detailForm: {fileID: 1077789699804995680} --- !u!114 &3908421189656031064 @@ -106,6 +107,7 @@ GameObject: - component: {fileID: 7543853000780573685} - component: {fileID: 3996340794476105959} - component: {fileID: 4777802152543729244} + - component: {fileID: 5908513204242294122} m_Layer: 5 m_Name: content m_TagString: Untagged @@ -161,6 +163,39 @@ MonoBehaviour: - component: {fileID: 3996340794476105959} generateReference: 0 variableName: contentCanvasRenderer + - component: {fileID: 5908513204242294122} + generateReference: 1 + variableName: maskImage +--- !u!114 &5908513204242294122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625540161254782982} + 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: 0, g: 0, b: 0, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + 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 &931699404490055452 GameObject: m_ObjectHideFlags: 0 @@ -201,7 +236,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -273.065} + m_AnchoredPosition: {x: 210, y: -302.865} m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3758786147868567536 @@ -474,6 +509,140 @@ MonoBehaviour: - component: {fileID: 6053195524865570449} generateReference: 1 variableName: cancelButton +--- !u!1 &1384076369361861897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3822241344404170273} + - component: {fileID: 5862152469757008011} + - component: {fileID: 6074637907946103544} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3822241344404170273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384076369361861897} + 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: 3549195472906523677} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5862152469757008011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384076369361861897} + m_CullTransparentMesh: 1 +--- !u!114 &6074637907946103544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384076369361861897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u5408\u6210" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281679426 + m_fontColor: {r: 0.25882354, g: 0.24313727, b: 0.20784315, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 2 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2619564942114189097 GameObject: m_ObjectHideFlags: 0 @@ -1172,15 +1341,14 @@ MonoBehaviour: m_text: "\u51FA\u552E 17 " m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} - m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4281876548 + m_fontColor: {r: 0.26666668, g: 0.2509804, b: 0.21960786, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1277,6 +1445,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: TooltipRecycleButtonText +--- !u!1 &4096268185611935525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2137203795685113249} + - component: {fileID: 2358251456643844401} + - component: {fileID: 6323735403890709748} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2137203795685113249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096268185611935525} + 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: 3549195472906523677} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2358251456643844401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096268185611935525} + m_CullTransparentMesh: 1 +--- !u!114 &6323735403890709748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096268185611935525} + 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: 64940e89325a24b99aa029d9a27d7aaf, type: 3} + 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 &4731970508977943709 GameObject: m_ObjectHideFlags: 0 @@ -1441,8 +1684,9 @@ MonoBehaviour: m_Calls: [] m_text: "\u67AA\u68B0" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1566,7 +1810,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -150} - m_SizeDelta: {x: 540, y: 540} + m_SizeDelta: {x: 540, y: 320} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4798810177026917072 CanvasRenderer: @@ -1757,8 +2001,9 @@ MonoBehaviour: m_text: "\u8FD9\u4E2A\u6B66\u5668\u5728\u4E0A\u4E00\u6CE2\u654C\u88AD\u4E2D\u9020\u6210\u4E86 361 \u4F24\u5BB3" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1887,7 +2132,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -99.755} + m_AnchoredPosition: {x: 210, y: -111.675} m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062345450854289821 @@ -2082,15 +2327,14 @@ MonoBehaviour: m_text: "\u53D6\u6D88" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} - m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4281679426 + m_fontColor: {r: 0.25882354, g: 0.24313727, b: 0.20784315, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2217,8 +2461,9 @@ MonoBehaviour: m_Calls: [] m_text: "(2) +10 \u8303\u56F4\n(4) +25 \u8303\u56F4\n(6) +50 \u8303\u56F4" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2348,12 +2593,13 @@ RectTransform: - {fileID: 8691033862686863159} - {fileID: 8339817834368489370} - {fileID: 5554396850370679744} + - {fileID: 3549195472906523677} m_Father: {fileID: 7543853000780573685} 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: 600, y: 500} + m_AnchoredPosition: {x: 0, y: -334.2614} + m_SizeDelta: {x: 600, y: 834.2615} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2373791448157887832 CanvasRenderer: @@ -2414,6 +2660,7 @@ MonoBehaviour: - {fileID: 5617935853479120081} - {fileID: 400612800417406683} - {fileID: 227536339921118688} + - {fileID: 5534287093947143972} nestedFormReferences: [] --- !u!114 &1423001204619296699 MonoBehaviour: @@ -2433,6 +2680,7 @@ MonoBehaviour: typeText: {fileID: 7330401870143477410} infoText: {fileID: 6102478747521363808} recycleButton: {fileID: 7966632555814587605} + combineButton: {fileID: 3807361153420474416} textFormatText: {fileID: 6269556444878685483} cancelButton: {fileID: 6053195524865570449} --- !u!114 &4814609797652970109 @@ -2573,6 +2821,152 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8386490238623064723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3549195472906523677} + - component: {fileID: 821858558032188356} + - component: {fileID: 3807361153420474416} + - component: {fileID: 5534287093947143972} + m_Layer: 5 + m_Name: CombineButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3549195472906523677 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8386490238623064723} + 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: 2137203795685113249} + - {fileID: 3822241344404170273} + m_Father: {fileID: 7617469188909815455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 240} + m_SizeDelta: {x: -60, y: 80} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &821858558032188356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8386490238623064723} + m_CullTransparentMesh: 1 +--- !u!114 &3807361153420474416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8386490238623064723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, 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: 2 + 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: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, + type: 3} + m_PressedSprite: {fileID: 21300000, guid: 30ea5c623ad88483c8fd282575a5ca6c, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6323735403890709748} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10001 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _background: {fileID: 6323735403890709748} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10000 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5534287093947143972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8386490238623064723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} + m_Name: + m_EditorClassIdentifier: + componentReferences: + - component: {fileID: 3549195472906523677} + generateReference: 0 + variableName: cancelButtonRectTransform + - component: {fileID: 821858558032188356} + generateReference: 0 + variableName: cancelButtonCanvasRenderer + - component: {fileID: 3807361153420474416} + generateReference: 1 + variableName: combineButton --- !u!1 &8432810498733071531 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab index 8f6fe99..5ca835f 100644 --- a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab +++ b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab @@ -55,8 +55,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -190,8 +190,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.3137255, g: 0.3137255, b: 0.3137255, a: 0.39215687} m_RaycastTarget: 1 @@ -262,8 +262,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 335062b0d81ae40f49c923ef4bf19dd7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: serializationItems: - {fileID: 4426878279441272725} - {fileID: 2261116646569783763} @@ -280,8 +280,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3172a8000d5463f45b2f4c5f5a19433d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _view: {fileID: 5409523094175394191} --- !u!114 &5409523094175394191 MonoBehaviour: @@ -293,8 +293,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 39b4ea16f6b8d6a47b6ea7078982a7d0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: rewardAreaRoot: {fileID: 8030040287481431578} levelUpRewardTemplate: {fileID: 5339260094138371585} refreshButton: {fileID: 2880959524925709550} @@ -347,8 +347,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -373,8 +373,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 8030040287481431578} generateReference: 1 @@ -393,7 +393,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 8eb1e718a27bf42ec8048506aa13b80b, type: 3} - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -449,7 +449,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_spriteAsset - value: + value: objectReference: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -545,13 +545,13 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -842,8 +842,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 3295807416560938857} generateReference: 0 @@ -867,8 +867,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2efdcd06cdaa830448f76b22ea7c98fb, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: key: LevelUpRefreshCostText --- !u!114 &2747827682437384067 stripped MonoBehaviour: @@ -880,8 +880,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &2880959524925709550 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -892,8 +892,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!224 &3295807416560938857 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -922,8 +922,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 7799418069362394985} generateReference: 0 @@ -1152,7 +1152,7 @@ PrefabInstance: - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 0} - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} @@ -1425,8 +1425,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 1260145051120981171} generateReference: 0 @@ -1447,8 +1447,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &9216646426709445169 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7087412285248003043, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, @@ -1459,5 +1459,5 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIForms/MenuForm.prefab b/Assets/GameMain/UI/UIForms/MenuForm.prefab index e733d27..6bfe27d 100644 --- a/Assets/GameMain/UI/UIForms/MenuForm.prefab +++ b/Assets/GameMain/UI/UIForms/MenuForm.prefab @@ -280,6 +280,11 @@ PrefabInstance: propertyPath: m_text value: "\u56FE\u9274" objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background @@ -704,7 +709,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -727,6 +732,16 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.22 objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4279970104 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background @@ -785,25 +800,25 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_PressedSprite - value: + value: objectReference: {fileID: 21300000, guid: 30ea5c623ad88483c8fd282575a5ca6c, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_DisabledSprite - value: + value: objectReference: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_SelectedSprite - value: + value: objectReference: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite - value: + value: objectReference: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -1182,6 +1197,11 @@ PrefabInstance: propertyPath: m_text value: "\u6863\u6848" objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background @@ -1606,7 +1626,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -1629,6 +1649,16 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.22 objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4279970104 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background @@ -1682,25 +1712,25 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_PressedSprite - value: + value: objectReference: {fileID: 21300000, guid: 2fdafc6b5cb0b4fb18cfab4dbd4facf0, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_DisabledSprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_SelectedSprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -2079,6 +2109,11 @@ PrefabInstance: propertyPath: m_text value: "\u5173\u4E8E" objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background @@ -2505,6 +2540,11 @@ PrefabInstance: propertyPath: m_text value: "\u8BBE\u7F6E" objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _background diff --git a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab index b89d01d..65e81d3 100644 --- a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab +++ b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab @@ -514,7 +514,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -75404448, guid: c72ec2f6752f8435b8ed98f261364b9a, type: 3} + m_Sprite: {fileID: -390709403, guid: c72ec2f6752f8435b8ed98f261364b9a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GameMain/UI/UIForms/ShopForm.prefab b/Assets/GameMain/UI/UIForms/ShopForm.prefab index db7be9e..11e697f 100644 --- a/Assets/GameMain/UI/UIForms/ShopForm.prefab +++ b/Assets/GameMain/UI/UIForms/ShopForm.prefab @@ -3923,7 +3923,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontStyle - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3950,6 +3950,11 @@ PrefabInstance: propertyPath: m_RaycastTarget value: 0 objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor32.rgba @@ -7549,6 +7554,11 @@ PrefabInstance: propertyPath: m_RaycastTarget value: 0 objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_enableAutoSizing @@ -8253,7 +8263,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8263,7 +8273,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8273,7 +8283,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 698 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8313,12 +8323,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 285 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -349 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8340,6 +8350,31 @@ PrefabInstance: propertyPath: m_Name value: GoodsItemTemplate objectReference: {fileID: 0} + - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3585730205036254032, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3585730205036254032, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3585730205036254032, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3585730205036254032, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/GameMain/UI/UIItems/CommonButton.prefab b/Assets/GameMain/UI/UIItems/CommonButton.prefab index 325c646..177f956 100644 --- a/Assets/GameMain/UI/UIItems/CommonButton.prefab +++ b/Assets/GameMain/UI/UIItems/CommonButton.prefab @@ -143,8 +143,7 @@ MonoBehaviour: m_text: "\u8FD4\u56DE" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} - m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4b5f8c74582ca924bad8e5655ec04a31, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/GameMain/UI/UIItems/GoodsItem.prefab b/Assets/GameMain/UI/UIItems/GoodsItem.prefab index bff24f8..93a16af 100644 --- a/Assets/GameMain/UI/UIItems/GoodsItem.prefab +++ b/Assets/GameMain/UI/UIItems/GoodsItem.prefab @@ -362,7 +362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1568602919960830097 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/RawResources.meta b/Assets/RawResources.meta new file mode 100644 index 0000000..2748082 --- /dev/null +++ b/Assets/RawResources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87ed1c0d3d4d40247b80d0d265155485 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs b/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs new file mode 100644 index 0000000..6defb0c --- /dev/null +++ b/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs @@ -0,0 +1,125 @@ +using System.Collections.Generic; +using System.Reflection; +using NUnit.Framework; +using SepCore.Components; +using UnityEngine; +using UnityEngine.TestTools; + +namespace VampireLike.Tests.Gameplay.EditMode +{ + [TestFixture] + public class ChildrenMapTests + { + private GameObject _rootObject; + private ChildrenMap _childrenMap; + private GameObject _childA; + private GameObject _childB; + + [SetUp] + public void SetUp() + { + GameFramework.GameFrameworkLog.SetLogHelper(new UnityGameFramework.Runtime.DefaultLogHelper()); + + _rootObject = new GameObject("RootTestObject"); + _childrenMap = _rootObject.AddComponent(); + + _childA = new GameObject("ChildA"); + _childA.transform.SetParent(_rootObject.transform); + + _childB = new GameObject("ChildB"); + _childB.transform.SetParent(_rootObject.transform); + } + + [TearDown] + public void TearDown() + { + if (_rootObject != null) + { + Object.DestroyImmediate(_rootObject); + } + } + + private void SetEntries(List entries) + { + FieldInfo field = typeof(ChildrenMap).GetField("_entries", BindingFlags.NonPublic | BindingFlags.Instance); + Assert.IsNotNull(field); + field.SetValue(_childrenMap, entries); + } + + [Test] + public void Get_WithValidKey_ReturnsGameObject() + { + SetEntries(new List + { + new ChildrenMap.Entry("Socket_A", _childA), + new ChildrenMap.Entry("Socket_B", _childB) + }); + + GameObject resultA = _childrenMap.Get("Socket_A"); + GameObject resultB = _childrenMap.Get("Socket_B"); + + Assert.AreEqual(_childA, resultA); + Assert.AreEqual(_childB, resultB); + } + + [Test] + public void Get_WithNonExistingKey_ReturnsNull() + { + SetEntries(new List + { + new ChildrenMap.Entry("Socket_A", _childA) + }); + + LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Key 'NonExisting' not found")); + GameObject result = _childrenMap.Get("NonExisting"); + + Assert.IsNull(result); + } + + [Test] + public void Get_WithNullOrEmptyKey_ReturnsNull() + { + SetEntries(new List + { + new ChildrenMap.Entry("Socket_A", _childA) + }); + + LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Key is null or empty")); + GameObject resultNull = _childrenMap.Get(null); + Assert.IsNull(resultNull); + + LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Key is null or empty")); + GameObject resultEmpty = _childrenMap.Get(string.Empty); + Assert.IsNull(resultEmpty); + } + + [Test] + public void Get_WithConfiguredNullTarget_ReturnsNull() + { + SetEntries(new List + { + new ChildrenMap.Entry("NullTargetKey", null) + }); + + LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Target GameObject for key 'NullTargetKey' is null")); + GameObject result = _childrenMap.Get("NullTargetKey"); + + Assert.IsNull(result); + } + + [Test] + public void InitMap_WithDuplicateKey_LogsErrorAndKeepsFirst() + { + SetEntries(new List + { + new ChildrenMap.Entry("SameKey", _childA), + new ChildrenMap.Entry("SameKey", _childB) + }); + + LogAssert.Expect(LogType.Error, new System.Text.RegularExpressions.Regex("Duplicate key 'SameKey'")); + GameObject result = _childrenMap.Get("SameKey"); + + Assert.AreEqual(_childA, result); + } + } +} diff --git a/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs.meta b/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs.meta new file mode 100644 index 0000000..b5f791a --- /dev/null +++ b/Assets/Tests/Gameplay/EditMode/ChildrenMapTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4d779496a9b310c46a34f7d8cf1780f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/Gameplay/EditMode/WeaponSynergyTests.cs b/Assets/Tests/Gameplay/EditMode/WeaponSynergyTests.cs index 89f4a5b..6754144 100644 --- a/Assets/Tests/Gameplay/EditMode/WeaponSynergyTests.cs +++ b/Assets/Tests/Gameplay/EditMode/WeaponSynergyTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using NUnit.Framework; using SepCore.Battle; +using SepCore.CustomUtility; using SepCore.Definition; using SepCore.Entity; using SepCore.UI; @@ -176,6 +177,109 @@ namespace VampireLike.Tests.Gameplay.EditMode Assert.IsTrue(tagTiersContent.Contains("(3)")); } + [Test] + public void WeaponUtility_TryGetNextTierWeaponId_CalculatesAndStopsAtRed() + { + // 1001 = WeaponKnife White -> 1002 Blue -> 1003 Purple -> 1004 Red -> Stops + Assert.IsTrue(WeaponUtility.TryGetNextTierWeaponId(1001, out int next1)); + Assert.AreEqual(1002, next1); + + Assert.IsTrue(WeaponUtility.TryGetNextTierWeaponId(1002, out int next2)); + Assert.AreEqual(1003, next2); + + Assert.IsTrue(WeaponUtility.TryGetNextTierWeaponId(1003, out int next3)); + Assert.AreEqual(1004, next3); + + // Red (4) 无法å†�å�‡é˜¶ + Assert.IsFalse(WeaponUtility.TryGetNextTierWeaponId(1004, out int next4)); + Assert.AreEqual(0, next4); + } + + [Test] + public void ItemTooltipContext_CanCombineFlag_ControlsShowCombineButton() + { + var rawDataCombinable = new ItemTooltipRawData + { + Index = 0, + ItemType = ItemType.Weapon, + Price = 100, + Rarity = Rarity.White, + CanCombine = true + }; + var contextCombinable = new ItemTooltipContext(rawDataCombinable); + Assert.IsTrue(contextCombinable.BasicContext.ShowCombineButton); + + var rawDataNonCombinable = new ItemTooltipRawData + { + Index = 0, + ItemType = ItemType.Weapon, + Price = 100, + Rarity = Rarity.Red, + CanCombine = false + }; + var contextNonCombinable = new ItemTooltipContext(rawDataNonCombinable); + Assert.IsFalse(contextNonCombinable.BasicContext.ShowCombineButton); + } + + [Test] + public void WeaponSynthesis_NestedBatchUpdate_AtomicallyReplacesMilestonesWithoutIntermediateDip() + { + var pipeline = new AttributePipeline(); + pipeline.SetBaseValue(StatType.MaxHp, 100f); + + var tagTier1 = new WeaponTagConfig(CreateBufferForTagConfig(401, (int)WeaponTag.Primitive, 2, StatType.MaxHp, 5f, ModifierType.Flat)); + var tagTier2 = new WeaponTagConfig(CreateBufferForTagConfig(402, (int)WeaponTag.Primitive, 4, StatType.MaxHp, 12f, ModifierType.Flat)); + + // åˆ�å§‹ 4 ä»¶è¾¾æˆ� 2 档:100 + 12 = 112 HP + pipeline.AddModifier(tagTier2.StatModifierConfigs[0], tagTier2); + Assert.AreEqual(112f, pipeline.GetValue(StatType.MaxHp), 1e-4f); + + float currentHealth = 112f; + int notificationCount = 0; + + pipeline.OnStatChanged += (statType, newValue) => + { + if (statType == StatType.MaxHp) + { + notificationCount++; + if (currentHealth > newValue) + { + currentHealth = newValue; + } + } + }; + + // 模拟å�ˆæˆ�æµ�程:外层 BeginBatchUpdate 包裹 + // å�ˆæˆ�两把武器使得件数从 4 å�˜ 3(é™�至 1 æ¡£ 5 HP),期间移除 4 æ¡£ã€�甚至中间å�¯èƒ½çŸ­æš‚é™�至 0 æ¡£ + using (pipeline.BeginBatchUpdate()) + { + // 模拟第一把武器移除时的内部刷新(嵌套 BatchUpdate) + using (pipeline.BeginBatchUpdate()) + { + pipeline.RemoveAllModifiersFromSource(tagTier2); + } + + // 此时外层尚未结æ�Ÿï¼Œä¸�应触å�‘任何 OnStatChanged,当å‰�è¡€é‡�ä¸�应被扣å‡� + Assert.AreEqual(0, notificationCount); + Assert.AreEqual(112f, currentHealth); + + // 模拟新å�ˆæˆ�武器挂载å�Žçš„内部刷新(嵌套 BatchUpdate) + using (pipeline.BeginBatchUpdate()) + { + pipeline.AddModifier(tagTier1.StatModifierConfigs[0], tagTier1); + } + + Assert.AreEqual(0, notificationCount); + } + + // 外层作用域结æ�Ÿå�Žï¼Œç»Ÿä¸€ç»“算一次å�˜åŒ– + Assert.AreEqual(1, notificationCount); + // 最终生命上é™�为 100 + 5 = 105 + Assert.AreEqual(105f, pipeline.GetValue(StatType.MaxHp), 1e-4f); + // 当å‰�生命平滑è£�剪至 105,而ä¸�是在中间被 100 è£�剪 + Assert.AreEqual(105f, currentHealth, 1e-4f); + } + private static Luban.ByteBuf CreateBufferForTagConfig(int id, int tag, int requiredCount, StatType statType, float value, ModifierType modType) { var buf = new Luban.ByteBuf(); diff --git a/æ•°æ�®è¡¨/Datas/GlobalConfig_全局é…�ç½®.xlsx b/æ•°æ�®è¡¨/Datas/GlobalConfig_全局é…�ç½®.xlsx index 4c5d7ed..2e6a42b 100644 Binary files a/æ•°æ�®è¡¨/Datas/GlobalConfig_全局é…�ç½®.xlsx and b/æ•°æ�®è¡¨/Datas/GlobalConfig_全局é…�ç½®.xlsx differ diff --git a/æ•°æ�®è¡¨/Datas/LevelExperienceConfig_等级ç»�验é…�ç½®.xlsx b/æ•°æ�®è¡¨/Datas/LevelExperienceConfig_等级ç»�验é…�ç½®.xlsx index 24349bf..fb47b46 100644 Binary files a/æ•°æ�®è¡¨/Datas/LevelExperienceConfig_等级ç»�验é…�ç½®.xlsx and b/æ•°æ�®è¡¨/Datas/LevelExperienceConfig_等级ç»�验é…�ç½®.xlsx differ diff --git a/æ•°æ�®è¡¨/Datas/RoleConfig_è�Œä¸šé…�ç½®.xlsx b/æ•°æ�®è¡¨/Datas/RoleConfig_è�Œä¸šé…�ç½®.xlsx index cc40d6a..3872b17 100644 Binary files a/æ•°æ�®è¡¨/Datas/RoleConfig_è�Œä¸šé…�ç½®.xlsx and b/æ•°æ�®è¡¨/Datas/RoleConfig_è�Œä¸šé…�ç½®.xlsx differ diff --git a/æ•°æ�®è¡¨/Datas/SpriteConfig_图片资æº�.xlsx b/æ•°æ�®è¡¨/Datas/SpriteConfig_图片资æº�.xlsx index 0b7da1e..cd7f4d6 100644 Binary files a/æ•°æ�®è¡¨/Datas/SpriteConfig_图片资æº�.xlsx and b/æ•°æ�®è¡¨/Datas/SpriteConfig_图片资æº�.xlsx differ