Browse Source

添加新的流程

DESKTOP-FB72PO8\Administrator 8 tháng trước cách đây
mục cha
commit
cbf918f857
100 tập tin đã thay đổi với 1605 bổ sung2185 xóa
  1. 2 0
      .gitignore
  2. 0 627
      Assets/Art/NewShaderVariants.shadervariants
  3. 0 8
      Assets/Art/NewShaderVariants.shadervariants.meta
  4. 2 2
      Assets/Art/UIAnimation/ShowTextWidget.controller
  5. 8 0
      Assets/HybridCLRGenerate.meta
  6. 532 0
      Assets/HybridCLRGenerate/link.xml
  7. 7 0
      Assets/HybridCLRGenerate/link.xml.meta
  8. 206 0
      Assets/Res/CombatScenes/CombatRoot.prefab
  9. 7 0
      Assets/Res/CombatScenes/CombatRoot.prefab.meta
  10. 6 6
      Assets/Res/UI/CombatShowTextPanel.prefab
  11. 0 0
      Assets/Resources/PerformanceTestRunInfo.json
  12. 7 0
      Assets/Resources/PerformanceTestRunInfo.json.meta
  13. 1 0
      Assets/Resources/PerformanceTestRunSettings.json
  14. 7 0
      Assets/Resources/PerformanceTestRunSettings.json.meta
  15. 567 499
      Assets/Scenes/testCombat.scene
  16. 2 0
      Assets/Scripts/Core/UI/Core/UIManager.cs
  17. 6 3
      Assets/Scripts/GameLogic/Combat/CombatTool/AttType.cs
  18. 16 6
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs
  19. 11 4
      Assets/Scripts/GameLogic/Combat/CombatTool/HarmType.cs
  20. 3 0
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  21. 8 0
      Assets/Scripts/GameStart.meta
  22. 30 0
      Assets/Scripts/GameStart/GameStart.cs
  23. 11 0
      Assets/Scripts/GameStart/GameStart.cs.meta
  24. 3 0
      Assets/Scripts/GameStart/GameStartDll.asmdef
  25. 7 0
      Assets/Scripts/GameStart/GameStartDll.asmdef.meta
  26. 21 0
      Assets/Scripts/GameStart/GameStartUIPanel.cs
  27. 11 0
      Assets/Scripts/GameStart/GameStartUIPanel.cs.meta
  28. 5 0
      Assets/Scripts/GameStart/IGameStart.cs
  29. 3 0
      Assets/Scripts/GameStart/IGameStart.cs.meta
  30. 17 0
      Assets/Scripts/GameStart/LoadType.cs
  31. 3 0
      Assets/Scripts/GameStart/LoadType.cs.meta
  32. 8 1
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  33. 2 1
      Assets/Scripts/GameUI/Fort23.Mono.asmdef
  34. 32 28
      Assets/Scripts/GameUI/GameApplction.cs
  35. 30 0
      Assets/Scripts/GameUI/GameApplctionMono.cs
  36. 3 0
      Assets/Scripts/GameUI/GameApplctionMono.cs.meta
  37. 7 7
      Assets/Scripts/GameUI/UI/Combat/CombatShowTextPanel.cs
  38. 14 2
      Assets/Scripts/GameUI/UI/Combat/ShowTextWidget.cs
  39. 0 983
      Assets/ShaderVariants.shadervariants
  40. 0 8
      Assets/ShaderVariants.shadervariants.meta
  41. 0 0
      Assets/StreamingAssets/assetConfig.txt
  42. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Assembly-CSharp.dll
  43. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Assembly-CSharp.pdb
  44. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Examples.dll
  45. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Examples.pdb
  46. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Runtime.dll
  47. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Runtime.pdb
  48. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Coffee.SoftMaskForUGUI.dll
  49. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Coffee.SoftMaskForUGUI.pdb
  50. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/DownloadSystem.dll
  51. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/DownloadSystem.pdb
  52. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Core.dll
  53. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Core.pdb
  54. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameData.dll
  55. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameData.pdb
  56. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameLogic.dll
  57. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameLogic.pdb
  58. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Mono.dll
  59. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Mono.pdb
  60. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerEngine.dll
  61. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerEngine.pdb
  62. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerSamples.dll
  63. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerSamples.pdb
  64. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GameTimeLine.dll
  65. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/GameTimeLine.pdb
  66. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/HybridCLR.Runtime.dll
  67. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/HybridCLR.Runtime.pdb
  68. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.FSM.dll
  69. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.FSM.pdb
  70. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.Samples.dll
  71. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.Samples.pdb
  72. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.dll
  73. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.pdb
  74. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Purchasing.Common.dll
  75. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Purchasing.Common.pdb
  76. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRDebugger.dll
  77. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRDebugger.pdb
  78. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRF.dll
  79. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRF.pdb
  80. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/ThirdParty.dll
  81. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/ThirdParty.pdb
  82. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/UniRx.dll
  83. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/UniRx.pdb
  84. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Animation.Runtime.dll
  85. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Animation.Runtime.pdb
  86. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Common.Runtime.dll
  87. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Common.Runtime.pdb
  88. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.IK.Runtime.dll
  89. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.IK.Runtime.pdb
  90. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.PixelPerfect.dll
  91. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.PixelPerfect.pdb
  92. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.SpriteShape.Runtime.dll
  93. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.SpriteShape.Runtime.pdb
  94. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Tilemap.Extras.dll
  95. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Tilemap.Extras.pdb
  96. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.Samples.dll
  97. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.Samples.pdb
  98. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.dll
  99. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.pdb
  100. BIN
      HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.Analytics.DataPrivacy.dll

+ 2 - 0
.gitignore

@@ -10,3 +10,5 @@ Release
 *.csproj
 *.sln
 XY001.sln.DotSettings.user
+minigame
+webgl

+ 0 - 627
Assets/Art/NewShaderVariants.shadervariants

@@ -1,627 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!200 &20000000
-ShaderVariantCollection:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: NewShaderVariants
-  m_Shaders:
-  - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: DIRECTIONAL LIGHTPROBE_SH
-        passType: 4
-      - keywords: DIRECTIONAL
-        passType: 5
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: _SUNDISK_HIGH_QUALITY
-        passType: 0
-      - keywords: _SUNDISK_SIMPLE
-        passType: 0
-  - first: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _ALPHABLEND_ON
-        passType: 0
-      - keywords: _ALPHABLEND_ON _COLOROVERLAY_ON
-        passType: 0
-      - keywords: _ALPHABLEND_ON _FADING_ON
-        passType: 0
-      - keywords: PROCEDURAL_INSTANCING_ON SHADOWS_DEPTH
-        passType: 8
-      - keywords: PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON
-        passType: 8
-      - keywords: 
-        passType: 13
-  - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9104, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: UNITY_UI_ALPHACLIP
-        passType: 0
-  - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _OUTPUT_DEPTH
-        passType: 0
-  - first: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
-    second:
-      variants:
-      - keywords: _MAIN_LIGHT_SHADOWS
-        passType: 0
-  - first: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: _ALPHATEST_ON
-        passType: 8
-      - keywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHAPREMULTIPLY_ON _MAIN_LIGHT_SHADOWS
-          _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF _SURFACE_TYPE_TRANSPARENT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHAPREMULTIPLY_ON _MAIN_LIGHT_SHADOWS
-          _SPECULARHIGHLIGHTS_OFF _SURFACE_TYPE_TRANSPARENT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHATEST_ON _MAIN_LIGHT_SHADOWS
-          _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHATEST_ON _MAIN_LIGHT_SHADOWS
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _MAIN_LIGHT_SHADOWS
-          _METALLICSPECGLOSSMAP
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _MAIN_LIGHT_SHADOWS
-          _METALLICSPECGLOSSMAP _SHADOWS_SOFT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
-          _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-          _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-          _SPECULARHIGHLIGHTS_OFF _SPECULAR_SETUP
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF
-          _SPECULAR_SETUP
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SPECULAR_SETUP
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ALPHATEST_ON _FORWARD_PLUS _MAIN_LIGHT_SHADOWS
-          _SHADOWS_SOFT _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS
-          _METALLICSPECGLOSSMAP
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _EMISSION _FORWARD_PLUS _MAIN_LIGHT_SHADOWS
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _FORWARD_PLUS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _FORWARD_PLUS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _FORWARD_PLUS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: _ALPHATEST_ON
-        passType: 13
-      - keywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-        passType: 13
-  - first: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-    second:
-      variants:
-      - keywords: OUTLINE_ON UNDERLAY_ON
-        passType: 0
-  - first: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: c6a0e78efe21c54448ab2869b09e8a2d, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: dfab9f92705bc3448be937135a3cb41d, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: de8b10515e8c7b6419b7a2e25ccbf055, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: INSTANCING_ON
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _FORWARD_PLUS _MAIN_LIGHT_SHADOWS
-        passType: 13
-  - first: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: 122ce928207ad5f41a908f23d3a05130, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-  - first: {fileID: 4800000, guid: e39bd598ce13f44ba8af997d3e42cd18, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 60e10855641b4d84da68ec72e6f6eeb8, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e8b802ac01d87144b91f12f40c1f2659, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _SURFACE_TYPE_TRANSPARENT
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 50b406436c6214c49aaaa6011b71dde8, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 5caf62d8bd7c44596ace77ef9eb8ea31, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
-    second:
-      variants:
-      - keywords: _SMAA_PRESET_LOW
-        passType: 0
-  - first: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3}
-    second:
-      variants:
-      - keywords: _GENERIC
-        passType: 0
-  - first: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 131f1b93a4ebd459ba87b6bad055fb33, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _FXAA
-        passType: 0
-  - first: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
-    second:
-      variants:
-      - keywords: GEOM_TYPE_BRANCH
-        passType: 8
-      - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE
-        passType: 8
-      - keywords: GEOM_TYPE_BRANCH
-        passType: 13
-      - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE
-        passType: 13
-  - first: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: FOG_LINEAR
-        passType: 0
-      - keywords: _POINT
-        passType: 0
-  - first: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 12
-  - first: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _DBUFFER_MRT1
-        passType: 0
-  - first: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _INTERLEAVED_GRADIENT _SAMPLE_COUNT_LOW _SOURCE_DEPTH_LOW
-        passType: 0
-  - first: {fileID: 4800000, guid: 5ec81c81908db34429b4f6ddecadd3bd, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 8fbe92a9edfe6074e841d6dd1509bc59, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3}
-    second:
-      variants:
-      - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE
-        passType: 8
-      - keywords: _WINDQUALITY_NONE
-        passType: 8
-      - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE
-        passType: 13
-      - keywords: _WINDQUALITY_NONE
-        passType: 13
-  - first: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0a7e590f3cf1d4ee8a8fab5b6eff09ef, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 74b1585886a85614aa34e2c8e303c77a, type: 3}
-    second:
-      variants:
-      - keywords: DOTS_INSTANCING_ON
-        passType: 13
-  - first: {fileID: 4800000, guid: 0ca6dca7396eb48e5849247ffd444914, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 19dfbb09098c9584a83c956fbd6c5d79, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13

+ 0 - 8
Assets/Art/NewShaderVariants.shadervariants.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: D34as3n7ACgM5VQO8ovsMh+dtY0/gZnCRHB9//3k/Oxjg5wbj3xVtfM=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 20000000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
Assets/Art/UIAnimation/ShowTextWidget.controller

@@ -85,10 +85,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -8917866234493566098}
-    m_Position: {x: 210, y: 20, z: 0}
+    m_Position: {x: 270, y: 30, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -8725380395382007897}
-    m_Position: {x: 220, y: 130, z: 0}
+    m_Position: {x: 280, y: 130, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

+ 8 - 0
Assets/HybridCLRGenerate.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XCsfs36pU3uRBrVuGqlZfwYEutiQy3qZyXDe1U2VJ9//Pz0gxSI08S4=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 532 - 0
Assets/HybridCLRGenerate/link.xml

@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="utf-8"?>
+<linker>
+  <assembly fullname="GPUECSAnimationBakerEngine">
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.AnimatorInfo" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimationData" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimationDataBufferElement" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimationDataComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimationEventOccurence" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimationEventOccurenceBufferElement" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorBehaviour" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorControlComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorControlStateComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorControlStates" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorEventBufferElement" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorInitializedComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorInitializerBehaviour" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorShaderDataComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorStateComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAnimatorTransitionInfoComponent" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAttachmentAnchorData" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsAttachmentAnchorDataBufferElement" preserve="all" />
+    <type fullname="GPUECSAnimationBaker.Engine.AnimatorSystem.GpuEcsCurrentAttachmentAnchorBufferElement" preserve="all" />
+  </assembly>
+  <assembly fullname="Kybernetik.Animancer">
+    <type fullname="Animancer.AnimancerComponent" preserve="all" />
+    <type fullname="Animancer.AnimancerNodeBase" preserve="all" />
+    <type fullname="Animancer.AnimancerState" preserve="all" />
+    <type fullname="Animancer.ITransition" preserve="all" />
+    <type fullname="Animancer.TransitionAsset" preserve="all" />
+    <type fullname="Animancer.TransitionLibraries.TransitionLibrary" preserve="all" />
+    <type fullname="Animancer.TransitionLibraries.TransitionLibraryAsset" preserve="all" />
+    <type fullname="Animancer.TransitionLibraries.TransitionModifierGroup" preserve="all" />
+  </assembly>
+  <assembly fullname="LitJson">
+    <type fullname="LitJson.JsonData" preserve="all" />
+    <type fullname="LitJson.JsonMapper" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.AI.Navigation">
+    <type fullname="Unity.AI.Navigation.NavMeshSurface" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Mathematics">
+    <type fullname="Unity.Mathematics.float3" preserve="all" />
+    <type fullname="Unity.Mathematics.float4" preserve="all" />
+    <type fullname="Unity.Mathematics.float4x4" preserve="all" />
+    <type fullname="Unity.Mathematics.math" preserve="all" />
+    <type fullname="Unity.Mathematics.quaternion" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.RenderPipelines.Universal.Runtime">
+    <type fullname="UnityEngine.Rendering.Universal.CameraExtensions" preserve="all" />
+    <type fullname="UnityEngine.Rendering.Universal.CameraRenderType" preserve="all" />
+    <type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalCameraData" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.TextMeshPro">
+    <type fullname="TMPro.AtlasPopulationMode" preserve="all" />
+    <type fullname="TMPro.FastAction`1" preserve="all" />
+    <type fullname="TMPro.ShaderUtilities" preserve="all" />
+    <type fullname="TMPro.TMP_Asset" preserve="all" />
+    <type fullname="TMPro.TMP_CharacterInfo" preserve="all" />
+    <type fullname="TMPro.TMP_Dropdown" preserve="all" />
+    <type fullname="TMPro.TMP_FontAsset" preserve="all" />
+    <type fullname="TMPro.TMP_InputField" preserve="all" />
+    <type fullname="TMPro.TMP_InputField/SubmitEvent" preserve="all" />
+    <type fullname="TMPro.TMP_InputValidator" preserve="all" />
+    <type fullname="TMPro.TMP_LineInfo" preserve="all" />
+    <type fullname="TMPro.TMP_LinkInfo" preserve="all" />
+    <type fullname="TMPro.TMP_MeshInfo" preserve="all" />
+    <type fullname="TMPro.TMP_Text" preserve="all" />
+    <type fullname="TMPro.TMP_TextElementType" preserve="all" />
+    <type fullname="TMPro.TMP_TextInfo" preserve="all" />
+    <type fullname="TMPro.TMP_TextUtilities" preserve="all" />
+    <type fullname="TMPro.TMP_VertexDataUpdateFlags" preserve="all" />
+    <type fullname="TMPro.TMP_WordInfo" preserve="all" />
+    <type fullname="TMPro.TMPro_EventManager" preserve="all" />
+    <type fullname="TMPro.TMPro_ExtensionMethods" preserve="all" />
+    <type fullname="TMPro.TextAlignmentOptions" preserve="all" />
+    <type fullname="TMPro.TextContainer" preserve="all" />
+    <type fullname="TMPro.TextContainerAnchors" preserve="all" />
+    <type fullname="TMPro.TextMeshPro" preserve="all" />
+    <type fullname="TMPro.TextMeshProUGUI" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Timeline">
+    <type fullname="UnityEngine.Timeline.AnimationPlayableAsset" preserve="all" />
+    <type fullname="UnityEngine.Timeline.AnimationPlayableAsset/LoopMode" preserve="all" />
+    <type fullname="UnityEngine.Timeline.AudioPlayableAsset" preserve="all" />
+    <type fullname="UnityEngine.Timeline.ControlPlayableAsset" preserve="all" />
+    <type fullname="UnityEngine.Timeline.GroupTrack" preserve="all" />
+    <type fullname="UnityEngine.Timeline.TimelineClip" preserve="all" />
+    <type fullname="UnityEngine.Timeline.TrackAsset" preserve="all" />
+    <type fullname="UnityEngine.Timeline.TrackAssetExtensions" preserve="all" />
+    <type fullname="UnityEngine.Timeline.TrackClipTypeAttribute" preserve="all" />
+    <type fullname="UnityEngine.Timeline.TrackColorAttribute" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.AIModule">
+    <type fullname="UnityEngine.AI.NavMeshAgent" preserve="all" />
+    <type fullname="UnityEngine.AI.NavMeshHit" preserve="all" />
+    <type fullname="UnityEngine.AI.ObstacleAvoidanceType" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.AnimationModule">
+    <type fullname="UnityEngine.AnimationClip" preserve="all" />
+    <type fullname="UnityEngine.Animator" preserve="all" />
+    <type fullname="UnityEngine.AnimatorUpdateMode" preserve="all" />
+    <type fullname="UnityEngine.RuntimeAnimatorController" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.AssetBundleModule">
+    <type fullname="UnityEngine.AssetBundle" preserve="all" />
+    <type fullname="UnityEngine.AssetBundleCreateRequest" preserve="all" />
+    <type fullname="UnityEngine.AssetBundleManifest" preserve="all" />
+    <type fullname="UnityEngine.AssetBundleRequest" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.AudioModule">
+    <type fullname="UnityEngine.Audio.AudioMixer" preserve="all" />
+    <type fullname="UnityEngine.Audio.AudioMixerGroup" preserve="all" />
+    <type fullname="UnityEngine.AudioClip" preserve="all" />
+    <type fullname="UnityEngine.AudioSource" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule">
+    <type fullname="Unity.Collections.Allocator" preserve="all" />
+    <type fullname="Unity.Collections.NativeArrayOptions" preserve="all" />
+    <type fullname="Unity.Collections.NativeArray`1" preserve="all" />
+    <type fullname="UnityEngine.AddComponentMenu" preserve="all" />
+    <type fullname="UnityEngine.AnimationCurve" preserve="all" />
+    <type fullname="UnityEngine.Application" preserve="all" />
+    <type fullname="UnityEngine.AsyncInstantiateOperation" preserve="all" />
+    <type fullname="UnityEngine.AsyncInstantiateOperation`1" preserve="all" />
+    <type fullname="UnityEngine.AsyncOperation" preserve="all" />
+    <type fullname="UnityEngine.Behaviour" preserve="all" />
+    <type fullname="UnityEngine.Bounds" preserve="all" />
+    <type fullname="UnityEngine.Camera" preserve="all" />
+    <type fullname="UnityEngine.Color" preserve="all" />
+    <type fullname="UnityEngine.Color32" preserve="all" />
+    <type fullname="UnityEngine.Component" preserve="all" />
+    <type fullname="UnityEngine.ContextMenu" preserve="all" />
+    <type fullname="UnityEngine.Coroutine" preserve="all" />
+    <type fullname="UnityEngine.CreateAssetMenuAttribute" preserve="all" />
+    <type fullname="UnityEngine.Debug" preserve="all" />
+    <type fullname="UnityEngine.DisallowMultipleComponent" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityAction" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityAction`1" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityAction`2" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityAction`3" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityEvent" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityEvent`1" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityEvent`2" preserve="all" />
+    <type fullname="UnityEngine.Events.UnityEvent`3" preserve="all" />
+    <type fullname="UnityEngine.ExecuteAlways" preserve="all" />
+    <type fullname="UnityEngine.ExecuteInEditMode" preserve="all" />
+    <type fullname="UnityEngine.ExposedReference`1" preserve="all" />
+    <type fullname="UnityEngine.GameObject" preserve="all" />
+    <type fullname="UnityEngine.Graphics" preserve="all" />
+    <type fullname="UnityEngine.HeaderAttribute" preserve="all" />
+    <type fullname="UnityEngine.IExposedPropertyTable" preserve="all" />
+    <type fullname="UnityEngine.ISerializationCallbackReceiver" preserve="all" />
+    <type fullname="UnityEngine.KeyCode" preserve="all" />
+    <type fullname="UnityEngine.Keyframe" preserve="all" />
+    <type fullname="UnityEngine.LayerMask" preserve="all" />
+    <type fullname="UnityEngine.Light" preserve="all" />
+    <type fullname="UnityEngine.LineRenderer" preserve="all" />
+    <type fullname="UnityEngine.Material" preserve="all" />
+    <type fullname="UnityEngine.MaterialPropertyBlock" preserve="all" />
+    <type fullname="UnityEngine.Mathf" preserve="all" />
+    <type fullname="UnityEngine.Matrix4x4" preserve="all" />
+    <type fullname="UnityEngine.Mesh" preserve="all" />
+    <type fullname="UnityEngine.MeshFilter" preserve="all" />
+    <type fullname="UnityEngine.MonoBehaviour" preserve="all" />
+    <type fullname="UnityEngine.NonReorderableAttribute" preserve="all" />
+    <type fullname="UnityEngine.Object" preserve="all" />
+    <type fullname="UnityEngine.Playables.FrameData" preserve="all" />
+    <type fullname="UnityEngine.Playables.Playable" preserve="all" />
+    <type fullname="UnityEngine.Playables.PlayableAsset" preserve="all" />
+    <type fullname="UnityEngine.Playables.PlayableBehaviour" preserve="all" />
+    <type fullname="UnityEngine.Playables.PlayableBinding" preserve="all" />
+    <type fullname="UnityEngine.Playables.PlayableGraph" preserve="all" />
+    <type fullname="UnityEngine.Playables.ScriptPlayable`1" preserve="all" />
+    <type fullname="UnityEngine.PlayerPrefs" preserve="all" />
+    <type fullname="UnityEngine.Pool.CollectionPool`2" preserve="all" />
+    <type fullname="UnityEngine.PropertyAttribute" preserve="all" />
+    <type fullname="UnityEngine.QualitySettings" preserve="all" />
+    <type fullname="UnityEngine.Quaternion" preserve="all" />
+    <type fullname="UnityEngine.Random" preserve="all" />
+    <type fullname="UnityEngine.RangeAttribute" preserve="all" />
+    <type fullname="UnityEngine.Ray" preserve="all" />
+    <type fullname="UnityEngine.Rect" preserve="all" />
+    <type fullname="UnityEngine.RectTransform" preserve="all" />
+    <type fullname="UnityEngine.RenderParams" preserve="all" />
+    <type fullname="UnityEngine.Renderer" preserve="all" />
+    <type fullname="UnityEngine.Rendering.ColorWriteMask" preserve="all" />
+    <type fullname="UnityEngine.Rendering.CompareFunction" preserve="all" />
+    <type fullname="UnityEngine.Rendering.ShaderPropertyType" preserve="all" />
+    <type fullname="UnityEngine.Rendering.ShadowCastingMode" preserve="all" />
+    <type fullname="UnityEngine.Rendering.StencilOp" preserve="all" />
+    <type fullname="UnityEngine.RequireComponent" preserve="all" />
+    <type fullname="UnityEngine.Resources" preserve="all" />
+    <type fullname="UnityEngine.RuntimePlatform" preserve="all" />
+    <type fullname="UnityEngine.Screen" preserve="all" />
+    <type fullname="UnityEngine.ScriptableObject" preserve="all" />
+    <type fullname="UnityEngine.SerializeField" preserve="all" />
+    <type fullname="UnityEngine.Shader" preserve="all" />
+    <type fullname="UnityEngine.ShaderVariantCollection" preserve="all" />
+    <type fullname="UnityEngine.Space" preserve="all" />
+    <type fullname="UnityEngine.Sprite" preserve="all" />
+    <type fullname="UnityEngine.TextAsset" preserve="all" />
+    <type fullname="UnityEngine.Texture" preserve="all" />
+    <type fullname="UnityEngine.Texture2D" preserve="all" />
+    <type fullname="UnityEngine.Time" preserve="all" />
+    <type fullname="UnityEngine.TooltipAttribute" preserve="all" />
+    <type fullname="UnityEngine.TrailRenderer" preserve="all" />
+    <type fullname="UnityEngine.Transform" preserve="all" />
+    <type fullname="UnityEngine.U2D.SpriteAtlas" preserve="all" />
+    <type fullname="UnityEngine.Vector2" preserve="all" />
+    <type fullname="UnityEngine.Vector3" preserve="all" />
+    <type fullname="UnityEngine.Vector4" preserve="all" />
+    <type fullname="UnityEngine.WaitForEndOfFrame" preserve="all" />
+    <type fullname="UnityEngine.WaitForSeconds" preserve="all" />
+    <type fullname="UnityEngine.WrapMode" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.DirectorModule">
+    <type fullname="UnityEngine.Playables.PlayableDirector" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.ImageConversionModule">
+    <type fullname="UnityEngine.ImageConversion" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.InputLegacyModule">
+    <type fullname="UnityEngine.Input" preserve="all" />
+    <type fullname="UnityEngine.Touch" preserve="all" />
+    <type fullname="UnityEngine.TouchPhase" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.JSONSerializeModule">
+    <type fullname="UnityEngine.JsonUtility" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.ParticleSystemModule">
+    <type fullname="UnityEngine.ParticleSystem" preserve="all" />
+    <type fullname="UnityEngine.ParticleSystem/MainModule" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.Physics2DModule">
+    <type fullname="UnityEngine.BoxCollider2D" preserve="all" />
+    <type fullname="UnityEngine.Collider2D" preserve="all" />
+    <type fullname="UnityEngine.Collision2D" preserve="all" />
+    <type fullname="UnityEngine.EdgeCollider2D" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.PhysicsModule">
+    <type fullname="UnityEngine.Collider" preserve="all" />
+    <type fullname="UnityEngine.Collision" preserve="all" />
+    <type fullname="UnityEngine.Physics" preserve="all" />
+    <type fullname="UnityEngine.RaycastHit" preserve="all" />
+    <type fullname="UnityEngine.Rigidbody" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.TextCoreFontEngineModule">
+    <type fullname="UnityEngine.TextCore.LowLevel.GlyphRenderMode" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.TextRenderingModule">
+    <type fullname="UnityEngine.Font" preserve="all" />
+    <type fullname="UnityEngine.TextAnchor" preserve="all" />
+    <type fullname="UnityEngine.TextMesh" preserve="all" />
+    <type fullname="UnityEngine.UIVertex" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UI">
+    <type fullname="UnityEngine.EventSystems.BaseEventData" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.BaseRaycaster" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventSystem" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventTrigger" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventTrigger/Entry" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventTrigger/TriggerEvent" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventTriggerType" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.IEventSystemHandler" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.IPointerClickHandler" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.IPointerEnterHandler" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.IPointerExitHandler" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.IPointerUpHandler" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.PointerEventData" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.RaycastResult" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.UIBehaviour" preserve="all" />
+    <type fullname="UnityEngine.UI.BaseMeshEffect" preserve="all" />
+    <type fullname="UnityEngine.UI.Button" preserve="all" />
+    <type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="all" />
+    <type fullname="UnityEngine.UI.CanvasScaler" preserve="all" />
+    <type fullname="UnityEngine.UI.CanvasUpdate" preserve="all" />
+    <type fullname="UnityEngine.UI.Graphic" preserve="all" />
+    <type fullname="UnityEngine.UI.GraphicRaycaster" preserve="all" />
+    <type fullname="UnityEngine.UI.IMeshModifier" preserve="all" />
+    <type fullname="UnityEngine.UI.Image" preserve="all" />
+    <type fullname="UnityEngine.UI.Mask" preserve="all" />
+    <type fullname="UnityEngine.UI.MaskUtilities" preserve="all" />
+    <type fullname="UnityEngine.UI.MaskableGraphic" preserve="all" />
+    <type fullname="UnityEngine.UI.Scrollbar" preserve="all" />
+    <type fullname="UnityEngine.UI.Slider" preserve="all" />
+    <type fullname="UnityEngine.UI.StencilMaterial" preserve="all" />
+    <type fullname="UnityEngine.UI.Text" preserve="all" />
+    <type fullname="UnityEngine.UI.VertexHelper" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UIModule">
+    <type fullname="UnityEngine.Canvas" preserve="all" />
+    <type fullname="UnityEngine.CanvasRenderer" preserve="all" />
+    <type fullname="UnityEngine.RectTransformUtility" preserve="all" />
+    <type fullname="UnityEngine.RenderMode" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UnityWebRequestAssetBundleModule">
+    <type fullname="UnityEngine.Networking.DownloadHandlerAssetBundle" preserve="all" />
+    <type fullname="UnityEngine.Networking.UnityWebRequestAssetBundle" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UnityWebRequestModule">
+    <type fullname="UnityEngine.Networking.CertificateHandler" preserve="all" />
+    <type fullname="UnityEngine.Networking.DownloadHandler" preserve="all" />
+    <type fullname="UnityEngine.Networking.UnityWebRequest" preserve="all" />
+    <type fullname="UnityEngine.Networking.UnityWebRequestAsyncOperation" preserve="all" />
+  </assembly>
+  <assembly fullname="netstandard">
+    <type fullname="System.Action" preserve="all" />
+    <type fullname="System.Action`1" preserve="all" />
+    <type fullname="System.Action`2" preserve="all" />
+    <type fullname="System.Action`3" preserve="all" />
+    <type fullname="System.Action`4" preserve="all" />
+    <type fullname="System.Action`5" preserve="all" />
+    <type fullname="System.Activator" preserve="all" />
+    <type fullname="System.AppDomain" preserve="all" />
+    <type fullname="System.ArgumentException" preserve="all" />
+    <type fullname="System.ArgumentNullException" preserve="all" />
+    <type fullname="System.ArgumentOutOfRangeException" preserve="all" />
+    <type fullname="System.Array" preserve="all" />
+    <type fullname="System.ArraySegment`1" preserve="all" />
+    <type fullname="System.AsyncCallback" preserve="all" />
+    <type fullname="System.Attribute" preserve="all" />
+    <type fullname="System.AttributeTargets" preserve="all" />
+    <type fullname="System.AttributeUsageAttribute" preserve="all" />
+    <type fullname="System.BitConverter" preserve="all" />
+    <type fullname="System.Boolean" preserve="all" />
+    <type fullname="System.Buffers.ArrayPool`1" preserve="all" />
+    <type fullname="System.Buffers.Binary.BinaryPrimitives" preserve="all" />
+    <type fullname="System.Buffers.BuffersExtensions" preserve="all" />
+    <type fullname="System.Buffers.IBufferWriter`1" preserve="all" />
+    <type fullname="System.Buffers.IMemoryOwner`1" preserve="all" />
+    <type fullname="System.Buffers.MemoryPool`1" preserve="all" />
+    <type fullname="System.Buffers.ReadOnlySequence`1" preserve="all" />
+    <type fullname="System.Byte" preserve="all" />
+    <type fullname="System.Char" preserve="all" />
+    <type fullname="System.CodeDom.Compiler.GeneratedCodeAttribute" preserve="all" />
+    <type fullname="System.Collections.Concurrent.ConcurrentQueue`1" preserve="all" />
+    <type fullname="System.Collections.Concurrent.ConcurrentStack`1" preserve="all" />
+    <type fullname="System.Collections.DictionaryEntry" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2/ValueCollection" preserve="all" />
+    <type fullname="System.Collections.Generic.Dictionary`2/ValueCollection/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.EqualityComparer`1" preserve="all" />
+    <type fullname="System.Collections.Generic.HashSet`1" preserve="all" />
+    <type fullname="System.Collections.Generic.HashSet`1/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.ICollection`1" preserve="all" />
+    <type fullname="System.Collections.Generic.IComparer`1" preserve="all" />
+    <type fullname="System.Collections.Generic.IDictionary`2" preserve="all" />
+    <type fullname="System.Collections.Generic.IEnumerable`1" preserve="all" />
+    <type fullname="System.Collections.Generic.IEnumerator`1" preserve="all" />
+    <type fullname="System.Collections.Generic.IEqualityComparer`1" preserve="all" />
+    <type fullname="System.Collections.Generic.IList`1" preserve="all" />
+    <type fullname="System.Collections.Generic.KeyNotFoundException" preserve="all" />
+    <type fullname="System.Collections.Generic.KeyValuePair`2" preserve="all" />
+    <type fullname="System.Collections.Generic.LinkedListNode`1" preserve="all" />
+    <type fullname="System.Collections.Generic.LinkedList`1" preserve="all" />
+    <type fullname="System.Collections.Generic.LinkedList`1/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.List`1" preserve="all" />
+    <type fullname="System.Collections.Generic.List`1/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.Queue`1" preserve="all" />
+    <type fullname="System.Collections.Generic.SortedDictionary`2" preserve="all" />
+    <type fullname="System.Collections.Generic.SortedDictionary`2/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.Stack`1" preserve="all" />
+    <type fullname="System.Collections.ICollection" preserve="all" />
+    <type fullname="System.Collections.IDictionary" preserve="all" />
+    <type fullname="System.Collections.IDictionaryEnumerator" preserve="all" />
+    <type fullname="System.Collections.IEnumerable" preserve="all" />
+    <type fullname="System.Collections.IEnumerator" preserve="all" />
+    <type fullname="System.Collections.IList" preserve="all" />
+    <type fullname="System.Comparison`1" preserve="all" />
+    <type fullname="System.ComponentModel.EditorBrowsableAttribute" preserve="all" />
+    <type fullname="System.ComponentModel.EditorBrowsableState" preserve="all" />
+    <type fullname="System.ComponentModel.INotifyPropertyChanged" preserve="all" />
+    <type fullname="System.ComponentModel.ISupportInitialize" preserve="all" />
+    <type fullname="System.Console" preserve="all" />
+    <type fullname="System.Convert" preserve="all" />
+    <type fullname="System.DateTime" preserve="all" />
+    <type fullname="System.DateTimeKind" preserve="all" />
+    <type fullname="System.DateTimeOffset" preserve="all" />
+    <type fullname="System.DayOfWeek" preserve="all" />
+    <type fullname="System.Delegate" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggableAttribute" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggableAttribute/DebuggingModes" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerBrowsableAttribute" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerBrowsableState" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerDisplayAttribute" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerHiddenAttribute" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerStepThroughAttribute" preserve="all" />
+    <type fullname="System.Diagnostics.DebuggerTypeProxyAttribute" preserve="all" />
+    <type fullname="System.Double" preserve="all" />
+    <type fullname="System.Enum" preserve="all" />
+    <type fullname="System.Exception" preserve="all" />
+    <type fullname="System.FlagsAttribute" preserve="all" />
+    <type fullname="System.GC" preserve="all" />
+    <type fullname="System.Globalization.CultureInfo" preserve="all" />
+    <type fullname="System.Guid" preserve="all" />
+    <type fullname="System.IAsyncResult" preserve="all" />
+    <type fullname="System.IDisposable" preserve="all" />
+    <type fullname="System.IFormatProvider" preserve="all" />
+    <type fullname="System.IFormattable" preserve="all" />
+    <type fullname="System.IO.Compression.CompressionMode" preserve="all" />
+    <type fullname="System.IO.Compression.GZipStream" preserve="all" />
+    <type fullname="System.IO.Directory" preserve="all" />
+    <type fullname="System.IO.DirectoryInfo" preserve="all" />
+    <type fullname="System.IO.File" preserve="all" />
+    <type fullname="System.IO.FileInfo" preserve="all" />
+    <type fullname="System.IO.FileMode" preserve="all" />
+    <type fullname="System.IO.FileStream" preserve="all" />
+    <type fullname="System.IO.FileSystemInfo" preserve="all" />
+    <type fullname="System.IO.MemoryStream" preserve="all" />
+    <type fullname="System.IO.Path" preserve="all" />
+    <type fullname="System.IO.SeekOrigin" preserve="all" />
+    <type fullname="System.IO.Stream" preserve="all" />
+    <type fullname="System.IO.StreamReader" preserve="all" />
+    <type fullname="System.IO.TextReader" preserve="all" />
+    <type fullname="System.IndexOutOfRangeException" preserve="all" />
+    <type fullname="System.Int32" preserve="all" />
+    <type fullname="System.Int64" preserve="all" />
+    <type fullname="System.IntPtr" preserve="all" />
+    <type fullname="System.InvalidOperationException" preserve="all" />
+    <type fullname="System.Linq.Enumerable" preserve="all" />
+    <type fullname="System.Math" preserve="all" />
+    <type fullname="System.MemoryExtensions" preserve="all" />
+    <type fullname="System.Memory`1" preserve="all" />
+    <type fullname="System.MulticastDelegate" preserve="all" />
+    <type fullname="System.Net.EndPoint" preserve="all" />
+    <type fullname="System.Net.IPAddress" preserve="all" />
+    <type fullname="System.Net.IPEndPoint" preserve="all" />
+    <type fullname="System.Net.Sockets.AddressFamily" preserve="all" />
+    <type fullname="System.Net.Sockets.ProtocolType" preserve="all" />
+    <type fullname="System.Net.Sockets.Socket" preserve="all" />
+    <type fullname="System.Net.Sockets.SocketException" preserve="all" />
+    <type fullname="System.Net.Sockets.SocketFlags" preserve="all" />
+    <type fullname="System.Net.Sockets.SocketTaskExtensions" preserve="all" />
+    <type fullname="System.Net.Sockets.SocketType" preserve="all" />
+    <type fullname="System.Net.Sockets.UdpClient" preserve="all" />
+    <type fullname="System.Net.Sockets.UdpReceiveResult" preserve="all" />
+    <type fullname="System.NotImplementedException" preserve="all" />
+    <type fullname="System.NotSupportedException" preserve="all" />
+    <type fullname="System.Nullable`1" preserve="all" />
+    <type fullname="System.Object" preserve="all" />
+    <type fullname="System.ObjectDisposedException" preserve="all" />
+    <type fullname="System.ObsoleteAttribute" preserve="all" />
+    <type fullname="System.ParamArrayAttribute" preserve="all" />
+    <type fullname="System.Random" preserve="all" />
+    <type fullname="System.ReadOnlySpan`1" preserve="all" />
+    <type fullname="System.Reflection.Assembly" preserve="all" />
+    <type fullname="System.Reflection.AssemblyName" preserve="all" />
+    <type fullname="System.Reflection.CustomAttributeExtensions" preserve="all" />
+    <type fullname="System.Reflection.DefaultMemberAttribute" preserve="all" />
+    <type fullname="System.Reflection.MemberInfo" preserve="all" />
+    <type fullname="System.Reflection.MethodBase" preserve="all" />
+    <type fullname="System.Reflection.MethodInfo" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.AsyncStateMachineAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.AsyncTaskMethodBuilder" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder`1" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.AsyncVoidMethodBuilder" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.CompilationRelaxationsAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1/ConfiguredTaskAwaiter" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.ExtensionAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.IAsyncStateMachine" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.ICriticalNotifyCompletion" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.INotifyCompletion" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.IsReadOnlyAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.IteratorStateMachineAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.RuntimeCompatibilityAttribute" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.RuntimeHelpers" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.TaskAwaiter" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.TaskAwaiter`1" preserve="all" />
+    <type fullname="System.Runtime.CompilerServices.TupleElementNamesAttribute" preserve="all" />
+    <type fullname="System.Runtime.ExceptionServices.ExceptionDispatchInfo" preserve="all" />
+    <type fullname="System.Runtime.InteropServices.ComVisibleAttribute" preserve="all" />
+    <type fullname="System.Runtime.InteropServices.ExternalException" preserve="all" />
+    <type fullname="System.Runtime.InteropServices.InAttribute" preserve="all" />
+    <type fullname="System.Runtime.InteropServices.Marshal" preserve="all" />
+    <type fullname="System.Runtime.Serialization.Formatters.Binary.BinaryFormatter" preserve="all" />
+    <type fullname="System.Runtime.Serialization.IDeserializationCallback" preserve="all" />
+    <type fullname="System.Runtime.Serialization.ISerializable" preserve="all" />
+    <type fullname="System.Runtime.Serialization.SerializationInfo" preserve="all" />
+    <type fullname="System.Runtime.Serialization.SerializationInfoEnumerator" preserve="all" />
+    <type fullname="System.Runtime.Serialization.StreamingContext" preserve="all" />
+    <type fullname="System.RuntimeFieldHandle" preserve="all" />
+    <type fullname="System.RuntimeTypeHandle" preserve="all" />
+    <type fullname="System.Security.Cryptography.CryptoStream" preserve="all" />
+    <type fullname="System.Security.Cryptography.CryptoStreamMode" preserve="all" />
+    <type fullname="System.Security.Cryptography.DESCryptoServiceProvider" preserve="all" />
+    <type fullname="System.Security.Cryptography.HashAlgorithm" preserve="all" />
+    <type fullname="System.Security.Cryptography.ICryptoTransform" preserve="all" />
+    <type fullname="System.Security.Cryptography.MD5CryptoServiceProvider" preserve="all" />
+    <type fullname="System.Security.Cryptography.SymmetricAlgorithm" preserve="all" />
+    <type fullname="System.Security.Permissions.SecurityAction" preserve="all" />
+    <type fullname="System.Security.Permissions.SecurityPermissionAttribute" preserve="all" />
+    <type fullname="System.Security.Permissions.SecurityPermissionFlag" preserve="all" />
+    <type fullname="System.Security.SecuritySafeCriticalAttribute" preserve="all" />
+    <type fullname="System.Security.UnverifiableCodeAttribute" preserve="all" />
+    <type fullname="System.Single" preserve="all" />
+    <type fullname="System.Span`1" preserve="all" />
+    <type fullname="System.String" preserve="all" />
+    <type fullname="System.StringComparison" preserve="all" />
+    <type fullname="System.StringSplitOptions" preserve="all" />
+    <type fullname="System.Text.Encoding" preserve="all" />
+    <type fullname="System.Text.RegularExpressions.Group" preserve="all" />
+    <type fullname="System.Text.RegularExpressions.Match" preserve="all" />
+    <type fullname="System.Text.RegularExpressions.MatchCollection" preserve="all" />
+    <type fullname="System.Text.RegularExpressions.Regex" preserve="all" />
+    <type fullname="System.Text.RegularExpressions.RegexOptions" preserve="all" />
+    <type fullname="System.Text.StringBuilder" preserve="all" />
+    <type fullname="System.Text.UTF8Encoding" preserve="all" />
+    <type fullname="System.Threading.Interlocked" preserve="all" />
+    <type fullname="System.Threading.Monitor" preserve="all" />
+    <type fullname="System.Threading.Tasks.Task" preserve="all" />
+    <type fullname="System.Threading.Tasks.TaskCompletionSource`1" preserve="all" />
+    <type fullname="System.Threading.Tasks.Task`1" preserve="all" />
+    <type fullname="System.Threading.Tasks.ValueTask" preserve="all" />
+    <type fullname="System.Threading.Tasks.ValueTask`1" preserve="all" />
+    <type fullname="System.Threading.Thread" preserve="all" />
+    <type fullname="System.Threading.ThreadStart" preserve="all" />
+    <type fullname="System.TimeSpan" preserve="all" />
+    <type fullname="System.TimeZone" preserve="all" />
+    <type fullname="System.Type" preserve="all" />
+    <type fullname="System.UInt16" preserve="all" />
+    <type fullname="System.UInt32" preserve="all" />
+    <type fullname="System.Uri" preserve="all" />
+    <type fullname="System.ValueTuple`2" preserve="all" />
+    <type fullname="System.ValueType" preserve="all" />
+  </assembly>
+</linker>

+ 7 - 0
Assets/HybridCLRGenerate/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cn9MsCz7VXiy22X35VNwJncwmDjmVjEKvEmiklaJS+Kqdr4X0LyMmnI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 206 - 0
Assets/Res/CombatScenes/CombatRoot.prefab

@@ -0,0 +1,206 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &65994213146227239
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6818137407374040233}
+  - component: {fileID: 5136129069556543016}
+  - component: {fileID: 1067354441832522770}
+  - component: {fileID: 5509167049581429110}
+  - component: {fileID: 2936898057140725830}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6818137407374040233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65994213146227239}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.37086314, y: -0.22785029, z: 0.09437861, w: 0.8953421}
+  m_LocalPosition: {x: 9.6, y: 9.6, z: -5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5344611500333309412}
+  m_LocalEulerAnglesHint: {x: 45, y: -28.556, z: 0}
+--- !u!20 &5136129069556543016
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65994213146227239}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 40
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_enableGDRP: 1
+  m_backfaceCulling: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!81 &1067354441832522770
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65994213146227239}
+  m_Enabled: 1
+--- !u!114 &5509167049581429110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65994213146227239}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 1
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+--- !u!114 &2936898057140725830
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 65994213146227239}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 979955b7cbad63f4dbdb0c30ea8679f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  camera: {fileID: 5136129069556543016}
+--- !u!1 &4286731389157393447
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5344611500333309412}
+  - component: {fileID: 7261115989929743686}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: CombatRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5344611500333309412
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4286731389157393447}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 24.1, y: 12.5, z: 25.6}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6818137407374040233}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!114 &7261115989929743686
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4286731389157393447}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e1ee1c62c905bb24ea7c9cf3d9d40b56, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  trauma: 0
+  TraumaExponent: 1
+  MaximumAngularShake: {x: 5, y: 5, z: 5}
+  MaximumTranslationShake: {x: 0.75, y: 0.75, z: 0.75}

+ 7 - 0
Assets/Res/CombatScenes/CombatRoot.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WSgcvHuvUim8lOvO5Ne/1wHjeY6bC6XoOmQYm+QRIfTXcg9wer0B9Y8=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 6
Assets/Res/UI/CombatShowTextPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 478, y: 923}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &682982680581346231
 MonoBehaviour:
@@ -75,7 +75,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7655382758854234836
 RectTransform:
   m_ObjectHideFlags: 0
@@ -172,7 +172,7 @@ RectTransform:
   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: 160, y: 30}
+  m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5266701560682274139
 CanvasRenderer:
@@ -203,8 +203,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 54d2da712a083664a97e1544b01486d2, type: 2}
-    m_FontSize: 0
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
@@ -215,4 +215,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1212
+  m_Text: 123

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Resources/PerformanceTestRunInfo.json


+ 7 - 0
Assets/Resources/PerformanceTestRunInfo.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W3NO4yKvVXmI7LvZevbqu9Tl56WppXDEFf80J7jvsiLjuGO4QvloKfs=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Resources/PerformanceTestRunSettings.json

@@ -0,0 +1 @@
+{"MeasurementCount":-1}

+ 7 - 0
Assets/Resources/PerformanceTestRunSettings.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BywXsCOtBXxf4lS0nWDWuM6AaqOQNGKsWizNVzunNAUc6bui1v2tTFI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 567 - 499
Assets/Scenes/testCombat.scene

@@ -124,11 +124,216 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!224 &20562867 stripped
+--- !u!1 &123020043
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 123020045}
+  - component: {fileID: 123020044}
+  - component: {fileID: 123020046}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameStart
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &123020044
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123020043}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 788788c0fc1864048844825f3f11250b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
+  LoadType: 0
+  h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
+--- !u!4 &123020045
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123020043}
+  serializedVersion: 2
+  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: 753442136}
+  - {fileID: 168908852}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &123020046
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 123020043}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d43f70b9325be3941a54497df8c6ad90, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  massgeText: {fileID: 773560731}
+  loadSlider: {fileID: 1324294698}
+--- !u!1 &164319092
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 164319093}
+  - component: {fileID: 164319095}
+  - component: {fileID: 164319094}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &164319093
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-  m_PrefabInstance: {fileID: 3341871095928010210}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164319092}
+  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: 753442136}
+  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: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &164319094
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164319092}
+  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: 62b2ffda588cb480f9a5caa2efbf0211, 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!222 &164319095
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164319092}
+  m_CullTransparentMesh: 1
+--- !u!1 &168908849
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 168908852}
+  - component: {fileID: 168908851}
+  - component: {fileID: 168908850}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &168908850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168908849}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &168908851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168908849}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &168908852
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168908849}
+  serializedVersion: 2
+  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: 123020045}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &235899919
 GameObject:
   m_ObjectHideFlags: 0
@@ -299,116 +504,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1001 &785438226
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 20562867}
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
---- !u!224 &785438227 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-  m_PrefabInstance: {fileID: 785438226}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &852523981
+--- !u!1 &442218246
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -416,153 +512,180 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 852523982}
-  - component: {fileID: 852523986}
-  - component: {fileID: 852523985}
-  - component: {fileID: 852523984}
-  - component: {fileID: 852523983}
-  m_Layer: 0
+  - component: {fileID: 442218247}
+  - component: {fileID: 442218249}
+  - component: {fileID: 442218248}
+  m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Main Camera
-  m_TagString: MainCamera
+  m_Name: Fill
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &852523982
-Transform:
+--- !u!224 &442218247
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 852523981}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.37086314, y: -0.22785029, z: 0.09437861, w: 0.8953421}
-  m_LocalPosition: {x: 9.6, y: 9.6, z: -5}
+  m_GameObject: {fileID: 442218246}
+  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: 855042511}
-  m_LocalEulerAnglesHint: {x: 45, y: -28.556, z: 0}
---- !u!114 &852523983
+  m_Father: {fileID: 1080868192}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 5.2249756, y: 0}
+  m_SizeDelta: {x: 20.44999, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &442218248
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 852523981}
+  m_GameObject: {fileID: 442218246}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 979955b7cbad63f4dbdb0c30ea8679f1, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  camera: {fileID: 852523986}
---- !u!114 &852523984
+  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: 26d89dd2d7ae148e4acefd7fb973eb82, 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!222 &442218249
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 442218246}
+  m_CullTransparentMesh: 1
+--- !u!1 &753442135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 753442136}
+  - component: {fileID: 753442139}
+  - component: {fileID: 753442138}
+  - component: {fileID: 753442137}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &753442136
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 753442135}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 164319093}
+  - {fileID: 1324294697}
+  - {fileID: 773560729}
+  m_Father: {fileID: 123020045}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &753442137
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 852523981}
+  m_GameObject: {fileID: 753442135}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 1
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
---- !u!81 &852523985
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 852523981}
+    m_Bits: 4294967295
+--- !u!114 &753442138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 753442135}
   m_Enabled: 1
---- !u!20 &852523986
-Camera:
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &753442139
+Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 852523981}
+  m_GameObject: {fileID: 753442135}
   m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 40
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
   m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_enableGDRP: 1
-  m_backfaceCulling: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!1 &855042509
+--- !u!1 &773560728
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -570,49 +693,95 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 855042511}
-  - component: {fileID: 855042510}
-  m_Layer: 0
+  - component: {fileID: 773560729}
+  - component: {fileID: 773560732}
+  - component: {fileID: 773560731}
+  - component: {fileID: 773560730}
+  m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: CombatRoot (1)
+  m_Name: Text (Legacy)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &855042510
+--- !u!224 &773560729
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 773560728}
+  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: 753442136}
+  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: -627}
+  m_SizeDelta: {x: 660.2, y: 33}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &773560730
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 855042509}
+  m_GameObject: {fileID: 773560728}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e1ee1c62c905bb24ea7c9cf3d9d40b56, type: 3}
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  trauma: 0
-  TraumaExponent: 1
-  MaximumAngularShake: {x: 5, y: 5, z: 5}
-  MaximumTranslationShake: {x: 0.75, y: 0.75, z: 0.75}
---- !u!4 &855042511
-Transform:
+  m_EffectColor: {r: 0.4056604, g: 0.07760034, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &773560731
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 855042509}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 24.1, y: 12.5, z: 25.6}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 852523982}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!1 &1421949364
+  m_GameObject: {fileID: 773560728}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u51C6\u5907\u8D44\u6E90\u4E2D..."
+--- !u!222 &773560732
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 773560728}
+  m_CullTransparentMesh: 1
+--- !u!1 &1080868191
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -620,49 +789,36 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1421949366}
-  - component: {fileID: 1421949365}
-  m_Layer: 0
+  - component: {fileID: 1080868192}
+  m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: GameApp
+  m_Name: Fill Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1421949365
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1421949364}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 72b9dd5ad46807849b93ecfaf88c1343, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  ShaderVariantCollection: {fileID: 20000000, guid: 0456cfcc19cfc704784e3e24885b4321, type: 2}
-  BundleLoadType: 0
-  h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
-  isTest: 0
-  levelBattleId: 1
---- !u!4 &1421949366
-Transform:
+--- !u!224 &1080868192
+RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1421949364}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.7748146, y: 8.296714, z: -0.9411278}
+  m_GameObject: {fileID: 1080868191}
+  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: 0}
+  m_Children:
+  - {fileID: 442218247}
+  m_Father: {fileID: 1324294697}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1509080104
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: -20, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -670,256 +826,168 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1509080106}
-  - component: {fileID: 1509080105}
-  m_Layer: 0
+  - component: {fileID: 1312762639}
+  - component: {fileID: 1312762641}
+  - component: {fileID: 1312762640}
+  m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: TestHeroConfig
+  m_Name: Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1509080105
+--- !u!224 &1312762639
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1312762638}
+  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: 1324294697}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1312762640
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1509080104}
+  m_GameObject: {fileID: 1312762638}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5284e80e1e7e4646b0c0eab2cfcf6ba7, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  myHeroInfo:
-  - modelName: Hero01
-    hp: 100
-    att: 1
-    attSpeed: 1
-    attDis: 2
-    isGpu: 0
-    skillId: 1b270000ab860100
-  - modelName: Hero02
-    hp: 100
-    att: 1
-    attSpeed: 1
-    attDis: 4
-    isGpu: 0
-    skillId: 1b2700004b0d0300
-  - modelName: Hero03
-    hp: 100
-    att: 1
-    attSpeed: 1
-    attDis: 5
-    isGpu: 0
-    skillId: 1b270000eb930400
-  - modelName: Hero04
-    hp: 100
-    att: 1
-    attSpeed: 1
-    attDis: 6
-    isGpu: 0
-    skillId: 1b2700008b1a0600
-  enemyHeroInfo:
-  - count: 10
-    jianGe: 10
-    enemyHeroInfo:
-    - modelName: Guaiwu01
-      hp: 100
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 100
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 100
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 100
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-  - count: 0
-    jianGe: 0
-    enemyHeroInfo:
-    - modelName: Guaiwu01
-      hp: 300
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 100
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 300
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: Guaiwu01
-      hp: 300
-      att: 3
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b270000
-    - modelName: GuaiwuJY01
-      hp: 5000
-      att: 20
-      attSpeed: 1
-      attDis: 2
-      isGpu: 1
-      skillId: 1b2700008b4f1200
-  - count: 0
-    jianGe: 0
-    enemyHeroInfo:
-    - modelName: GuaiwuBoss01
-      hp: 100
-      att: 5
-      attSpeed: 1
-      attDis: 3
-      isGpu: 1
-      skillId: 1b270000ebc81000f5c81000
---- !u!4 &1509080106
-Transform:
+  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: 6332433fb34294d58bfc835736ee8ac3, 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!222 &1312762641
+CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1509080104}
-  serializedVersion: 2
+  m_GameObject: {fileID: 1312762638}
+  m_CullTransparentMesh: 1
+--- !u!1 &1324294696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1324294697}
+  - component: {fileID: 1324294698}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: LoadSlider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1324294697
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324294696}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.7748146, y: 8.296714, z: -0.9411278}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
+  m_Children:
+  - {fileID: 1312762639}
+  - {fileID: 1080868192}
+  m_Father: {fileID: 753442136}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &3341871095928010210
-PrefabInstance:
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -685}
+  m_SizeDelta: {x: 660.2, y: 122.3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1324294698
+MonoBehaviour:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 785438227}
-    m_Modifications:
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 750
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 1624
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5248254883604704175, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
-      propertyPath: m_Name
-      value: StartBossPanel
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324294696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0}
+  m_FillRect: {fileID: 442218247}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 1
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 1421949366}
-  - {fileID: 1509080106}
   - {fileID: 376281607}
-  - {fileID: 855042511}
   - {fileID: 235899921}
-  - {fileID: 785438226}
+  - {fileID: 123020045}

+ 2 - 0
Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -144,6 +144,7 @@ namespace Fort23.Mono
                 AssetHandle assetBundle =
                     await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("Canvas.prefab");
                 GameObject prefab = assetBundle.AssetObject<GameObject>();
+                prefab.SetActive(false);
                 // UIRootTransform = prefab.GetComponent<RectTransform>();
                 sizeDelta = prefab.GetComponent<RectTransform>().sizeDelta;
                 // if (1.0f * Screen.width / Screen.height < 1334f / 750f)
@@ -160,6 +161,7 @@ namespace Fort23.Mono
                 UILayers[3] = prefab.transform.GetChild(3);
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
+                
 
             // if (MaskWordData == null)
             // {

+ 6 - 3
Assets/Scripts/GameLogic/Combat/CombatTool/AttType.cs

@@ -1,8 +1,11 @@
-namespace GameLogic.Combat.CombatTool
+using System;
+
+namespace GameLogic.Combat.CombatTool
 {
+    [Flags]
     public enum AttType
     {
-        Normal,
-        Skill,
+        Normal = 0,
+        Skill = 1,
     }
 }

+ 16 - 6
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -20,17 +20,19 @@ namespace GameLogic.Combat.CombatTool
         {
             return Random.Next(0, 100);
         }
-        public int GetOdd(int min,int max)
+
+        public int GetOdd(int min, int max)
         {
             return Random.Next(min, max);
         }
+
         public long GetVlaueRatioForLong(long value, float ration)
         {
             long v = (value * (long)(ration * 100)) / 10000;
             return v;
         }
 
-      
+
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroEntity target, long att, AttType attType,
             TriggerData triggerData, HarmType harmType = HarmType.Null)
         {
@@ -49,7 +51,6 @@ namespace GameLogic.Combat.CombatTool
             AttType attType, TriggerData triggerData,
             HarmType harmType = HarmType.Default)
         {
-            
             HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
             harmReturnInfo.source = source;
             harmReturnInfo.target = target;
@@ -59,14 +60,22 @@ namespace GameLogic.Combat.CombatTool
             harmReturnInfo.triggerData = triggerData;
             if (target.combatHeroEntity.isDie)
             {
-                return  harmReturnInfo;
+                return harmReturnInfo;
             }
 
+            int odd = GetOdd(0, 100);
+            if (odd <= source.CurrCombatHeroInfo.crit+5)
+            {
+                harmReturnInfo.harmType |= HarmType.BaoJi;
+                att += GetVlaueRatioForLong(att, source.CurrCombatHeroInfo.critDamage.Value);
+            }
+            harmReturnInfo.att = att;
             target.combatHeroEntity.HeroHurt(harmReturnInfo);
-          
+
 
             return harmReturnInfo;
         }
+
         public HarmReturnInfo Recover(CombatHeroEntity source, CombatHeroHitPoint target, long att,
             AttType attType, HarmType harmType, TriggerData triggerData)
         {
@@ -79,8 +88,9 @@ namespace GameLogic.Combat.CombatTool
             harmReturnInfo.triggerData = triggerData;
             if (target.combatHeroEntity.isDie)
             {
-                return  harmReturnInfo;
+                return harmReturnInfo;
             }
+
             target.combatHeroEntity.Recover(harmReturnInfo);
             return harmReturnInfo;
         }

+ 11 - 4
Assets/Scripts/GameLogic/Combat/CombatTool/HarmType.cs

@@ -1,12 +1,19 @@
-namespace GameLogic.Combat.CombatTool
+using System;
+
+namespace GameLogic.Combat.CombatTool
 {
+    [Flags]
     public enum HarmType
     {
-        Null,
-        Default,
+        Null=0,
+        Default=1,
         /// <summary>
         /// 系统杀死 不掉落和统计
         /// </summary>
-        SystemKo,
+        SystemKo=2,
+        /// <summary>
+        /// 暴击了
+        /// </summary>
+        BaoJi=4,
     }
 }

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -387,6 +387,9 @@ namespace GameLogic.Combat.CombatType
                         heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
                     }));
             }
+
+            Vector3 p = _combatScenesConfig.heroPoint[0].position;
+            combatController.CombatCameraControllder.root.position =new Vector3(p.x,  combatController.CombatCameraControllder.root.position.y, p.z + 13);
         }
 
         // private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)

+ 8 - 0
Assets/Scripts/GameStart.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CnhO5iivBS3RfAxXoWnZzLWPBHimsdkT1zfXuuN/aFUTqtE89GfkIFQ=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 30 - 0
Assets/Scripts/GameStart/GameStart.cs

@@ -0,0 +1,30 @@
+using System.Reflection;
+using UnityEngine;
+
+public class GameStart : MonoBehaviour
+{
+    public ShaderVariantCollection ShaderVariantCollection;
+    public LoadType LoadType;
+    public string h5Url;
+
+    private GameStartUIPanel _gameStartUIPanel;
+
+    public void Start()
+    {
+        _gameStartUIPanel = GetComponent<GameStartUIPanel>();
+        StartLoadGame();
+    }
+
+    private void StartLoadGame()
+    {
+        string typeName = "GameApplction";
+        // lock (ActivatorLoock)
+        {
+            Assembly assembly = Assembly.Load("Fort23.Mono");
+
+            System.Type type = assembly.GetType(typeName);
+            IGameStart iGameStart = System.Activator.CreateInstance(type) as IGameStart;
+            iGameStart.StartGame(LoadType, h5Url, _gameStartUIPanel, delegate { gameObject.SetActive(false); });
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameStart/GameStart.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CHIXsiKlAHt7bSWyzrSO4yF9CmarlSErlIJKlx9jPZaXnm14uoTMh8o=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/Scripts/GameStart/GameStartDll.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "GameStartDll"
+}

+ 7 - 0
Assets/Scripts/GameStart/GameStartDll.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xn8cvSmuAnJHlQMZ7IHbuNar1M9p6XHvGTbPFPADGDBU8eB4ERDoNLk=
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 21 - 0
Assets/Scripts/GameStart/GameStartUIPanel.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class GameStartUIPanel : MonoBehaviour
+{
+    public Text massgeText;
+
+    public Slider loadSlider;
+
+    public void ShowMassge(string massge)
+    {
+        massgeText.text = massge;
+    }
+
+    public void SetSlider(float slider)
+    {
+        loadSlider.value = slider;
+    }
+}

+ 11 - 0
Assets/Scripts/GameStart/GameStartUIPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W34c4y2tAXIkqIR+5MeYlDl+lIBhy2kKirER8v+rMeo94Euds7zyx1s=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 0
Assets/Scripts/GameStart/IGameStart.cs

@@ -0,0 +1,5 @@
+
+public interface IGameStart
+{
+    void StartGame(LoadType LoadType,string h5Url,GameStartUIPanel gameStartUIPanel,System.Action LoadFinish);
+}

+ 3 - 0
Assets/Scripts/GameStart/IGameStart.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 329f876a51f6445a95ff2213a8845816
+timeCreated: 1732858651

+ 17 - 0
Assets/Scripts/GameStart/LoadType.cs

@@ -0,0 +1,17 @@
+
+
+    public enum LoadType
+    {
+        /// <summary>
+        /// 本地资源加载
+        /// </summary>
+        LocalAsset,
+        /// <summary>
+        /// 本地bundle加载
+        /// </summary>
+        LocalBundle,
+        /// <summary>
+        /// h5模式
+        /// </summary>
+        H5,
+    }

+ 3 - 0
Assets/Scripts/GameStart/LoadType.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 96882bc3d1bb432c9feadb09b13e8630
+timeCreated: 1732858838

+ 8 - 1
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -13,7 +13,14 @@ namespace GameLogic.Combat
     {
         public CombatController CombatController;
 
-        public  void AddCombatController(CombatController combatController)
+        public async CTask Init()
+        {
+            string name = "CombatRoot.prefab";
+            AssetHandle assetHandle = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(name);
+            assetHandle.AssetObject<GameObject>().SetActive(true);
+        }
+
+        public void AddCombatController(CombatController combatController)
         {
             this.CombatController = combatController;
         }

+ 2 - 1
Assets/Scripts/GameUI/Fort23.Mono.asmdef

@@ -9,7 +9,8 @@
         "GUID:8686510298c0d4b4eb1f222eb30ff079",
         "GUID:e09883e1c1f18b041993504f371ffac6",
         "GUID:fa5baf2c58faab54689c976e76104564",
-        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:a53833a977d49cb4993f5eabd5a75200"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 32 - 28
Assets/Scripts/GameUI/GameApplction.cs

@@ -6,6 +6,7 @@ using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
+using GameUI;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -14,7 +15,8 @@ using UnityEngine.UI;
 using Utility.CTween;
 using Utility.UITool;
 
-public class GameApplction : MonoBehaviour
+
+public class GameApplction : IGameStart
 {
     public ShaderVariantCollection ShaderVariantCollection;
     public BundleLoadType BundleLoadType;
@@ -22,15 +24,27 @@ public class GameApplction : MonoBehaviour
     private Entity _root;
     private Entity _scene;
     public bool isTest;
-    public int levelBattleId;
+    public int levelBattleId = 1;
+
+    private GameStartUIPanel gameStartUIPanel;
 
-    private async void Start()
+    public async void StartGame(LoadType LoadType, string h5Url, GameStartUIPanel gameStartUIPanel,
+        System.Action LoadFinish)
     {
-        // ShaderVariantCollection.WarmUp();
+        this.gameStartUIPanel = gameStartUIPanel;
+        gameStartUIPanel.ShowMassge("开始加载资源");
+        gameStartUIPanel.SetSlider(0);
+        this.h5Url = h5Url;
+        BundleLoadType = (BundleLoadType)LoadType;
+        GameObject gameObject = new GameObject("app");
+        gameObject.AddComponent<GameApplctionMono>();
         await InitGameApplication();
+        LoadFinish?.Invoke();
+        UIManager.Instance.Canvas.gameObject.SetActive(true);
         Debug.Log("初始化完成");
     }
 
+
     private async CTask InitGameApplication()
     {
         _scene = new Scene();
@@ -39,19 +53,25 @@ public class GameApplction : MonoBehaviour
 
         _root.AddComponent<TimerComponent>();
         _root.AddComponent<CoroutineLockComponent>();
+        gameStartUIPanel.ShowMassge("loadBundle");
+        gameStartUIPanel.SetSlider(0.15f);
         AssetBundleLoadManager.Instance.BundleLoadType = BundleLoadType;
         AssetBundleLoadManager.Instance.h5Url = h5Url;
         await AssetBundleLoadManager.Instance.InitAssetsManager(null);
-
+        gameStartUIPanel.ShowMassge("loadConfig");
+        gameStartUIPanel.SetSlider(0.25f);
         await ConfigComponent.Instance.Preload();
         await AnimationCurveManager.Instance.Init();
         UGUIPackLoad uguiPackLoad = new UGUIPackLoad();
         UGUIPackManager.Instance.SetIUGUIPackLoad(uguiPackLoad);
         await uguiPackLoad.InitPack();
+        gameStartUIPanel.ShowMassge("loadLanguage");
+        gameStartUIPanel.SetSlider(0.45f);
         await LanguageManager.Instance.InitManager();
         _root.AddComponent<StaticUpdater>();
-        _root.AddComponent<UIManager, Transform>(transform);
-
+        _root.AddComponent<UIManager, Transform>(null);
+        gameStartUIPanel.ShowMassge("loadUI");
+        gameStartUIPanel.SetSlider(0.55f);
         await UIManager.Instance.InitUI();
         CustomTweenManager.Init();
 
@@ -59,31 +79,15 @@ public class GameApplction : MonoBehaviour
         // PlayerManager.Instance.InitTestHero();
         //主UI加载
         MainSceneController.Instance.Init();
-
+        await CombatDrive.Instance.Init();
         StartCombatInfo startCombatInfo = new StartCombatInfo();
         startCombatInfo.CombatType = isTest ? CombatType.TestCombat : CombatType.LevelBattle;
         startCombatInfo.levelBattleId = levelBattleId;
         CombatDrive.Instance.AddCombatController(new CombatController());
+        gameStartUIPanel.ShowMassge("loadCombat");
+        gameStartUIPanel.SetSlider(0.95f);
         await CombatDrive.Instance.StartCombat(startCombatInfo);
-    }
-
-    public void Update()
-    {
-#if UNITY_EDITOR
-        if (EditorApplication.isPaused)
-        {
-            return;
-        }
-#endif
-        
-
-        EventSystem.Instance.Update();
-        AssetBundleLoadManager.Instance.UpdateBundle();
-        TimeHelper.clientFrame = TimeHelper.ClientFrame() + (long)(Time.deltaTime * 1000);
-    }
-
-    public void LateUpdate()
-    {
-        EventSystem.Instance.LateUpdate();
+        gameStartUIPanel.ShowMassge("loadFinish");
+        gameStartUIPanel.SetSlider(1f);
     }
 }

+ 30 - 0
Assets/Scripts/GameUI/GameApplctionMono.cs

@@ -0,0 +1,30 @@
+using Fort23.Core;
+using UnityEditor;
+using UnityEngine;
+
+namespace GameUI
+{
+    public class GameApplctionMono : MonoBehaviour
+    {
+        public GameApplction GameApplction;
+        public void Update()
+        {
+#if UNITY_EDITOR
+            if (EditorApplication.isPaused)
+            {
+                return;
+            }
+#endif
+
+
+            EventSystem.Instance.Update();
+            AssetBundleLoadManager.Instance.UpdateBundle();
+            TimeHelper.clientFrame = TimeHelper.ClientFrame() + (long)(Time.deltaTime * 1000);
+        }
+
+        public void LateUpdate()
+        {
+            EventSystem.Instance.LateUpdate();
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/GameApplctionMono.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e6aef68214af4298b2d1714eecf036ba
+timeCreated: 1732859092

+ 7 - 7
Assets/Scripts/GameUI/UI/Combat/CombatShowTextPanel.cs

@@ -9,18 +9,18 @@ namespace Fort23.Mono
     [UIBinding(prefab = "CombatShowTextPanel")]
     public partial class CombatShowTextPanel : UIPanel
     {
-        public static Font huiFuFont;
-        public static Font shangHai;
+        // public static Font huiFuFont;
+        // public static Font shangHai;
 
      
         public static void  OpenCombatShowTextPanel(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             cTaskAwaitBuffer.AddTask(UIManager.Instance.LoadAndOpenPanel<CombatShowTextPanel>(null,UILayer.Middle));
-            cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("hd_0.fontsettings",
-                delegate(AssetHandle handle) { huiFuFont = handle.AssetObject<Font>(); }));
-
-            cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("Zhanli_0.fontsettings",
-                delegate(AssetHandle handle) { shangHai = handle.AssetObject<Font>(); }));
+            // cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("hd_0.fontsettings",
+            //     delegate(AssetHandle handle) { huiFuFont = handle.AssetObject<Font>(); }));
+            //
+            // cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("Zhanli_0.fontsettings",
+            //     delegate(AssetHandle handle) { shangHai = handle.AssetObject<Font>(); }));
 
           
         }

+ 14 - 2
Assets/Scripts/GameUI/UI/Combat/ShowTextWidget.cs

@@ -33,14 +33,26 @@ namespace Fort23.Mono
             transform.position = p2;
             if (isHarm)
             {
-                text.font = CombatShowTextPanel.shangHai;
+                text.color=Color.white;
             }
             else
             {
-                text.font = CombatShowTextPanel.huiFuFont;
+                text.color=Color.green;
             }
 
             text.text = harmReturnInfo.att.ToString();
+            if (Animator != null)
+            {
+                if (harmReturnInfo.harmType.HasFlag(HarmType.BaoJi))
+                {
+                    Animator.Play("ShowTextWidgetBaoji");
+                }
+                else
+                {
+                    Animator.Play("ShowTextWidgetShow");
+                }
+            }
+
             CombatTimerManager.Instance.AddTimer(1, delegate
             {
                 GObjectPool.Instance.Recycle(this);

+ 0 - 983
Assets/ShaderVariants.shadervariants

@@ -1,983 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!200 &20000000
-ShaderVariantCollection:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: ShaderVariants
-  m_Shaders:
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS
-        passType: 13
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-  - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: DIRECTIONAL LIGHTPROBE_SH
-        passType: 4
-      - keywords: DIRECTIONAL
-        passType: 5
-      - keywords: 
-        passType: 8
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 6, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: _SUNDISK_HIGH_QUALITY
-        passType: 0
-      - keywords: _SUNDISK_SIMPLE
-        passType: 0
-  - first: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _ALPHABLEND_ON
-        passType: 0
-      - keywords: _ALPHABLEND_ON _COLOROVERLAY_ON
-        passType: 0
-      - keywords: _ALPHABLEND_ON _FADING_ON
-        passType: 0
-      - keywords: _FADING_ON
-        passType: 0
-      - keywords: PROCEDURAL_INSTANCING_ON SHADOWS_DEPTH _ALPHABLEND_ON
-        passType: 8
-      - keywords: PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON
-        passType: 8
-      - keywords: SHADOWS_DEPTH _ALPHABLEND_ON
-        passType: 8
-      - keywords: 
-        passType: 13
-  - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 9104, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10701, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: UNITY_UI_ALPHACLIP
-        passType: 0
-  - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _OUTPUT_DEPTH
-        passType: 0
-  - first: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
-    second:
-      variants:
-      - keywords: _MAIN_LIGHT_SHADOWS
-        passType: 0
-  - first: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _MAIN_LIGHT_SHADOWS
-          _SPECULARHIGHLIGHTS_OFF
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SPECULAR_SETUP
-        passType: 13
-  - first: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: OUTLINE_ON UNDERLAY_ON
-        passType: 0
-  - first: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: c6a0e78efe21c54448ab2869b09e8a2d, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: dfab9f92705bc3448be937135a3cb41d, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: de8b10515e8c7b6419b7a2e25ccbf055, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: INSTANCING_ON
-        passType: 8
-      - keywords: EVALUATE_SH_VERTEX INSTANCING_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX INSTANCING_ON _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-          _SHADOWS_SOFT
-        passType: 13
-  - first: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: -6465566751694194690, guid: 122ce928207ad5f41a908f23d3a05130, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-  - first: {fileID: 4800000, guid: e39bd598ce13f44ba8af997d3e42cd18, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 60e10855641b4d84da68ec72e6f6eeb8, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e8b802ac01d87144b91f12f40c1f2659, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 50b406436c6214c49aaaa6011b71dde8, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 5caf62d8bd7c44596ace77ef9eb8ea31, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
-    second:
-      variants:
-      - keywords: _SMAA_PRESET_LOW
-        passType: 0
-  - first: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3}
-    second:
-      variants:
-      - keywords: _GENERIC
-        passType: 0
-  - first: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 131f1b93a4ebd459ba87b6bad055fb33, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _FXAA
-        passType: 0
-  - first: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
-    second:
-      variants:
-      - keywords: GEOM_TYPE_BRANCH
-        passType: 8
-      - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE
-        passType: 8
-      - keywords: GEOM_TYPE_BRANCH
-        passType: 13
-      - keywords: GEOM_TYPE_BRANCH LOD_FADE_PERCENTAGE
-        passType: 13
-  - first: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: FOG_LINEAR
-        passType: 0
-      - keywords: _POINT
-        passType: 0
-  - first: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 12
-  - first: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _DBUFFER_MRT1
-        passType: 0
-  - first: {fileID: 4800000, guid: 8516d7a69675844a7a0b7095af7c46af, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: _INTERLEAVED_GRADIENT _SAMPLE_COUNT_LOW _SOURCE_DEPTH_LOW
-        passType: 0
-  - first: {fileID: 4800000, guid: 5ec81c81908db34429b4f6ddecadd3bd, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 8fbe92a9edfe6074e841d6dd1509bc59, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 99134b1f0c27d54469a840832a28fadf, type: 3}
-    second:
-      variants:
-      - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE
-        passType: 8
-      - keywords: _WINDQUALITY_NONE
-        passType: 8
-      - keywords: LOD_FADE_PERCENTAGE _WINDQUALITY_NONE
-        passType: 13
-      - keywords: _WINDQUALITY_NONE
-        passType: 13
-  - first: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0a7e590f3cf1d4ee8a8fab5b6eff09ef, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 74b1585886a85614aa34e2c8e303c77a, type: 3}
-    second:
-      variants:
-      - keywords: DOTS_INSTANCING_ON
-        passType: 13
-  - first: {fileID: 4800000, guid: 0ca6dca7396eb48e5849247ffd444914, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-      - keywords: 
-        passType: 11
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 19dfbb09098c9584a83c956fbd6c5d79, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 91bd8b6735bb531488bbcaaf06ea18ba, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: f7ada0af4f174f0694ca6a487b8f543d, type: 3}
-    second:
-      variants:
-      - keywords: DIRECTIONAL
-        passType: 4
-      - keywords: POINT
-        passType: 5
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 85187c2149c549c5b33f0cdb02836b17, type: 3}
-    second:
-      variants:
-      - keywords: DIRECTIONAL
-        passType: 4
-      - keywords: SHADOWS_DEPTH
-        passType: 8
-  - first: {fileID: -6465566751694194690, guid: fb6390f650ca44a5ba3246d8dda47927, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a02a7d8c237544f1962732b55a9aebf1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 652caa153f81adf4093708ef5964e91f, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 5d04157bb62aeec4e89192daf42b5f21, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 13
-  - first: {fileID: 4800000, guid: 2f2082001cc113a40b017a19e7618df1, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 9a4ee44acff63334fa3b1848ad17796e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: da07703fcc09f8d4799221050659bd55, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 2933b413a51fc4ff3a83c7ef4177ae84, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 48bb5f55d8670e349b6e614913f9d910, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 3230fdc399f8287488325e5941a00527, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0d0f817524897904ba47a6a1d55e7668, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 77cfa04f893eb8745b6a454a3d51b43c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: a16365e8c873daa4c94919438490b905, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 603d454d711fe784cba9ce08dd22b881, type: 3}
-    second:
-      variants:
-      - keywords: DUMMY
-        passType: 0
-  - first: {fileID: 4800000, guid: c8d12adcee749c344b8117cf7c7eb912, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: bedd19944f451ba4d83e7ed69be98d5c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 1e3b057af24249748ff873be7fafee47, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 4386e57b23a56004c93e1d57d2bbcb4f, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: c7715b638c6f5c849a6ec12234ae264c, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 9c442dc870b456e48b615cd8add0e9ef, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 61e53729ad706d049b12a441f328fe34, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 95e15a77195eb574ab82aaac18b1c796, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 0a8f4dcd626bcd14bbbfa5a5e116b16e, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: dd89cf5b9246416f84610a006f916af7, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: -6465566751694194690, guid: 3739e562a03fc0b4982d8aa66cc50865, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13
-  - first: {fileID: 4800000, guid: 14eb328de4b8eb245bb7cea29e4ac00b, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 128e987d567d4e2c824d754223b3f3b0, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 7cbb3655339ec401ca75ba5fe26884f4, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: 4800000, guid: 2df96b66b5510f94b98df2ac6f926ef4, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 0
-  - first: {fileID: -6465566751694194690, guid: 24ce5c251bc875b4ba39dde2e7209665, type: 3}
-    second:
-      variants:
-      - keywords: 
-        passType: 8
-      - keywords: 
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS
-        passType: 13
-      - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
-        passType: 13

+ 0 - 8
Assets/ShaderVariants.shadervariants.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: WikYt3ysUXskEPqvuc/VMB6n4o09TPjF5yEi/QjcUhggJaVc631KalM=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 20000000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Assembly-CSharp.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Assembly-CSharp.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Examples.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Examples.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/CodeStage.AFPSCounter.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Coffee.SoftMaskForUGUI.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Coffee.SoftMaskForUGUI.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/DownloadSystem.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/DownloadSystem.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Core.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Core.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameData.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameData.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameLogic.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.GameLogic.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Mono.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Fort23.Mono.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerEngine.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerEngine.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerSamples.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GPUECSAnimationBakerSamples.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GameTimeLine.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/GameTimeLine.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/HybridCLR.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/HybridCLR.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.FSM.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.FSM.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.Samples.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.Samples.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Kybernetik.Animancer.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Purchasing.Common.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Purchasing.Common.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRDebugger.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRDebugger.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRF.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/StompyRobot.SRF.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/ThirdParty.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/ThirdParty.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/UniRx.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/UniRx.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Animation.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Animation.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Common.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Common.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.IK.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.IK.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.PixelPerfect.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.PixelPerfect.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.SpriteShape.Runtime.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.SpriteShape.Runtime.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Tilemap.Extras.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.2D.Tilemap.Extras.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.Samples.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.Samples.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.dll


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.AI.Navigation.pdb


BIN
HybridCLRData/HotUpdateDlls/WeixinMiniGame/Unity.Analytics.DataPrivacy.dll


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác