Merge branch 'master' of gitlab.huolea.com:shujianhe/tusegamecolor

# Conflicts:
#	Assets/scripts/Views/maingame/HomePageLibrary.cs.meta
#	Assets/scripts/common/ITableView.meta
#	Assets/scripts/common/ITableView/TableView.cs.meta
#	Assets/scripts/common/UListView.meta
#	Assets/scripts/common/UTableView.meta
#	Assets/scripts/perfabItems/mainImageItem.cs.meta
#	Assets/scripts/perfabItems/prfb_hor_item.cs.meta
#	UserSettings/EditorUserSettings.asset
#	UserSettings/Layouts/default-2022.dwlt

.gitignore

@@ -18,7 +18,8 @@
 /1.app
 /Assets/Scenes/MainHallGame.unity
 /Assets/Scenes/MainHallGame.unity.meta
-
+/TMPro
 /UserSettings/Layouts/default-2022.dwlt
 /obj
 *.cache
+/UserSettings
\ No newline at end of file

Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta

-fileFormatVersion: 2
-guid: 580e7d5c598ddb74799f0e89fc56a121
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta

-fileFormatVersion: 2
-guid: 269ea26a2137fd14a8ff4821e56d81c3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

UserSettings/EditorUserSettings.asset

@@ -6,13 +6,24 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedSceneGuid-0:
+<<<<<<< HEAD
       value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
       flags: 0
     RecentlyUsedSceneGuid-1:
       value: 0752045f560d5a025a0b5f7b12250e44424f407b757b7e612b7d4e61b3e13061
+=======
+      value: 5b04565656070c025e0a547743270744174f4a73292c7f64782b4e62b1b1616a
+      flags: 0
+    RecentlyUsedSceneGuid-1:
+      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
+>>>>>>> 1070cad... 1
       flags: 0
     RecentlyUsedSceneGuid-2:
+<<<<<<< HEAD
       value: 0009045f50565e0b0b0d5c7a42270a44134f412e747a74647f7c4c61e1b7626e
+=======
+      value: 0752045f560d5a025a0b5f7b12250e44424f407b757b7e612b7d4e61b3e13061
+>>>>>>> b1b7842439554a76566c99c79a6d989a2b093488
       flags: 0
     RecentlyUsedSceneGuid-3:
       value: 5b04565656070c025e0a547743270744174f4a73292c7f64782b4e62b1b1616a