new 장비 ui 작업 중...
This commit is contained in:
parent
f84a867390
commit
8322ef1049
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -75,8 +75,8 @@ MonoBehaviour:
|
|||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
rgba: 4284624941
|
||||
m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
|
|
@ -305,7 +305,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 415.63, y: -45}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3562267927888194805
|
||||
CanvasRenderer:
|
||||
|
|
@ -345,8 +345,8 @@ MonoBehaviour:
|
|||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4279966522
|
||||
m_fontColor: {r: 0.227451, g: 0.10588236, b: 0.10588236, a: 1}
|
||||
rgba: 4284624941
|
||||
m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
|
|
@ -399,7 +399,7 @@ MonoBehaviour:
|
|||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_margin: {x: 57.394104, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
|
|
@ -438,9 +438,9 @@ RectTransform:
|
|||
- {fileID: 4292324032161461894}
|
||||
m_Father: {fileID: 307427294463408238}
|
||||
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: -228.6, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 30.4, y: 0}
|
||||
m_SizeDelta: {x: 35, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8222762999885745887
|
||||
|
|
@ -471,7 +471,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: db35a1b9e39e4de458c0d57038425cec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -492,7 +492,6 @@ GameObject:
|
|||
- component: {fileID: 3821662640419949668}
|
||||
- component: {fileID: 6468894467992069189}
|
||||
- component: {fileID: 2303335469834281870}
|
||||
- component: {fileID: 4973551638303244158}
|
||||
m_Layer: 5
|
||||
m_Name: EquipItemEnchantOptionCard
|
||||
m_TagString: Untagged
|
||||
|
|
@ -519,7 +518,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 515.63, y: 55}
|
||||
m_SizeDelta: {x: 490, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6468894467992069189
|
||||
MonoBehaviour:
|
||||
|
|
@ -533,7 +532,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 91d4965b697c50443aa0a3ee17803553, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
images: []
|
||||
texts:
|
||||
- {fileID: 1565741600275440652}
|
||||
- {fileID: 7205455428029474132}
|
||||
|
|
@ -549,36 +547,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5507423055242639098}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4973551638303244158
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5507423055242639098}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, 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 &6076719342723663790
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -616,7 +584,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 415.63, y: -45}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1196222940201370791
|
||||
CanvasRenderer:
|
||||
|
|
@ -646,7 +614,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: cb358a6ab9168464fb6786d73bde0433, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: be67c53d215f05d43ae28bdfea2b69f5, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -790,7 +758,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: db35a1b9e39e4de458c0d57038425cec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: be67c53d215f05d43ae28bdfea2b69f5, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -833,8 +801,8 @@ RectTransform:
|
|||
- {fileID: 4917075413381549133}
|
||||
m_Father: {fileID: 3821662640419949668}
|
||||
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_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
|
|||
|
|
@ -292,10 +292,10 @@ RectTransform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 877588666381945270}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 90, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4949045163094301045
|
||||
CanvasRenderer:
|
||||
|
|
@ -325,7 +325,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: c1d4192b83f5c6842bf077bf478f9f12, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 5ac861330034a0d4f90fd1dcad7187aa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -628,8 +628,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: fc01b16d6a28db648b3d8e3b13e044eb, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: be67c53d215f05d43ae28bdfea2b69f5, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
|
@ -857,7 +857,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -54.6}
|
||||
m_AnchoredPosition: {x: -32.9, y: -32.4}
|
||||
m_SizeDelta: {x: 150, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7012155148243739088
|
||||
|
|
@ -888,7 +888,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text:
|
||||
m_text: 00
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
|
||||
|
|
@ -922,7 +922,7 @@ MonoBehaviour:
|
|||
m_fontSizeMin: 10
|
||||
m_fontSizeMax: 40
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_HorizontalAlignment: 4
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,460 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1379332916529876362
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4779470447847669144}
|
||||
- component: {fileID: 484669374537281559}
|
||||
- component: {fileID: 719728420028359640}
|
||||
m_Layer: 5
|
||||
m_Name: statvalnext
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4779470447847669144
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1379332916529876362}
|
||||
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: 6204454724025094108}
|
||||
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: 137.1, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &484669374537281559
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1379332916529876362}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &719728420028359640
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1379332916529876362}
|
||||
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: (+00)
|
||||
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: 4286172666
|
||||
m_fontColor: {r: 0.98039216, g: 0.8039216, b: 0.4745098, 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: 35
|
||||
m_fontSizeBase: 35
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 35
|
||||
m_fontSizeMax: 35
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: -10
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 50
|
||||
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: 44, 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 &2844697482490659913
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2408533483793705211}
|
||||
- component: {fileID: 4192929732935930510}
|
||||
- component: {fileID: 4748212666214624345}
|
||||
m_Layer: 5
|
||||
m_Name: stat
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2408533483793705211
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2844697482490659913}
|
||||
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: 6204454724025094108}
|
||||
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: -101.66005, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4192929732935930510
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2844697482490659913}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4748212666214624345
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2844697482490659913}
|
||||
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: "\uC0DD\uBA85\uB825"
|
||||
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: 25
|
||||
m_fontSizeBase: 35
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 25
|
||||
m_fontSizeMax: 25
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: -5
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 50
|
||||
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, 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 &5541134106588913944
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6204454724025094108}
|
||||
- component: {fileID: 671737750311458264}
|
||||
m_Layer: 5
|
||||
m_Name: EquipmentStatCard
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6204454724025094108
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5541134106588913944}
|
||||
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: 2408533483793705211}
|
||||
- {fileID: 6271930443838231848}
|
||||
- {fileID: 4779470447847669144}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 362.08, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &671737750311458264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5541134106588913944}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 83d1ab368acb71f46b888902c27612fc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
texts:
|
||||
- {fileID: 4748212666214624345}
|
||||
- {fileID: 2784768584228178433}
|
||||
- {fileID: 719728420028359640}
|
||||
--- !u!1 &8058087948907855146
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6271930443838231848}
|
||||
- component: {fileID: 8857158423337929439}
|
||||
- component: {fileID: 2784768584228178433}
|
||||
m_Layer: 5
|
||||
m_Name: statval
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6271930443838231848
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8058087948907855146}
|
||||
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: 6204454724025094108}
|
||||
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: 24.4, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8857158423337929439
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8058087948907855146}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2784768584228178433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8058087948907855146}
|
||||
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: 00
|
||||
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: 35
|
||||
m_fontSizeBase: 35
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 35
|
||||
m_fontSizeMax: 35
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 4
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: -5
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 50
|
||||
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: 44, 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}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c01a56b8eee990c44a36c099deb9e407
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -29,7 +29,7 @@ SpriteAtlasImporter:
|
|||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
packingSettings:
|
||||
serializedVersion: 2
|
||||
padding: 4
|
||||
padding: 8
|
||||
blockOffset: 1
|
||||
allowAlphaSplitting: 0
|
||||
enableRotation: 0
|
||||
|
|
|
|||
|
|
@ -103,6 +103,12 @@ public class table_equipslotupgrade : table_missionbase
|
|||
public List<EquipmentSlotUpgradeTableData> Get_DataList(eItem item) { return dic_itemlist[item]; }
|
||||
public EquipmentSlotUpgradeTableData Get_Data(eItem item, eAttackType attribute)
|
||||
{
|
||||
return Get_DataList(item).Find(f => f.e_EquipAttribute == attribute);
|
||||
var lst = Get_DataList(item);
|
||||
for (int i = 0; i < lst.Count; i++)
|
||||
{
|
||||
if (lst[i].e_EquipAttribute == attribute)
|
||||
return lst[i];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
using MK.Toon;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
|
@ -12,8 +11,6 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase
|
|||
public Image[] images; // 0 인챈트 스크롤
|
||||
public GameObject[] gos_offwhenmoveleft;
|
||||
|
||||
EquipmentSlotUpgradeTableData m_ESUTD;
|
||||
|
||||
EquipItemData m_EquipItemData = new EquipItemData();
|
||||
Vector2 v3_childpos;
|
||||
bool bRight = true;
|
||||
|
|
@ -28,18 +25,16 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase
|
|||
{
|
||||
if (DSUtil.CheckNull(data)) return;
|
||||
base.Set(data);
|
||||
|
||||
Set_Position(true);
|
||||
Set_ItemInfo();
|
||||
|
||||
m_ESUTD = table_equipslotupgrade.Ins.Get_Data(m_Data.e_EquipParts, m_Data.e_EquipAttribute);
|
||||
|
||||
Set_UI();
|
||||
|
||||
bRight = true;
|
||||
NewGameUI.Ins.m_EquipmentUI.Set_Scrollviews(false);
|
||||
}
|
||||
|
||||
void Set_UI()
|
||||
public override void Set_UI()
|
||||
{
|
||||
var sdata = ServerInfo.Ins.m_ServerData;
|
||||
|
||||
|
|
@ -48,15 +43,15 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase
|
|||
m_Card.Set(m_EquipItemData);
|
||||
m_Card.Set_CardType(eUICardType.UIEquip);
|
||||
|
||||
texts[0].text = $"{m_SD_Slot.Lv * m_ESUTD.f_LevelPerValue}%";
|
||||
texts[1].text = texts[4].text = MyText.Get_StatName(m_ESUTD.e_OptionType);
|
||||
//texts[0].text = $"{m_SD_Slot.Lv * m_ESUTD.f_LevelPerValue}%";
|
||||
//texts[1].text = texts[4].text = MyText.Get_StatName(m_ESUTD.e_OptionType);
|
||||
var curmain = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv);
|
||||
var nextmain = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv + 1);
|
||||
var curmainText = MyText.Get_StatValueText(m_ESUTD.e_OptionType, curmain);
|
||||
var nextmainText = MyText.Get_StatValueText(m_ESUTD.e_OptionType, nextmain - curmain);
|
||||
texts[2].text = $"{curmainText}<size=25>+{nextmainText}";
|
||||
texts[3].text = $"Lv.{m_SD_Slot.Lv}";
|
||||
texts[5].text = $"{curmainText}%";
|
||||
//texts[2].text = $"{curmainText}<size=25>+{nextmainText}";
|
||||
texts[3].text = DSUtil.Format(418, m_SD_Slot.Lv);
|
||||
texts[5].text = $"{curmainText}";
|
||||
texts[7].text = $"{MyText.Get_StatValueText(m_ESUTD.e_OptionType, curmain + nextmain - curmain)}%";
|
||||
texts[6].text = NumberFormatter.FormatNumber(Get_Price());
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public class EquipmentPopup : EquipmentPopupItemInfoBase
|
|||
DSUtil.InActivateGameObjects(gos_onoff);
|
||||
}
|
||||
|
||||
public void Set_UI()
|
||||
public override void Set_UI()
|
||||
{
|
||||
Set_ItemInfo();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class EquipmentPopupItemInfoBase : BackKeyAdd
|
||||
public class EquipmentPopupItemInfoBase : uScrollViewMgr
|
||||
{
|
||||
public EquipItemCard m_Card;
|
||||
public EquipmentStatCard m_EquipmentStatCard;
|
||||
public TextMeshProUGUI[] texts_iteminfo; // 0 top등급, 1 top이름, 2 종류
|
||||
public TextMeshProUGUI[] texts_stat, texts_statval; // 0 ~ 2 장비 능력
|
||||
public Image[] images_iteminfo; // 0 top이름bg, 1 top등급bg, 2 종류
|
||||
|
||||
protected ItemListTableData m_ItemData;
|
||||
protected EquipmentListTableData m_Data;
|
||||
protected EquipmentSlotUpgradeTableData m_ESUTD;
|
||||
protected SD_Slot m_SD_Slot;
|
||||
EquipItemData m_EquipItemData = new EquipItemData();
|
||||
List<EquipmentStatData> list_statdata = new List<EquipmentStatData>
|
||||
{ new EquipmentStatData(), new EquipmentStatData(), new EquipmentStatData(), new EquipmentStatData() };
|
||||
EquipmentStatData mainstatText = new EquipmentStatData();
|
||||
|
||||
public virtual void Set(EquipmentListTableData data)
|
||||
{
|
||||
|
|
@ -19,6 +22,7 @@ public class EquipmentPopupItemInfoBase : BackKeyAdd
|
|||
m_Data = data;
|
||||
m_ItemData = table_itemlist.Ins.Get_Data(m_Data.n_EquipID);
|
||||
m_SD_Slot = ServerInfo.Ins.m_ServerData.Get_SlotData(m_Data.e_EquipParts);
|
||||
m_ESUTD = table_equipslotupgrade.Ins.Get_Data(m_Data.e_EquipParts, m_Data.e_EquipAttribute);
|
||||
}
|
||||
|
||||
protected virtual void Set_ItemInfo()
|
||||
|
|
@ -32,32 +36,60 @@ public class EquipmentPopupItemInfoBase : BackKeyAdd
|
|||
texts_iteminfo[1].text = table_itemlist.Ins.Get_ItemName(m_ItemData.n_ItemID);
|
||||
texts_iteminfo[2].text = m_ItemData.Get_ItemTypeName();
|
||||
|
||||
images_iteminfo[2].sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Format("chest_{0}", m_ItemData.e_ItemType.ToString().ToLower()));
|
||||
|
||||
Set_ItemStat();
|
||||
}
|
||||
|
||||
protected virtual void Set_ItemStat()
|
||||
{
|
||||
Set_Stat(m_Data.e_AbilityType1, texts_stat[0], texts_statval[0], m_Data.n_AbilityValue1);
|
||||
Set_Stat(m_Data.e_AbilityType2, texts_stat[1], texts_statval[1], m_Data.n_AbilityValue2);
|
||||
Set_Stat(m_Data.e_AbilityType3, texts_stat[2], texts_statval[2], m_Data.n_AbilityValue3);
|
||||
Set_Stat(0, m_Data.e_AbilityType1, m_Data.n_AbilityValue1);
|
||||
Set_Stat(1, m_Data.e_AbilityType2, m_Data.n_AbilityValue2);
|
||||
Set_Stat(2, m_Data.e_AbilityType3, m_Data.n_AbilityValue3);
|
||||
list_statdata[3].NoStat = true;
|
||||
list_statdata[3].stat = eStat.None;
|
||||
list_statdata[3].statvalue = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv);
|
||||
list_statdata[3].nextstatvalue = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv + 1);
|
||||
Set_ScrollView(list_statdata);
|
||||
|
||||
mainstatText.stat = m_ESUTD.e_OptionType;
|
||||
mainstatText.statvalue = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv);
|
||||
mainstatText.nextstatvalue = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv + 1);
|
||||
m_EquipmentStatCard.Set(mainstatText);
|
||||
}
|
||||
|
||||
void Set_Stat(eStat stat, TextMeshProUGUI t_stat, TextMeshProUGUI t_statval, int abil1)
|
||||
void Set_Stat(int index, eStat stat, int abil1)
|
||||
{
|
||||
list_statdata[index].stat = stat;
|
||||
|
||||
if (stat != eStat.None)
|
||||
{
|
||||
var smeltinglv = ServerInfo.Ins.m_ServerData.Get_SmeltingLv(m_Data.n_EquipID);
|
||||
var cursmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv);
|
||||
var nextsmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv + 1);
|
||||
|
||||
var curstat = abil1 + abil1 * cursmeltingdata.f_IncreaseValueRate;
|
||||
var nextstat = abil1 + abil1 * nextsmeltingdata.f_IncreaseValueRate;
|
||||
t_stat.text = MyText.Get_StatName(stat);
|
||||
t_statval.text = $"{NumberFormatter.FormatNumber(curstat)}<color=#fff21b>(+{NumberFormatter.FormatNumber(nextstat - curstat)})";
|
||||
list_statdata[index].statvalue = abil1 + abil1 * cursmeltingdata.f_IncreaseValueRate;
|
||||
list_statdata[index].nextstatvalue = abil1 + abil1 * nextsmeltingdata.f_IncreaseValueRate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class EquipmentStatData
|
||||
{
|
||||
public bool NoStat = false;
|
||||
public eStat stat;
|
||||
public float statvalue, nextstatvalue;
|
||||
|
||||
public string Get_ValueText()
|
||||
{
|
||||
if (NoStat) return DSUtil.Format("{0}%", statvalue);
|
||||
return MyText.Get_StatValueText(stat, statvalue);
|
||||
}
|
||||
|
||||
public string Get_AddValueText()
|
||||
{
|
||||
var cal = nextstatvalue - statvalue;
|
||||
if (NoStat)
|
||||
return DSUtil.Format("(+{0}%)", MyText.Get_StatValueText(stat, cal));
|
||||
else
|
||||
t_statval.text = t_stat.text = "";
|
||||
return DSUtil.Format("(+{0})", MyText.Get_StatValueText(stat, cal));
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ using UnityEngine.UI;
|
|||
public class EquipmentPopup_Obtain : EquipmentPopupBase
|
||||
{
|
||||
public EquipmentSimpleCard m_SmeltingMaterialCard;
|
||||
public TextMeshProUGUI[] texts; // 0 제련 레벨, 1 제련 효과, 2 제련 확률
|
||||
public TextMeshProUGUI[] texts; // 0 제련 레벨, 1 제련 효과(전), 2 제련 확률, 3 제련 효과(후)
|
||||
public Image[] images; // 0 분해 시 획득 아이템
|
||||
public TextMeshProUGUI[] texts_decomp; // 0 분해 시 획득량, 1 분해량
|
||||
public Slider slider_decomp;
|
||||
|
|
@ -39,7 +39,8 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
|
|||
m_SmeltingMaterialCard.Set_NeedAmount(m_SmeltingData.n_UpgradePrice);
|
||||
if (!DSUtil.CheckNull(m_NextSmeltingData))
|
||||
{
|
||||
texts[1].text = $"{NumberFormatter.FormatNumber(m_SmeltingData.f_IncreaseValueRate)}% >> {NumberFormatter.FormatNumber(m_NextSmeltingData.f_IncreaseValueRate)}%";
|
||||
texts[1].text = $"{NumberFormatter.FormatNumber(m_SmeltingData.f_IncreaseValueRate)}%";
|
||||
texts[3].text = $"{NumberFormatter.FormatNumber(m_NextSmeltingData.f_IncreaseValueRate)}%";
|
||||
texts[2].text = $"{NumberFormatter.FormatNumber(m_SmeltingData.f_NextStepRate)}%";
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
using TMPro;
|
||||
|
||||
public class EquipmentStatCard : CardBase
|
||||
{
|
||||
public TextMeshProUGUI[] texts; // 0 스탯명, 1 현재 스탯, 2 다음 레벨과 차이 스탯
|
||||
|
||||
public override void Set<T>(T _base)
|
||||
{
|
||||
base.Set(_base);
|
||||
var data = _base as EquipmentStatData;
|
||||
if (data.stat != eStat.None)
|
||||
{
|
||||
texts[0].text = MyText.Get_StatName(data.stat);
|
||||
Set_StatText(data);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data.NoStat)
|
||||
{
|
||||
texts[0].text = table_localtext.Ins.Get_Text(193);
|
||||
Set_StatText(data);
|
||||
}
|
||||
else
|
||||
for (int i = 0; i < texts.Length; i++)
|
||||
texts[i].text = "";
|
||||
}
|
||||
}
|
||||
|
||||
void Set_StatText(EquipmentStatData data)
|
||||
{
|
||||
texts[1].text = data.Get_ValueText();
|
||||
texts[2].text = data.Get_AddValueText();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 83d1ab368acb71f46b888902c27612fc
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue