diff --git a/Assets/ResWork/UI/Image/Hero Job/former btn frame.png b/Assets/ResWork/UI/Image/Hero Job/former btn frame.png deleted file mode 100644 index d1af1d124..000000000 Binary files a/Assets/ResWork/UI/Image/Hero Job/former btn frame.png and /dev/null differ diff --git a/Assets/ResWork/UI/Image/Hero Job/lock_job.png b/Assets/ResWork/UI/Image/Hero Job/lock_job.png deleted file mode 100644 index 5e85c95fc..000000000 Binary files a/Assets/ResWork/UI/Image/Hero Job/lock_job.png and /dev/null differ diff --git a/Assets/ResWork/UI/Image/Hero Job/slot.png b/Assets/ResWork/UI/Image/Hero Job/slot.png deleted file mode 100644 index b4ad0203c..000000000 Binary files a/Assets/ResWork/UI/Image/Hero Job/slot.png and /dev/null differ diff --git a/Assets/ResWork/UI/Image/Hero Job.meta b/Assets/ResWork/UI/Image/Hero/Management.meta similarity index 77% rename from Assets/ResWork/UI/Image/Hero Job.meta rename to Assets/ResWork/UI/Image/Hero/Management.meta index bfe0d0e2b..6a234c11a 100644 --- a/Assets/ResWork/UI/Image/Hero Job.meta +++ b/Assets/ResWork/UI/Image/Hero/Management.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2fb39c3af2a4e64684280817441495d +guid: 423a2cb821fd2e244b93bcaaccc374f9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png b/Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png new file mode 100644 index 000000000..0f79d2ad4 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Job/lock_job.png.meta b/Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png.meta similarity index 98% rename from Assets/ResWork/UI/Image/Hero Job/lock_job.png.meta rename to Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png.meta index 49466adfc..436d16d66 100644 --- a/Assets/ResWork/UI/Image/Hero Job/lock_job.png.meta +++ b/Assets/ResWork/UI/Image/Hero/Management/adventurer icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca451c07e0fc76b4a9c04c95cf1f393e +guid: ffa5e0a3d259fe747b76751af1597aed TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png b/Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png new file mode 100644 index 000000000..1082123be Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png differ diff --git a/Assets/ResWork/UI/Image/Hero Job/slot.png.meta b/Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png.meta similarity index 98% rename from Assets/ResWork/UI/Image/Hero Job/slot.png.meta rename to Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png.meta index 29b87c1b9..0529ddbf8 100644 --- a/Assets/ResWork/UI/Image/Hero Job/slot.png.meta +++ b/Assets/ResWork/UI/Image/Hero/Management/back ground white gradation.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09593df74c5139146911fd5b21f00a7a +guid: 2bf9c263ea807ec4dac068995351cbbb TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ResWork/UI/Image/Hero/Management/label_hero management.png b/Assets/ResWork/UI/Image/Hero/Management/label_hero management.png new file mode 100644 index 000000000..36417d083 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero/Management/label_hero management.png differ diff --git a/Assets/ResWork/UI/Image/Hero Job/former btn frame.png.meta b/Assets/ResWork/UI/Image/Hero/Management/label_hero management.png.meta similarity index 97% rename from Assets/ResWork/UI/Image/Hero Job/former btn frame.png.meta rename to Assets/ResWork/UI/Image/Hero/Management/label_hero management.png.meta index 13e60b973..9aea94c58 100644 --- a/Assets/ResWork/UI/Image/Hero Job/former btn frame.png.meta +++ b/Assets/ResWork/UI/Image/Hero/Management/label_hero management.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 370bf778de2fda04db519b921a625466 +guid: 8c2d3c99c8221274d9aa09156f97d5a9 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 28, y: 0, z: 28, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 8c3193d22..f31d3e329 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -2102,6 +2102,95 @@ MonoBehaviour: TextCol_off: {r: 1, g: 1, b: 1, a: 1} texts: - {fileID: 6986174286048149442} +--- !u!1 &132910808491115957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2834613763139273685} + - component: {fileID: 4272948797458983803} + m_Layer: 5 + m_Name: Slider_exp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2834613763139273685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 132910808491115957} + 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: 3804436876571235519} + - {fileID: 170412389667273543} + m_Father: {fileID: 8601885795275210530} + 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.74997, y: -13.45} + m_SizeDelta: {x: 215.5, y: 22.62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4272948797458983803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 132910808491115957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5627546697514140105} + m_FillRect: {fileID: 5394519829558517355} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0.325 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &143601539581528444 GameObject: m_ObjectHideFlags: 0 @@ -12284,6 +12373,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &908505378919031363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5394519829558517355} + - component: {fileID: 5741535800225315311} + - component: {fileID: 5627546697514140105} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5394519829558517355 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908505378919031363} + 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: 170412389667273543} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.325, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5741535800225315311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908505378919031363} + m_CullTransparentMesh: 1 +--- !u!114 &5627546697514140105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908505378919031363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 410de795ee05ec649a61da73ae257c9b, 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 &926540528331207908 GameObject: m_ObjectHideFlags: 0 @@ -24605,6 +24769,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1646065618781057861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3115921755019966339} + - component: {fileID: 7088966381927887311} + - component: {fileID: 5752483831206692743} + m_Layer: 5 + m_Name: jobbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3115921755019966339 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646065618781057861} + 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: 8471551177726456611} + m_Father: {fileID: 6810771494914655753} + 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: -208.5, y: 0} + m_SizeDelta: {x: 174.66, y: 169.61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7088966381927887311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646065618781057861} + m_CullTransparentMesh: 1 +--- !u!114 &5752483831206692743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646065618781057861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, 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 &1661516722400647090 GameObject: m_ObjectHideFlags: 0 @@ -42694,7 +42934,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -157.96, y: 18.65} + m_AnchoredPosition: {x: -24.3, y: 0} m_SizeDelta: {x: 174.66, y: 169.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1527034919196459279 @@ -51958,17 +52198,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3340679487968631751} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6810771494914655753} + m_Father: {fileID: 2381067838629376424} 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: 126, y: 15.8} - m_SizeDelta: {x: 150, y: 30} + 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 &8297267112803839546 CanvasRenderer: @@ -52032,10 +52272,10 @@ MonoBehaviour: m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: -3 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -60286,82 +60526,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3923636244384290382 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3397315887010639214} - - component: {fileID: 118772414703926653} - - component: {fileID: 4696012032223213382} - m_Layer: 5 - m_Name: jobbg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3397315887010639214 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3923636244384290382} - 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: 3913894823057888977} - m_Father: {fileID: 6810771494914655753} - 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: 127.36, y: 77.57} - m_SizeDelta: {x: 168.75, y: 51.77} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &118772414703926653 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3923636244384290382} - m_CullTransparentMesh: 1 ---- !u!114 &4696012032223213382 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3923636244384290382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b5b02bcc53245ec4fb4d313b65c17cea, 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 &3933105380812722254 GameObject: m_ObjectHideFlags: 0 @@ -61038,6 +61202,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3990232943295883112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8317341579501990201} + - component: {fileID: 5163031036528748516} + - component: {fileID: 7672864949829738187} + m_Layer: 5 + m_Name: t_expval + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8317341579501990201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990232943295883112} + 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: 8601885795275210530} + 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: 33.5, y: 12.860027} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5163031036528748516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990232943295883112} + m_CullTransparentMesh: 1 +--- !u!114 &7672864949829738187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990232943295883112} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 000% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + 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: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3993152427756769545 GameObject: m_ObjectHideFlags: 0 @@ -65828,16 +66126,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4325472556444452379} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6810771494914655753} + m_Father: {fileID: 8601885795275210530} 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: 126.000015, y: -24.6} + m_AnchoredPosition: {x: -30.699951, y: 12.860027} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5323538296947336345 @@ -65868,7 +66166,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Exp 000.00% + m_text: Exp. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} @@ -65895,8 +66193,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -65905,7 +66203,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: -3 + m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -69928,141 +70226,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4585536791525092086 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3913894823057888977} - - component: {fileID: 9211036486647801911} - - component: {fileID: 6248764782444653550} - m_Layer: 5 - m_Name: t_job - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3913894823057888977 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4585536791525092086} - 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: 3397315887010639214} - 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 &9211036486647801911 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4585536791525092086} - m_CullTransparentMesh: 1 ---- !u!114 &6248764782444653550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4585536791525092086} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uBAA8\uD5D8\uAC00" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4284624941 - m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 23 - m_fontSizeBase: 23 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - 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: 1 - m_margin: {x: 0, y: 0, z: -0.51923746, 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 &4591618608051933082 GameObject: m_ObjectHideFlags: 0 @@ -81851,6 +82014,44 @@ MonoBehaviour: - {fileID: 2794429696635918067} texts: - {fileID: 6283613084704500478} +--- !u!1 &5414661728752982943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8601885795275210530} + m_Layer: 5 + m_Name: Exp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8601885795275210530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5414661728752982943} + 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: 5280675726368018411} + - {fileID: 8317341579501990201} + - {fileID: 2834613763139273685} + m_Father: {fileID: 6810771494914655753} + 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: 180.29999, y: -32.06001} + m_SizeDelta: {x: 220, y: 55.72} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5414836192020329147 GameObject: m_ObjectHideFlags: 0 @@ -97843,7 +98044,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7f98b14852a05d1449cc911c1a0f0f0e, type: 3} + m_Sprite: {fileID: 21300000, guid: c2b5a213ebd2e0e47b5c0e16bac144d0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -98577,8 +98778,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 48.85, y: 19.16} - m_SizeDelta: {x: 114.87, y: 44.25} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4152399868421002409 CanvasRenderer: @@ -98763,6 +98964,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &6678125439247782111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3804436876571235519} + - component: {fileID: 93173787907040783} + - component: {fileID: 6202178035337883457} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3804436876571235519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6678125439247782111} + 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: 2834613763139273685} + 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 &93173787907040783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6678125439247782111} + m_CullTransparentMesh: 1 +--- !u!114 &6202178035337883457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6678125439247782111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 011264d785fbe964eb3bd160bbfcdb22, 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 &6712443393101867824 GameObject: m_ObjectHideFlags: 0 @@ -101907,6 +102183,42 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6895434462823049019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 170412389667273543} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &170412389667273543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6895434462823049019} + 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: 5394519829558517355} + m_Father: {fileID: 2834613763139273685} + 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!1 &6902872278868069185 GameObject: m_ObjectHideFlags: 0 @@ -116004,6 +116316,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 376 +--- !u!1 &7908837488985120949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8471551177726456611} + - component: {fileID: 1720832420329574457} + - component: {fileID: 8731776066907439228} + m_Layer: 5 + m_Name: i_job + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8471551177726456611 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7908837488985120949} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3115921755019966339} + 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: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1720832420329574457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7908837488985120949} + m_CullTransparentMesh: 1 +--- !u!114 &8731776066907439228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7908837488985120949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ffa5e0a3d259fe747b76751af1597aed, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7910342406501495639 GameObject: m_ObjectHideFlags: 0 @@ -121291,6 +121678,7 @@ MonoBehaviour: - {fileID: 5655663991705749546} - {fileID: 7758511807854377785} - {fileID: 3357183664336981520} + slider_exp: {fileID: 0} --- !u!1 &8231692541320541403 GameObject: m_ObjectHideFlags: 0 @@ -133612,6 +134000,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9026301152738894618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2381067838629376424} + - component: {fileID: 1212754235516558142} + - component: {fileID: 4910185529659966372} + m_Layer: 5 + m_Name: lvbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2381067838629376424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026301152738894618} + 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: 3717121939629042655} + m_Father: {fileID: 6810771494914655753} + 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: 180.3, y: 33.9} + m_SizeDelta: {x: 220, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1212754235516558142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026301152738894618} + m_CullTransparentMesh: 1 +--- !u!114 &4910185529659966372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9026301152738894618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8c2d3c99c8221274d9aa09156f97d5a9, 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 &9032942342575657424 GameObject: m_ObjectHideFlags: 0 @@ -134739,16 +135203,16 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1754695923417094228} + - {fileID: 3115921755019966339} - {fileID: 3028170226213933175} - - {fileID: 3397315887010639214} - - {fileID: 3717121939629042655} - - {fileID: 5280675726368018411} + - {fileID: 2381067838629376424} + - {fileID: 8601885795275210530} m_Father: {fileID: 7404742651207184332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 272, y: 95} - m_SizeDelta: {x: 484, y: 138} + m_AnchoredPosition: {x: 325.03, y: 107.3} + m_SizeDelta: {x: 598.11, y: 181.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &385260057464367632 MonoBehaviour: @@ -134764,11 +135228,13 @@ MonoBehaviour: m_EditorClassIdentifier: images: - {fileID: 7547153118397443468} + - {fileID: 8731776066907439228} texts: - - {fileID: 6248764782444653550} + - {fileID: 0} - {fileID: 7802828164593127450} - - {fileID: 4407621389031676629} + - {fileID: 7672864949829738187} - {fileID: 4250464995287266629} + slider_exp: {fileID: 4272948797458983803} --- !u!1 &9093571993093768003 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/PC/PCUI_LvInfo.cs b/Assets/Script/UI/PC/PCUI_LvInfo.cs index 9f1abf561..83cac311a 100644 --- a/Assets/Script/UI/PC/PCUI_LvInfo.cs +++ b/Assets/Script/UI/PC/PCUI_LvInfo.cs @@ -4,8 +4,9 @@ using UnityEngine.UI; public class PCUI_LvInfo : MonoBehaviour { - public Image[] images; // 0 직업 - public TextMeshProUGUI[] texts; // 0 직업, 1 레벨, 2 경험치, 3 무기종류 + public Image[] images; // 0 전투타입, 1 직업 + public TextMeshProUGUI[] texts; // 0 null, 1 레벨, 2 경험치, 3 무기종류 + public Slider slider_exp; private void OnEnable() { @@ -16,9 +17,10 @@ public class PCUI_LvInfo : MonoBehaviour { var sdata = ServerInfo.Ins.m_ServerData; var classData = table_classconfig.Ins.Get_Data_orNull(sdata.Get_EqiupmentEquip(eItem.PC)); - texts[0].text = classData.Get_JobName(); - texts[1].text = $"Lv. {sdata.PC.Lv}"; - texts[2].text = $"Exp {DSUtil.GetCommaText_N2(sdata.PC.Get_ExpSliderValue() * 100f)}%"; + //texts[0].text = classData.Get_JobName(); + texts[1].text = $"Lv. {sdata.PC.Lv}"; + texts[2].text = MyText.Get_PercentValueText_100(sdata.PC.Get_ExpSliderValue()); if (texts.Length > 3) texts[3].text = classData.e_BattleType.ToString(); + if (!DSUtil.CheckNull(slider_exp)) slider_exp.value = sdata.PC.Get_ExpSliderValue(); } } \ No newline at end of file diff --git a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_2d3062.mat b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_2d3062.mat index 2771e0b45..a245fc79f 100644 --- a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_2d3062.mat +++ b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_2d3062.mat @@ -58,7 +58,7 @@ Material: - _ColorMask: 15 - _CullMode: 0 - _Diffuse: 0.5 - - _FaceDilate: 0.5 + - _FaceDilate: 0.2 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlowInner: 0.05 @@ -75,9 +75,9 @@ Material: - _OutlineWidth: 1 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.47407407 + - _ScaleRatioA: 0.57657653 - _ScaleRatioB: 0.65 - - _ScaleRatioC: 0.25 + - _ScaleRatioC: 0.49 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -104,7 +104,7 @@ Material: - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - - _OutlineColor: {r: 0.068084724, g: 0.073842846, b: 0.16981131, a: 1} + - _OutlineColor: {r: 0.026241222, g: 0.029556843, b: 0.12213881, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_6d3e12.mat b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_6d3e12.mat index 825e6a37a..53259ff84 100644 --- a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_6d3e12.mat +++ b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_6d3e12.mat @@ -58,7 +58,7 @@ Material: - _ColorMask: 15 - _CullMode: 0 - _Diffuse: 0.5 - - _FaceDilate: 0.5 + - _FaceDilate: 0.2 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlowInner: 0.05 diff --git a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_White.mat b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_White.mat index dea016155..717061f6e 100644 --- a/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_White.mat +++ b/Assets/ThirdParty/TextMesh Pro/Addressables/Fonts & Materials/Font SDF Material - Outline_White.mat @@ -58,7 +58,7 @@ Material: - _ColorMask: 15 - _CullMode: 0 - _Diffuse: 0.5 - - _FaceDilate: 0.5 + - _FaceDilate: 0.2 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlowInner: 0.05 @@ -75,9 +75,9 @@ Material: - _OutlineWidth: 1 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.47407407 + - _ScaleRatioA: 0.57657653 - _ScaleRatioB: 0.65 - - _ScaleRatioC: 0.25 + - _ScaleRatioC: 0.49 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0