diff --git a/Assets/ResWork/Table/Export/AwakenConfig.json b/Assets/ResWork/Table/Export/AwakenConfig.json index 3cca55fac..6fa005f8f 100644 --- a/Assets/ResWork/Table/Export/AwakenConfig.json +++ b/Assets/ResWork/Table/Export/AwakenConfig.json @@ -1 +1 @@ -[{"e_UpgradeStatType": "STR", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "STR_ADD", "n_DefaultUpgradeValue": "100000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "200000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "300000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "400000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "DEX_ADD", "n_DefaultUpgradeValue": "500000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "600000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "700000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "800000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "INT_ADD", "n_DefaultUpgradeValue": "900000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "1000000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "1100000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "1200000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "LUK_ADD", "n_DefaultUpgradeValue": "1300000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "1400000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "1500000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "1600000", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}] \ No newline at end of file +[{"e_UpgradeStatType": "STR", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "STR_ADD", "n_DefaultUpgradeValue": "1", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "2", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "3", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "STR", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "4", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "DEX_ADD", "n_DefaultUpgradeValue": "5", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "6", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "7", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "DEX", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "8", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "INT_ADD", "n_DefaultUpgradeValue": "9", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "10", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "11", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "INT", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "12", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "1", "e_UpgradeOptionType": "LUK_ADD", "n_DefaultUpgradeValue": "13", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "2", "e_UpgradeOptionType": "HP_ADD", "n_DefaultUpgradeValue": "14", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "3", "e_UpgradeOptionType": "ATK_ADD", "n_DefaultUpgradeValue": "15", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}, {"e_UpgradeStatType": "LUK", "n_UpgradeOrder": "4", "e_UpgradeOptionType": "DEF_ADD", "n_DefaultUpgradeValue": "16", "f_LevelPerUpgradeValue": "1.5", "f_BalanceConstant": "0.032"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 2f4411d42..c53748396 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab index a5fce4e5b..4fc429fa7 100644 --- a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab +++ b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab @@ -23,18 +23,56 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 956843795768980376} - 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: 6245114044720075376} + m_Father: {fileID: 161820827906782735} 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: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1121993292394959145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 315260405571505638} + m_Layer: 5 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &315260405571505638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121993292394959145} + 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: 6559720101035741911} + - {fileID: 279882438281702794} + - {fileID: 3922329178438739542} + m_Father: {fileID: 6245114044720075376} + 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 &1188724857551080037 GameObject: m_ObjectHideFlags: 0 @@ -212,12 +250,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2452685547022655991} - 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: 6245114044720075376} + m_Father: {fileID: 161820827906782735} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -372,17 +410,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2727674756677301650} - 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: 6245114044720075376} + m_Father: {fileID: 315260405571505638} 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: 115, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3468087745646189725 CanvasRenderer: @@ -405,15 +443,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} 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: 79ed91652c5ba0c4a9b13c86ce407722, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -447,18 +485,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3461405196294374866} - 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: - {fileID: 7263991783333387616} - m_Father: {fileID: 6245114044720075376} + m_Father: {fileID: 315260405571505638} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 7.5} - m_SizeDelta: {x: 100, y: 30} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 117, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5152888177332821640 CanvasRenderer: @@ -529,7 +567,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9120204155156855367} - m_Father: {fileID: 6245114044720075376} + m_Father: {fileID: 161820827906782735} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -737,12 +775,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5158015191648705450} - - {fileID: 2403893713390902708} - - {fileID: 3922329178438739542} - - {fileID: 6764527112815540176} - - {fileID: 8396956566727566944} - - {fileID: 279882438281702794} + - {fileID: 161820827906782735} + - {fileID: 315260405571505638} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -767,12 +801,131 @@ MonoBehaviour: label_cooltime: {fileID: 4529520284872784749} images: - {fileID: 947158813515997121} + - {fileID: 6816610577342458138} - {fileID: 9106799318411996304} + - {fileID: 4636610871429585998} texts: - {fileID: 8851005608576428244} + gos_type: + - {fileID: 4113569226595764447} + - {fileID: 1121993292394959145} gos: - {fileID: 3461405196294374866} - {fileID: 2727674756677301650} +--- !u!1 &4113569226595764447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 161820827906782735} + m_Layer: 5 + m_Name: Battle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &161820827906782735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113569226595764447} + 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: 5158015191648705450} + - {fileID: 2403893713390902708} + - {fileID: 6764527112815540176} + - {fileID: 8396956566727566944} + m_Father: {fileID: 6245114044720075376} + 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 &4192589665411385251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6559720101035741911} + - component: {fileID: 1316323656774296656} + - component: {fileID: 6816610577342458138} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6559720101035741911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192589665411385251} + 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: 315260405571505638} + 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: 115, y: 115} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1316323656774296656 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192589665411385251} + m_CullTransparentMesh: 1 +--- !u!114 &6816610577342458138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192589665411385251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9970de3787141654389a70952c62dc05, 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 &6247733475211238780 GameObject: m_ObjectHideFlags: 0 @@ -798,12 +951,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6247733475211238780} - 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: 6245114044720075376} + m_Father: {fileID: 161820827906782735} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 968e2d3cd..4f0dd59f3 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -11056,7 +11056,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: -591.4, y: 362.2} + m_AnchoredPosition: {x: -593.6, y: 362.2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1622892904157947200 @@ -11077,7 +11077,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 16.5 + m_Spacing: 9 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -13658,6 +13658,43 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 357 +--- !u!1 &999200399662683086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8512198025434294965} + m_Layer: 5 + m_Name: off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8512198025434294965 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999200399662683086} + 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: 1153655177042019506} + - {fileID: 3817792774595916903} + m_Father: {fileID: 4955096466727728541} + 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: 40.87} + m_SizeDelta: {x: 166.64, y: 47} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1002596415741648106 GameObject: m_ObjectHideFlags: 0 @@ -14823,6 +14860,8 @@ MonoBehaviour: m_TabSkillType: {fileID: 7020659804515039908} m_BattleUI: {fileID: 7428565726797854333} m_SkillEquipUI: {fileID: 5000648320217079029} + texts: + - {fileID: 5678587271873564975} --- !u!1 &1076148488334824116 GameObject: m_ObjectHideFlags: 0 @@ -19807,8 +19846,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 407300959831435541} - - {fileID: 7650646310221133338} + - {fileID: 7621742189476584773} + - {fileID: 8512198025434294965} m_Father: {fileID: 7601946830866075186} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -19828,18 +19867,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: - m_TabType: 1 + m_TabType: 2 BGImage_on: tab menu selected BGImage_off: tab menu - gos_onoff: [] + gos_onoff: + - {fileID: 2563239171431098099} + - {fileID: 999200399662683086} gos_off: [] - m_btn: {fileID: 2728988772781752372} - images: - - {fileID: 3108564978987759120} - TextCol_on: {r: 0.28627452, g: 0.16078432, b: 0.09019608, a: 1} + m_btn: {fileID: 1594084691142078795} + images: [] + TextCol_on: {r: 1, g: 1, b: 1, a: 1} TextCol_off: {r: 1, g: 1, b: 1, a: 1} texts: - {fileID: 3829523605195096373} + - {fileID: 1207394060063698035} --- !u!1 &1400472963099907056 GameObject: m_ObjectHideFlags: 0 @@ -34211,8 +34252,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 13.32, y: 0} + m_AnchoredPosition: {x: 4.4, y: 0.000043363954} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1602482131565156144 MonoBehaviour: @@ -34241,15 +34282,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 - m_Top: 0 + m_Top: 5 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 124, y: 124} - m_Spacing: {x: 8, y: 8} + m_CellSize: {x: 115, y: 115} + m_Spacing: {x: 11, y: 64} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &2274511714690283068 @@ -38609,6 +38650,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2563239171431098099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7621742189476584773} + m_Layer: 5 + m_Name: on + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7621742189476584773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2563239171431098099} + 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: 407300959831435541} + - {fileID: 7650646310221133338} + m_Father: {fileID: 4955096466727728541} + 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: 48.73} + m_SizeDelta: {x: 172.02, y: 62.72} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2567969218836443723 GameObject: m_ObjectHideFlags: 0 @@ -56858,8 +56936,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -332.38, y: -106.94} - m_SizeDelta: {x: 527.45, y: 656} + m_AnchoredPosition: {x: -332.38, y: -98.57} + m_SizeDelta: {x: 527.45, y: 672.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7520319997514913829 CanvasRenderer: @@ -57697,12 +57775,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3881666577567968128} - 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: 4955096466727728541} + m_Father: {fileID: 7621742189476584773} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -57740,15 +57818,14 @@ MonoBehaviour: m_text: "\uC9C1\uC5C5 \uC2A4\uD0AC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, 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: 4279707977 - m_fontColor: {r: 0.28627452, g: 0.16078432, b: 0.09019608, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -76499,6 +76576,139 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 251 +--- !u!1 &5192604927144681607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153655177042019506} + - component: {fileID: 6552030521253551113} + - component: {fileID: 290948256734357250} + - component: {fileID: 1594084691142078795} + - component: {fileID: 8437435253569571012} + m_Layer: 5 + m_Name: i_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1153655177042019506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5192604927144681607} + 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: 8512198025434294965} + 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 &6552030521253551113 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5192604927144681607} + m_CullTransparentMesh: 1 +--- !u!114 &290948256734357250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5192604927144681607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 54ac0b7bd53a07943898d6a36e98715a, 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!114 &1594084691142078795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5192604927144681607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3108564978987759120} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8437435253569571012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5192604927144681607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5198251453486124893 GameObject: m_ObjectHideFlags: 0 @@ -86375,6 +86585,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5989676975516823687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3817792774595916903} + - component: {fileID: 2647028304772644399} + - component: {fileID: 1207394060063698035} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3817792774595916903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989676975516823687} + 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: 8512198025434294965} + 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 &2647028304772644399 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989676975516823687} + m_CullTransparentMesh: 1 +--- !u!114 &1207394060063698035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989676975516823687} + 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: "\uC9C1\uC5C5 \uC2A4\uD0AC" + 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: 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: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -3 + 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 &6001790012516587183 GameObject: m_ObjectHideFlags: 0 @@ -90790,8 +91135,6 @@ GameObject: - component: {fileID: 407300959831435541} - component: {fileID: 1962282530409927735} - component: {fileID: 3108564978987759120} - - component: {fileID: 2728988772781752372} - - component: {fileID: 5188921062785075024} m_Layer: 5 m_Name: i_bg m_TagString: Untagged @@ -90806,12 +91149,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6348965339980971349} - 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: 4955096466727728541} + m_Father: {fileID: 7621742189476584773} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -90846,7 +91189,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 601df51e90937754a84bad8c9c53dfce, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -90856,62 +91199,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2728988772781752372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6348965339980971349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3108564978987759120} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &5188921062785075024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6348965339980971349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6349170045000277078 GameObject: m_ObjectHideFlags: 0 @@ -91958,6 +92245,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6396706363501314334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4208996827714799269} + - component: {fileID: 9028508656824068239} + - component: {fileID: 4463883836272317767} + m_Layer: 5 + m_Name: amount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4208996827714799269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6396706363501314334} + 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: 5993905288546268936} + m_Father: {fileID: 4470463033473170248} + 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: -340.3, y: 278.7} + m_SizeDelta: {x: 140, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9028508656824068239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6396706363501314334} + m_CullTransparentMesh: 1 +--- !u!114 &4463883836272317767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6396706363501314334} + 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: 2a328e6a4c5557546bf78786dcd1d497, 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 &6406523659474228849 GameObject: m_ObjectHideFlags: 0 @@ -102149,12 +102512,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4470463033473170248} + m_Father: {fileID: 4208996827714799269} 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: -133.5, y: 251.6} - m_SizeDelta: {x: 100, y: 100} + 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 &7039786093810433899 CanvasRenderer: @@ -102194,8 +102557,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: @@ -102219,7 +102582,7 @@ MonoBehaviour: m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: -3 @@ -106096,9 +106459,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1988907202823209280} - {fileID: 7601946830866075186} - {fileID: 2458458731928363} - - {fileID: 5993905288546268936} + - {fileID: 4208996827714799269} - {fileID: 6964561244763951183} m_Father: {fileID: 2331490513192813796} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -117554,7 +117918,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: -546.1, y: 258} + m_AnchoredPosition: {x: -336, y: 314.2} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9144352830375713170 @@ -117595,8 +117959,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: @@ -118807,7 +119171,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 27, y: 0} + m_AnchoredPosition: {x: 7, y: 0} m_SizeDelta: {x: 15, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &8835890497440883537 @@ -122480,6 +122844,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8562590346935795449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1988907202823209280} + - component: {fileID: 7353218912902346666} + - component: {fileID: 2364179633927778753} + m_Layer: 5 + m_Name: bg_skilllst + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1988907202823209280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8562590346935795449} + 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: 4470463033473170248} + 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: -339.26, y: -68.78} + m_SizeDelta: {x: 599.66, y: 854.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7353218912902346666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8562590346935795449} + m_CullTransparentMesh: 1 +--- !u!114 &2364179633927778753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8562590346935795449} + 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: 514fba7e342918441a7024c71844a09b, 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 &8564094185518630953 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index f8518ea11..d097e6954 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -2254,6 +2254,7 @@ public class Actor : MyCoroutine public virtual void Event_Idle(int a) { CurAnim = eAnim.Idle; + m_animation.speed = 1f; #if UNITY_EDITOR if (SettingsMain.Ins) SettingsMain.Ins.Add_Event(System.Reflection.MethodBase.GetCurrentMethod().Name, 1, a); #endif diff --git a/Assets/Script/UI/Skill/SkillCard.cs b/Assets/Script/UI/Skill/SkillCard.cs index 50e97582a..7a17b81a6 100644 --- a/Assets/Script/UI/Skill/SkillCard.cs +++ b/Assets/Script/UI/Skill/SkillCard.cs @@ -9,8 +9,9 @@ public class SkillCard : CardCoolTimeBase, IDropHandler { public static Dictionary> dic_button = new Dictionary>(); - public Image[] images; // 0 아이콘, 1 버튼 + public Image[] images; // 0 1 아이콘, 2 버튼, 3 상태bg public TextMeshProUGUI[] texts; // 0 상태 + public GameObject[] gos_type; // 0 전투, 1 ui public GameObject[] gos; // 0 상태, 1 잠김 SkillDragItem m_skillDragItem; @@ -27,12 +28,21 @@ public class SkillCard : CardCoolTimeBase, IDropHandler if (!DSUtil.CheckNull(m_Data)) { var sdata = ServerInfo.Ins.m_ServerData; - images[0].sprite = m_Data.Get_Icon(); - gos[0].SetActive(true); - gos[1].SetActive(sdata.Get_SkillLv(eRole.PC, m_Data.n_SkillID) == 0); + images[0].sprite = images[1].sprite = m_Data.Get_Icon(); + var lv = sdata.Get_SkillLv(eRole.PC, m_Data.n_SkillID); + gos[0].SetActive(lv > 0); + gos[1].SetActive(lv == 0); - texts[0].text = table_localtext.Ins.Get_Text(sdata.IsEquipSkill(m_Data.n_SkillID, sdata.Equip.Preset) ? - 207 : 402); + if (sdata.IsEquipSkill(m_Data.n_SkillID, sdata.Equip.Preset)) + { + texts[0].text = table_localtext.Ins.Get_Text(207); + images[3].sprite = UIAtlasMgr.Ins.Get_Sprite("label 5"); + } + else + { + texts[0].text = table_localtext.Ins.Get_Text(402); + images[3].sprite = UIAtlasMgr.Ins.Get_Sprite("label 3"); + } } else { @@ -59,27 +69,33 @@ public class SkillCard : CardCoolTimeBase, IDropHandler public override void Set_CardType(eUICardType _type) { base.Set_CardType(_type); - var et = images[1].GetComponent(); + var et = images[2].GetComponent(); switch (CardType) { case eUICardType.UI: + DSUtil.InActivateGameObjects(gos_type, 1); et.enabled = false; - images[0].raycastTarget = true; - images[1].GetComponent