NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

농장 - 가방

This commit is contained in:
Ino 2025-07-22 15:43:35 +09:00
parent 47764b46c2
commit fbc5f07c24
8 changed files with 1108 additions and 1069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/Localization.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

72
Assets/ResWork/UIPrefabs/Common/ArrowUI.prefab
View File

@ -69,7 +69,8 @@ MonoBehaviour:
m_text: 1 m_text: 1
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -183,8 +184,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -67, y: 0} m_AnchoredPosition: {x: -66.6, y: 0}
m_SizeDelta: {x: 48, y: 43} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5020332653237934012 --- !u!222 &5020332653237934012
CanvasRenderer: CanvasRenderer:
@ -209,12 +210,12 @@ MonoBehaviour:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: -10, y: -10, z: -10, w: -10}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 278b6362c73aa7e458b879eb7db52ef4, type: 3} m_Sprite: {fileID: 21300000, guid: bc1ebef4723233740a5df2679f17eff1, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -280,6 +281,7 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
LongPressDuration: 0.9
--- !u!1 &1156161939311564305 --- !u!1 &1156161939311564305
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -296,7 +298,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8960251464512571028 --- !u!224 &8960251464512571028
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -414,7 +416,8 @@ MonoBehaviour:
m_text: 100 m_text: 100
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -528,9 +531,9 @@ RectTransform:
- {fileID: 2824895774209399100} - {fileID: 2824895774209399100}
m_Father: {fileID: 8960251464512571028} m_Father: {fileID: 8960251464512571028}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 32.5, y: -21.5}
m_SizeDelta: {x: 65, y: 43} m_SizeDelta: {x: 65, y: 43}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4395579420901506399 --- !u!222 &4395579420901506399
@ -707,14 +710,15 @@ MonoBehaviour:
m_text: 000 m_text: 000
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4284624941
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
@ -731,8 +735,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 20 m_fontSize: 30
m_fontSizeBase: 20 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 10 m_fontSizeMin: 10
@ -741,7 +745,7 @@ MonoBehaviour:
m_HorizontalAlignment: 2 m_HorizontalAlignment: 2
m_VerticalAlignment: 4096 m_VerticalAlignment: 4096
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: -5
m_wordSpacing: 0 m_wordSpacing: 0
m_lineSpacing: 0 m_lineSpacing: 0
m_lineSpacingMax: 0 m_lineSpacingMax: 0
@ -808,9 +812,9 @@ RectTransform:
- {fileID: 6840686808812135919} - {fileID: 6840686808812135919}
m_Father: {fileID: 8960251464512571028} m_Father: {fileID: 8960251464512571028}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 107.5, y: -21.5}
m_SizeDelta: {x: 65, y: 43} m_SizeDelta: {x: 65, y: 43}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4354021216339559262 --- !u!222 &4354021216339559262
@ -938,7 +942,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &62856108399729853 --- !u!224 &62856108399729853
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1100,7 +1104,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 40} m_SizeDelta: {x: 190, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2322618960559761119 --- !u!222 &2322618960559761119
CanvasRenderer: CanvasRenderer:
@ -1123,15 +1127,15 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.058823533, g: 0.09411766, b: 0.14117648, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} m_Sprite: {fileID: 21300000, guid: b5b02bcc53245ec4fb4d313b65c17cea, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -1175,9 +1179,9 @@ RectTransform:
- {fileID: 8530236063779515209} - {fileID: 8530236063779515209}
m_Father: {fileID: 8960251464512571028} m_Father: {fileID: 8960251464512571028}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 182.5, y: -21.5}
m_SizeDelta: {x: 65, y: 43} m_SizeDelta: {x: 65, y: 43}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3802386761114123341 --- !u!222 &3802386761114123341
@ -1414,7 +1418,8 @@ MonoBehaviour:
m_text: 10 m_text: 10
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1528,8 +1533,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 67, y: 0} m_AnchoredPosition: {x: 70.5, y: 0}
m_SizeDelta: {x: 48, y: 43} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3619510388880991821 --- !u!222 &3619510388880991821
CanvasRenderer: CanvasRenderer:
@ -1554,12 +1559,12 @@ MonoBehaviour:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: -10, y: -10, z: -10, w: -10}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 278b6362c73aa7e458b879eb7db52ef4, type: 3} m_Sprite: {fileID: 21300000, guid: c5bd971ccc5ce5443a651f8185f7162b, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1625,6 +1630,7 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
LongPressDuration: 0.9
--- !u!1 &8694238739028838891 --- !u!1 &8694238739028838891
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1644,7 +1650,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &901830751249016047 --- !u!224 &901830751249016047
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

141
Assets/ResWork/UIPrefabs/Farm/FarmInvenCard.prefab
View File

@ -67,8 +67,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -145,7 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &3696965980901162549 --- !u!1 &1313222462269105865
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -153,23 +153,23 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 672789630079942615} - component: {fileID: 2327266826070237409}
- component: {fileID: 6693465060023257661} - component: {fileID: 5698994615478266157}
- component: {fileID: 835035273960597258} - component: {fileID: 4618519684734818148}
m_Layer: 5 m_Layer: 5
m_Name: select m_Name: t_name
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &672789630079942615 --- !u!224 &2327266826070237409
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3696965980901162549} m_GameObject: {fileID: 1313222462269105865}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
@ -177,29 +177,29 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 2654586254492435330} m_Father: {fileID: 2654586254492435330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 219}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6693465060023257661 --- !u!222 &5698994615478266157
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3696965980901162549} m_GameObject: {fileID: 1313222462269105865}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &835035273960597258 --- !u!114 &4618519684734818148
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3696965980901162549} m_GameObject: {fileID: 1313222462269105865}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -210,16 +210,75 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, type: 3} m_text: "\uC774\uB984"
m_Type: 1 m_isRightToLeft: 0
m_PreserveAspect: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_FillCenter: 1 m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
m_FillMethod: 4 m_fontSharedMaterials: []
m_FillAmount: 1 m_fontMaterial: {fileID: 0}
m_FillClockwise: 1 m_fontMaterials: []
m_FillOrigin: 0 m_fontColor32:
m_UseSpriteMesh: 0 serializedVersion: 2
m_PixelsPerUnitMultiplier: 1 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: 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: 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 &4709126412057238698 --- !u!1 &4709126412057238698
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -255,7 +314,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1703081511968104526 --- !u!222 &1703081511968104526
CanvasRenderer: CanvasRenderer:
@ -321,19 +380,19 @@ RectTransform:
m_GameObject: {fileID: 8048699258425641539} m_GameObject: {fileID: 8048699258425641539}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 7364064278516716765} - {fileID: 7364064278516716765}
- {fileID: 2327266826070237409}
- {fileID: 8778000603596238060} - {fileID: 8778000603596238060}
- {fileID: 7981725120826946780} - {fileID: 7981725120826946780}
- {fileID: 672789630079942615}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 260, y: 250}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4515538513792550110 --- !u!114 &4515538513792550110
MonoBehaviour: MonoBehaviour:
@ -347,9 +406,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65e1bc3c3ebe6f74887b8908dee1eca6, type: 3} m_Script: {fileID: 11500000, guid: 65e1bc3c3ebe6f74887b8908dee1eca6, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
i_bg: {fileID: 1490527980051943992}
i_fruit: {fileID: 6091405064671863056} i_fruit: {fileID: 6091405064671863056}
t_name: {fileID: 4618519684734818148}
t_amount: {fileID: 1824220606015581275} t_amount: {fileID: 1824220606015581275}
go_select: {fileID: 3696965980901162549} go_select: {fileID: 0}
--- !u!1 &8472834657794422358 --- !u!1 &8472834657794422358
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -382,9 +443,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 2654586254492435330} m_Father: {fileID: 2654586254492435330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -81.23, y: 15} m_AnchoredPosition: {x: 36.1, y: 42.6}
m_SizeDelta: {x: 150, y: 30} m_SizeDelta: {x: 150, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &39975557644489999 --- !u!222 &39975557644489999
@ -442,8 +503,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 20 m_fontSize: 55
m_fontSizeBase: 20 m_fontSizeBase: 55
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 10 m_fontSizeMin: 10
@ -452,7 +513,7 @@ MonoBehaviour:
m_HorizontalAlignment: 4 m_HorizontalAlignment: 4
m_VerticalAlignment: 4096 m_VerticalAlignment: 4096
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: -5
m_wordSpacing: 0 m_wordSpacing: 0
m_lineSpacing: 0 m_lineSpacing: 0
m_lineSpacingMax: 0 m_lineSpacingMax: 0

1923
Assets/Res_Addr/MainUI/NewGameUI.prefab
View File

File diff suppressed because it is too large Load Diff

14
Assets/Script/UI/Farm/FarmInvenCard.cs
View File

@ -1,12 +1,10 @@
using TMPro; using TMPro;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class FarmInvenCard : CardBase public class FarmInvenCard : CardBase
{ {
public Image i_fruit; public Image i_bg, i_fruit;
public TextMeshProUGUI t_amount; public TextMeshProUGUI t_name, t_amount;
public GameObject go_select;
int m_FruitID; int m_FruitID;
@ -19,14 +17,20 @@ public class FarmInvenCard : CardBase
{ {
m_FruitID = fruitid; m_FruitID = fruitid;
i_fruit.sprite = UIAtlasMgr.Ins.Get_Sprite(fruitid); i_fruit.sprite = UIAtlasMgr.Ins.Get_Sprite(fruitid);
t_name.text = table_itemlist.Ins.Get_ItemName(fruitid);
t_amount.text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(fruitid).ToString(); t_amount.text = ServerInfo.Ins.m_ServerData.Get_ItemAmount(fruitid).ToString();
go_select.SetActive(false); Set_Selected(false);
} }
public int Get_FruitID() { return m_FruitID; } public int Get_FruitID() { return m_FruitID; }
public override void Set_Selected(bool active)
{
i_bg.sprite = UIAtlasMgr.Ins.Get_Sprite(active ? "slot 2" : "slot 1");
}
public void OnClick_Select() public void OnClick_Select()
{ {
if (CardType != eUICardType.NoTouch)
FarmInvenUI.Ins.Set_SelectCard(this); FarmInvenUI.Ins.Set_SelectCard(this);
} }
} }

16
Assets/Script/UI/Farm/FarmInvenUI.cs
View File

@ -1,15 +1,14 @@
using System.Collections.Generic; using System.Collections.Generic;
using TMPro; using TMPro;
using UnityEngine.UI;
public class FarmInvenUI : BotMenuBase public class FarmInvenUI : BotMenuBase
{ {
public static FarmInvenUI Ins; public static FarmInvenUI Ins;
private void Start() { Ins = this; } private void Start() { Ins = this; m_FarmInvenCard.Set_CardType(eUICardType.NoTouch); }
public ArrowUI m_ArrowUI; public ArrowUI m_ArrowUI;
public Image[] images; // 0 열매 public TextMeshProUGUI[] texts; // 0 이름, 1 설명, 2 스탯 증가량, 3 먹은 갯수
public TextMeshProUGUI[] texts; // 0 이름, 1 설명, 2 스탯 증가량, 3 갯수, 4 먹은 갯수 public FarmInvenCard m_FarmInvenCard;
FarmInvenCard SelectCard; FarmInvenCard SelectCard;
List<int> list_fruit = new List<int>(); List<int> list_fruit = new List<int>();
@ -33,22 +32,21 @@ public class FarmInvenUI : BotMenuBase
public void Set_SelectCard(FarmInvenCard card) public void Set_SelectCard(FarmInvenCard card)
{ {
if (!DSUtil.CheckNull(SelectCard)) if (!DSUtil.CheckNull(SelectCard))
SelectCard.go_select.SetActive(false); SelectCard.Set_Selected(false);
SelectCard = card; SelectCard = card;
SelectCard.go_select.SetActive(true); SelectCard.Set_Selected(true);
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
var id = SelectCard.Get_FruitID(); var id = SelectCard.Get_FruitID();
var itemData = table_itemlist.Ins.Get_Data(id); var itemData = table_itemlist.Ins.Get_Data(id);
var amount = (int)sdata.Get_ItemAmount(id); var amount = (int)sdata.Get_ItemAmount(id);
images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(id); m_FarmInvenCard.Set(itemData.n_ItemID);
texts[0].text = table_itemlist.Ins.Get_ItemName(itemData.n_ItemID); texts[0].text = table_itemlist.Ins.Get_ItemName(itemData.n_ItemID);
texts[1].text = table_itemlist.Ins.Get_ItemDesc(itemData.n_ItemID); texts[1].text = table_itemlist.Ins.Get_ItemDesc(itemData.n_ItemID);
texts[2].text = table_fruit.Ins.Get_Data_orNull(id).Get_Desc(); texts[2].text = table_fruit.Ins.Get_Data_orNull(id).Get_Desc();
texts[3].text = amount.ToString(); texts[3].text = $"(확인용)먹은 갯수 : {sdata.Get_EatFruitCount(id)}";
texts[4].text = $"(확인용)먹은 갯수 : {sdata.Get_EatFruitCount(id)}";
m_ArrowUI.Set(totalcount => { }, amount); m_ArrowUI.Set(totalcount => { }, amount);
} }

7
Assets/Script/UI/NewGameUI.cs
View File

@ -142,5 +142,10 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
#endif #endif
} }
} }
public void OnClick_FarmButton(int index) { FarmMenu[index].Set(); } public void OnClick_FarmButton(int index)
{
for (int i = 0; i < FarmMenu.Length; i++)
FarmMenu[i].OnClick_Back();
FarmMenu[index].Set();
}
} }