diff --git a/Assets/arts/atlas/ui/idle.spriteatlas b/Assets/arts/atlas/ui/idle.spriteatlas index f55252348..ee82bcc3f 100644 --- a/Assets/arts/atlas/ui/idle.spriteatlas +++ b/Assets/arts/atlas/ui/idle.spriteatlas @@ -61,8 +61,18 @@ SpriteAtlas: isAtlasV2: 0 cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: 2fd76f40a32434e1da5f94547de8c63b, type: 3} + - {fileID: 21300000, guid: 2a06ab014368e48798afcf97340d9d18, type: 3} + - {fileID: 21300000, guid: 7f6b2c56743c44d739737dc0061e7a7a, type: 3} + - {fileID: 21300000, guid: 8c93f30bb29ba4e55a4b515e6d2665a7, type: 3} + - {fileID: 21300000, guid: 0dba7eaca049f4ccbbf6d95f974817a3, type: 3} + m_PackedSpriteNamesToIndex: + - idle_dec_1 + - idle_bg_1 + - idle_bg_3 + - idle_bg_2 + - idle_bg_4 m_RenderDataMap: {} m_Tag: idle m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/talent.asset b/Assets/arts/atlas/ui/talent.asset index e77aa5daa..8c665ab25 100644 --- a/Assets/arts/atlas/ui/talent.asset +++ b/Assets/arts/atlas/ui/talent.asset @@ -13,6 +13,22 @@ MonoBehaviour: m_Name: talent m_EditorClassIdentifier: spriteList: + - {fileID: 21300000, guid: 617d7100d8b3146a8973efe525d3a335, type: 3} + - {fileID: 21300000, guid: daf2ff2f9984c4846a19cf0d7740cbd3, type: 3} + - {fileID: 21300000, guid: 02f2c2fc62d50460785c942cce38a130, type: 3} + - {fileID: 21300000, guid: 9be39ec1367654f208478b0835cc2c33, type: 3} + - {fileID: 21300000, guid: a29f9533a9d5a4f13852bb2d1944dfc6, type: 3} + - {fileID: 21300000, guid: a3928be12758449848698885b2caecbf, type: 3} + - {fileID: 21300000, guid: f43cab51f10d54a16a9828528ce687c6, type: 3} + - {fileID: 21300000, guid: fc2a401defe034931aa4beed54b74837, type: 3} + - {fileID: 21300000, guid: 1e64e1683d8414f698b9b1d49321f558, type: 3} + - {fileID: 21300000, guid: 5686fd6a92d6e45a7a5979259843c6b3, type: 3} + - {fileID: 21300000, guid: cb51cf2e35d914c5c8358ac9b47fa649, type: 3} + - {fileID: 21300000, guid: ee9f2c6476798443f9d2f0e59ea05db2, type: 3} + - {fileID: 21300000, guid: 5d3d79b84aeee490394082531f55ef70, type: 3} + - {fileID: 21300000, guid: c61a4caad53cb4a049f3c5740f7fe3b5, type: 3} + - {fileID: 21300000, guid: 4e9f39634d8284dfd8c78ef4bcfd7616, type: 3} + - {fileID: 21300000, guid: 0e322e5e5631c40c99fc6befd5f89727, type: 3} - {fileID: 21300000, guid: d738cd91d28e34fcabdcc6149ea6a1fc, type: 3} - {fileID: 21300000, guid: f2adb24dfa54941f8b4238afc1cf7c12, type: 3} - spriteNameList: 2ad672162bd67216 + spriteNameList: 9e3153db5202138f5302138f5402138f5502138f5602138f5702138f5802138f9f3153dba03153dba13153dba23153dba33153dba43153dba53153dba63153db2ad672162bd67216 diff --git a/Assets/arts/atlas/ui/talent.spriteatlas b/Assets/arts/atlas/ui/talent.spriteatlas index fc375901d..67b6aeeab 100644 --- a/Assets/arts/atlas/ui/talent.spriteatlas +++ b/Assets/arts/atlas/ui/talent.spriteatlas @@ -61,8 +61,44 @@ SpriteAtlas: isAtlasV2: 0 cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: 617d7100d8b3146a8973efe525d3a335, type: 3} + - {fileID: 21300000, guid: f43cab51f10d54a16a9828528ce687c6, type: 3} + - {fileID: 21300000, guid: d738cd91d28e34fcabdcc6149ea6a1fc, type: 3} + - {fileID: 21300000, guid: 9be39ec1367654f208478b0835cc2c33, type: 3} + - {fileID: 21300000, guid: a3928be12758449848698885b2caecbf, type: 3} + - {fileID: 21300000, guid: a29f9533a9d5a4f13852bb2d1944dfc6, type: 3} + - {fileID: 21300000, guid: 4e9f39634d8284dfd8c78ef4bcfd7616, type: 3} + - {fileID: 21300000, guid: ee9f2c6476798443f9d2f0e59ea05db2, type: 3} + - {fileID: 21300000, guid: 1e64e1683d8414f698b9b1d49321f558, type: 3} + - {fileID: 21300000, guid: 5d3d79b84aeee490394082531f55ef70, type: 3} + - {fileID: 21300000, guid: 5686fd6a92d6e45a7a5979259843c6b3, type: 3} + - {fileID: 21300000, guid: c61a4caad53cb4a049f3c5740f7fe3b5, type: 3} + - {fileID: 21300000, guid: 02f2c2fc62d50460785c942cce38a130, type: 3} + - {fileID: 21300000, guid: fc2a401defe034931aa4beed54b74837, type: 3} + - {fileID: 21300000, guid: f2adb24dfa54941f8b4238afc1cf7c12, type: 3} + - {fileID: 21300000, guid: cb51cf2e35d914c5c8358ac9b47fa649, type: 3} + - {fileID: 21300000, guid: 0e322e5e5631c40c99fc6befd5f89727, type: 3} + - {fileID: 21300000, guid: daf2ff2f9984c4846a19cf0d7740cbd3, type: 3} + m_PackedSpriteNamesToIndex: + - talent_1 + - talent_15 + - talent_bg_1 + - talent_12 + - talent_14 + - talent_13 + - talent_8 + - talent_5 + - talent_2 + - talent_6 + - talent_3 + - talent_7 + - talent_11 + - talent_16 + - talent_bg_2 + - talent_4 + - talent_9 + - talent_10 m_RenderDataMap: {} m_Tag: talent m_IsVariant: 0 diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index eba8acfa0..294155b1b 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/common/module_manager.lua.bytes b/Assets/lua/app/common/module_manager.lua.bytes index 0ac5537a1..8074209a5 100644 Binary files a/Assets/lua/app/common/module_manager.lua.bytes and b/Assets/lua/app/common/module_manager.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 70a84db01..4bd054098 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/maincity/maincity_const.lua.bytes b/Assets/lua/app/module/maincity/maincity_const.lua.bytes index cbe65178b..072380584 100644 Binary files a/Assets/lua/app/module/maincity/maincity_const.lua.bytes and b/Assets/lua/app/module/maincity/maincity_const.lua.bytes differ diff --git a/Assets/lua/app/module/talent.meta b/Assets/lua/app/module/talent.meta new file mode 100644 index 000000000..260d50eaa --- /dev/null +++ b/Assets/lua/app/module/talent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f88a6445bf6854d56957c051d5a3dabc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/module/talent/talent_manager.lua.bytes b/Assets/lua/app/module/talent/talent_manager.lua.bytes new file mode 100644 index 000000000..b98f6be7c Binary files /dev/null and b/Assets/lua/app/module/talent/talent_manager.lua.bytes differ diff --git a/Assets/lua/app/module/talent/talent_manager.lua.bytes.meta b/Assets/lua/app/module/talent/talent_manager.lua.bytes.meta new file mode 100644 index 000000000..ac6b58983 --- /dev/null +++ b/Assets/lua/app/module/talent/talent_manager.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c30bcd0f152048709dd3ac5acf15c81 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/common/cell/player_info_cell.lua.bytes b/Assets/lua/app/ui/common/cell/player_info_cell.lua.bytes index 4305112c0..e61d35df6 100644 Binary files a/Assets/lua/app/ui/common/cell/player_info_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/player_info_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/company.meta b/Assets/lua/app/ui/company.meta new file mode 100644 index 000000000..617e4c337 --- /dev/null +++ b/Assets/lua/app/ui/company.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc5a1adac7d5042509944357cf52fd66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/company/company_comp.lua.bytes b/Assets/lua/app/ui/company/company_comp.lua.bytes new file mode 100644 index 000000000..9e80077a3 --- /dev/null +++ b/Assets/lua/app/ui/company/company_comp.lua.bytes @@ -0,0 +1,5 @@ +bf_encrypt_luai)1X+H-8GH:uua0 +3D9xI4k5MR0qYxsDX9\b1_V J'V9UL1_GTD9xI4k5MR1r{i8rcDyxtk5pqUs D9xCt!0q{)8CD9yo45HR0quo[7J|EwX=3^2UaIu (wX==^94j? R6q)85e9r r0=18eD9 jM0wqi8vc1P5(Do;*7D3]=.\=0dR(U+La\Z$D +[4 S(\=k A#V! { 'R4 GP#7Bpqi8reE9xI4l5MR9qqi8rgA9xI2kuMUp1qe2e`yxHkMQ0qqm6? + L,y +[,5Uugl !W UT*7BuzP X'a"4MR0qqi8reA9xIreD?xI4m5MR7qqi?reD0xI4l5MR:qqi9reD< ,X 5MR0|qi8seD9}q%cM^0qqd8reE9zH4k5kRqqi8reD9xI4k5LR0q|i8rdD9xLGY+R0qqh8reD9xI>k5MS0qqh8reE9xI5k5MX0qqj8reI9xI8k5M]0qqf8reE9xI8(Z "Q*W@9xI>k5MS0qqlg7+ \ No newline at end of file diff --git a/Assets/lua/app/ui/company/company_comp.lua.bytes.meta b/Assets/lua/app/ui/company/company_comp.lua.bytes.meta new file mode 100644 index 000000000..1aca3d44f --- /dev/null +++ b/Assets/lua/app/ui/company/company_comp.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7813ce7cb30274e199e694c6686cb148 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes b/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes index 032c92e96..e83ab90d6 100644 Binary files a/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes and b/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 184b6a66a..9e17cef1b 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent.meta b/Assets/lua/app/ui/talent.meta new file mode 100644 index 000000000..8bbae68ae --- /dev/null +++ b/Assets/lua/app/ui/talent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4492ab6226bc34ae3bd3c28c50c6a760 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/talent/cell.meta b/Assets/lua/app/ui/talent/cell.meta new file mode 100644 index 000000000..f192ffaf6 --- /dev/null +++ b/Assets/lua/app/ui/talent/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 379397e40a53c4e44826830ad76071a0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes new file mode 100644 index 000000000..cfea64a72 Binary files /dev/null and b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes.meta b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes.meta new file mode 100644 index 000000000..5032b6ff2 --- /dev/null +++ b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f8859faa810b04f05a18fff97cb3699c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes new file mode 100644 index 000000000..79ee5ee1a Binary files /dev/null and b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes.meta b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes.meta new file mode 100644 index 000000000..caaf347b2 --- /dev/null +++ b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c61d6d3f05f6940c68daebb0a4018cd7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/userdata/player/player_data.lua.bytes b/Assets/lua/app/userdata/player/player_data.lua.bytes index a44778b3b..41432bf50 100644 Binary files a/Assets/lua/app/userdata/player/player_data.lua.bytes and b/Assets/lua/app/userdata/player/player_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent.meta b/Assets/lua/app/userdata/talent.meta new file mode 100644 index 000000000..4d34f659e --- /dev/null +++ b/Assets/lua/app/userdata/talent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea660412827fc4f5db4baa4483cd811e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes new file mode 100644 index 000000000..68ab699e0 Binary files /dev/null and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes.meta b/Assets/lua/app/userdata/talent/talent_data.lua.bytes.meta new file mode 100644 index 000000000..ab59fea6e --- /dev/null +++ b/Assets/lua/app/userdata/talent/talent_data.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bee623eb92afb4dcd8f57095101bfdb0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/talent/cell/talent_cell.prefab b/Assets/prefabs/ui/talent/cell/talent_cell.prefab index cf5b4c730..afe034902 100644 --- a/Assets/prefabs/ui/talent/cell/talent_cell.prefab +++ b/Assets/prefabs/ui/talent/cell/talent_cell.prefab @@ -195,14 +195,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 1bf9c73960324d3439e0db7c0390d805, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 617d7100d8b3146a8973efe525d3a335, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab index 0a18e7342..b0b501ebc 100644 --- a/Assets/prefabs/ui/talent/talent_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -166,8 +166,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -542,6 +542,97 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4605869274671160097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5045946273449496793} + - component: {fileID: 3746859718409957444} + - component: {fileID: 2656520159928458073} + - component: {fileID: 1783627864507438331} + m_Layer: 5 + m_Name: up_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5045946273449496793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605869274671160097} + 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: 7281719863256343853} + m_Father: {fileID: 8461932745927490369} + m_RootOrder: 10 + 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 &3746859718409957444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605869274671160097} + m_CullTransparentMesh: 1 +--- !u!114 &2656520159928458073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605869274671160097} + 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: 0, g: 0, b: 0, a: 0.972549} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1783627864507438331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605869274671160097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &4674672158768797952 GameObject: m_ObjectHideFlags: 0 @@ -869,7 +960,9 @@ RectTransform: - {fileID: 6034806423593252542} - {fileID: 8290202944170257985} - {fileID: 5819254699045122669} + - {fileID: 5365624437677017111} - {fileID: 3007666643480997547} + - {fileID: 5045946273449496793} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -961,6 +1054,22 @@ MonoBehaviour: hashName: 1668032503 objectType: 0 gameObject: {fileID: 1914987686953387228} + - name: talent_ui.get_btn.cost.icon + hashName: 2092705880 + objectType: 0 + gameObject: {fileID: 5106324677975151048} + - name: talent_ui.up_node + hashName: 1440195839 + objectType: 0 + gameObject: {fileID: 4605869274671160097} + - name: talent_ui.up_node.talent_cell + hashName: 1214519910 + objectType: 1 + gameObject: {fileID: 1302123539969920910} + - name: talent_ui.desc_tx + hashName: 3235709643 + objectType: 0 + gameObject: {fileID: 6302900973330810534} --- !u!1 &6112171584820915872 GameObject: m_ObjectHideFlags: 0 @@ -1127,6 +1236,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &6302900973330810534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5365624437677017111} + - component: {fileID: 8732676037984040672} + - component: {fileID: 4622275080104854225} + m_Layer: 0 + m_Name: desc_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5365624437677017111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6302900973330810534} + 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: 8461932745927490369} + m_RootOrder: 8 + 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: 154} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8732676037984040672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6302900973330810534} + m_CullTransparentMesh: 1 +--- !u!114 &4622275080104854225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6302900973330810534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 0.98039216, g: 0.22352941, b: 0.22352941, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 0.32941177, g: 0.972549, b: 1, a: 1} + topRight: {r: 0.32941177, g: 0.972549, 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: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 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 &6610133400071158306 GameObject: m_ObjectHideFlags: 0 @@ -1162,9 +1406,9 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 930} + m_SizeDelta: {x: 0, y: -350} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4340914525094036941 CanvasRenderer: @@ -1311,11 +1555,11 @@ RectTransform: - {fileID: 3673435854232170551} - {fileID: 8039386801513144744} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 8 + m_RootOrder: 9 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: 218} + m_AnchoredPosition: {x: 0, y: 228} m_SizeDelta: {x: 288, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4612482372435177515 @@ -1691,3 +1935,110 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} m_PrefabInstance: {fileID: 5499353799589186994} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5984717418218748626 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5045946273449496793} + m_Modifications: + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_SizeDelta.x + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_SizeDelta.y + value: 216 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692731834399831388, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Name + value: talent_cell + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} +--- !u!1 &1302123539969920910 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4692731834399831388, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + m_PrefabInstance: {fileID: 5984717418218748626} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7281719863256343853 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + m_PrefabInstance: {fileID: 5984717418218748626} + m_PrefabAsset: {fileID: 0}