Browse Source

Merge remote-tracking branch 'remotes/origin/master' into GFG

hexiaojie 6 months ago
parent
commit
93c34e9a5b
24 changed files with 1 additions and 0 deletions
  1. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png
  2. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png
  3. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png
  4. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png
  5. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png
  6. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png
  7. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png
  9. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png
  10. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png
  11. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png
  12. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png
  13. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5.png
  15. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.png
  17. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png
  19. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png
  21. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png
  23. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes
  24. 1 0
      GameClient/GameClient.sln.DotSettings.user

BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes


+ 1 - 0
GameClient/GameClient.sln.DotSettings.user

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAndroidJavaObject_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F472adee905604045aa2c822838c8be7811000_003Fa9_003F7c1a2e35_003FAndroidJavaObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorUtility_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003F3f_003Fa805acc1_003FEditorUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AOptionAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F16134578226e4e409ecbdd10473cf8f235000_003F4e_003Fb8b5740c_003FOptionAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	</wpf:ResourceDictionary>