Merge branch 'master' of http://fort23.cn:3000/fort23/XY001

# Conflicts:
#	Assets/Res/UI/TxtGuildPanel.prefab.meta   resolved by master version
#	Assets/Scripts/GameUI/UI/UserGuild.meta   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/VFX/Materials/fx_lashen2.mat

@@ -0,0 +1,164 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_lashen2
+  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 8d412bd10bf8dc746bfe024147c57843, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaClip: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _CTime: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _Diss_value: 0
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _Soft_value: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _Turb_Value: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    - _ca: 1
+    - _light: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Main_Color: {r: 3.482202, g: 3.482202, b: 3.482202, a: 1}
+    - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+--- !u!114 &6176688118711207841
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

Assets/Art/VFX/Materials/fx_lashen2.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Cn1O5CusUS17JzsseHGZp/BNOoEtdMrkCeNALlub8tGlsYREyG354wg=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/Materials/fx_sk_huan2.mat

@@ -67,7 +67,7 @@ Material:
     - _Main_Tex:
         m_Texture: {fileID: 2800000, guid: 9545f96f4995eee4999b65ec54b27be1, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Offset: {x: 0, y: -0.22}
     - _Mask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -93,8 +93,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _dissolve:
-        m_Texture: {fileID: 2800000, guid: ed03ebad7dbda1d49b4b879ae969f4a0, type: 3}
-        m_Scale: {x: 1.5, y: 1.5}
+        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
+        m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - unity_Lightmaps:
         m_Texture: {fileID: 0}

Assets/Art/VFX/Materials/fx_xl_lashen.mat

@@ -0,0 +1,164 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_xl_lashen
+  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 10c505dd08eb16c419d8a49805e0ada5, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaClip: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _CTime: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _Diss_value: 0
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _Soft_value: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _Turb_Value: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    - _ca: 1
+    - _light: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Main_Color: {r: 3.482202, g: 3.482202, b: 3.482202, a: 1}
+    - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+--- !u!114 &6176688118711207841
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

Assets/Art/VFX/Materials/fx_xl_lashen.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WSgb436qBX1doCwYWkYgmZ/Prwdt4HHoBp/t0Dj7PEbGS/MXL2uDtxg=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/22.png.meta → Assets/Art/VFX/Textures/fx_lashen1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XnkWsSn4Wn45LwPrNxG+b8efG/jqiBjgSLBym5+f/ACZJSwhNsYJLUo=
+guid: By4btCj/B3peFpEVIZl0BiAy75vw6TY8TMJr59rB+Qz/2R763XtkDlY=
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -57,7 +57,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -118,7 +118,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 

Assets/Art/未标题-1.png.meta

@@ -1,133 +0,0 @@
-fileFormatVersion: 2
-guid: DnwX5nipWnLYOvBseklp7ZIIdyr8eWLw75Et9mj4sWCc+rlMQkG7NC8=
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/WidgetHero.prefab

@@ -1559,12 +1559,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxDuration: 0.8
+  maxDuration: 0
   isUpdate: 0
-  currTime: 0.80217147
+  currTime: 0.8180616
   GrpupInfos:
   - Foldout: 1
-    isActive: 1
+    isActive: 0
     animName: skillShow
     isLoop: 0
     allTargets:

Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs

@@ -21,7 +21,7 @@ namespace Core.UI.UTool.UITween
         // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
 
 
-        public void StartPlay()
+        public void StartPlay(UITweenController uiTweenController)
         {
             if (TweenAssetInfo == null)
             {
@@ -38,7 +38,7 @@ namespace Core.UI.UTool.UITween
                 }
 
                 tweenEntity.Prepare();
-                tweenEntity.Rest(allTargets[i]);
+                tweenEntity.Rest(uiTweenController,allTargets[i]);
             }
 
             isUpdate = true;
@@ -63,7 +63,7 @@ namespace Core.UI.UTool.UITween
             }
         }
 
-        public void JumpToTime(float t)
+        public void JumpToTime(UITweenController UITweenController,float t)
         {
             if (TweenAssetInfo == null)
             {
@@ -76,10 +76,10 @@ namespace Core.UI.UTool.UITween
                 // allTweenInfo[i].Rest();
             }
 
-            PlayTween(t, true);
+            PlayTween(UITweenController,t, true);
         }
 
-        public void PlayTween(float t, bool isFallBack)
+        public void PlayTween(UITweenController UITweenController,float t, bool isFallBack)
         {
             if (TweenAssetInfo == null)
             {
@@ -93,7 +93,7 @@ namespace Core.UI.UTool.UITween
 
             for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
             {
-                TweenAssetInfo.allTweenInfo[i].Play(allTargets[i], t, isFallBack);
+                TweenAssetInfo.allTweenInfo[i].Play(UITweenController,allTargets[i], t, isFallBack);
             }
         }
     }

Assets/Scripts/Core/UI/UTool/UITween/TweenBasic.cs

@@ -16,31 +16,33 @@ namespace Core.UI.UTool.UITween
         protected float _addTime;
 
 
-        public void Play(Object RectTransform,float allTime,bool isFallBack)
+
+        public void Play(UITweenController uiTweenController,Object RectTransform,float allTime,bool isFallBack)
         {
+          
             if (allTime < delay)
             {
                 if (isFallBack)
                 {
-                    Rest(RectTransform);
+                    Rest(uiTweenController,RectTransform);
                 }
 
                 return;
             }
 
-            ProPlay(RectTransform,allTime - delay);
+            ProPlay(uiTweenController,RectTransform,allTime - delay);
         }
 
-        protected virtual void ProPlay(Object RectTransform,float allTime)
+        protected virtual void ProPlay(UITweenController uiTweenController,Object RectTransform,float allTime)
         {
         }
 
-        public void Rest(Object RectTransform)
+        public void Rest(UITweenController uiTweenController,Object RectTransform)
         {
-            ProRest(RectTransform);
+            ProRest(uiTweenController,RectTransform);
         }
 
-        protected virtual void ProRest(Object RectTransform)
+        protected virtual void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
         }
         public void Prepare(float delay,float duration)

Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1911c1540d244ece9bdefea69b01686d
+timeCreated: 1736157269

Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs

@@ -0,0 +1,10 @@
+namespace Core.UI.UTool.UITween
+{
+    public class TweenCacheDataBasic
+    {
+        public TweenCacheDataBasic()
+        {
+            
+        }
+    }
+}

Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ea6dd11e07384220b2336d173c6e9f00
+timeCreated: 1736157256

Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs

@@ -0,0 +1,12 @@
+namespace Core.UI.UTool.UITween
+{
+    public class TweenPlayFxCacheData : TweenCacheDataBasic
+    {
+        public bool isPalyFx;
+
+        public TweenPlayFxCacheData()
+        {
+            
+        }
+    }
+}

Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 33d6e8df3db8450c9090dc3423092877
+timeCreated: 1736157288

Assets/Scripts/Core/UI/UTool/UITween/TweenCanvasGroup.cs

@@ -25,7 +25,7 @@ namespace Core.UI.UTool.UITween
             return canvasGroup;
         }
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object CanvasGroup, float allTime)
         {
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             if (canvasGroup == null)
@@ -53,7 +53,7 @@ namespace Core.UI.UTool.UITween
             canvasGroup.alpha = v;
         }
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController,Object CanvasGroup)
         {
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             if (canvasGroup == null)

Assets/Scripts/Core/UI/UTool/UITween/TweenEntity.cs

@@ -13,9 +13,9 @@ namespace Core.UI.UTool.UITween
         public float delay;
         [CanBeNull] public TweenTransform TweenBasic = null;
         [CanBeNull] public TweenCanvasGroup TweenCanvasGroup = null;
-        [CanBeNull]  public TweenGraphic TweenGraphic = null;
-        [CanBeNull]  public TweenPlayFx TweenPlayFx = null;
-        
+        [CanBeNull] public TweenGraphic TweenGraphic = null;
+        [CanBeNull] public TweenPlayFx TweenPlayFx = null;
+
         [HideInInspector] public Map<TweenType, TweenBasic> Map = new Map<TweenType, TweenBasic>();
 
         public void Claer()
@@ -26,29 +26,62 @@ namespace Core.UI.UTool.UITween
             TweenPlayFx = null;
         }
 
-        public void Play(Object RectTransform,float allTime, bool isFallBack)
+        public void Play(UITweenController UITweenController,Object RectTransform, float allTime, bool isFallBack)
         {
-            TweenBasic?.Play(RectTransform,allTime, isFallBack);
-            TweenCanvasGroup?.Play(RectTransform,allTime, isFallBack);
-            TweenGraphic?.Play(RectTransform,allTime, isFallBack);
-            TweenPlayFx?.Play(RectTransform,allTime, isFallBack);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+            }
         }
 
 
-        public void Rest(Object RectTransform)
+        public void Rest(UITweenController uiTweenController,Object RectTransform)
         {
-            TweenBasic?.Rest(RectTransform);
-            TweenCanvasGroup?.Rest(RectTransform);
-            TweenGraphic?.Rest(RectTransform);
-            TweenPlayFx?.Rest(RectTransform);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Rest(uiTweenController,RectTransform);
+                    break;
+            }
         }
 
         public void Prepare()
         {
-            TweenBasic?.Prepare(delay, duration);
-            TweenCanvasGroup?.Prepare(delay, duration);
-            TweenGraphic?.Prepare(delay, duration);
-            TweenPlayFx?.Prepare(delay, duration);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Prepare(delay, duration);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Prepare(delay, duration);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Prepare(delay, duration);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Prepare(delay, duration);
+                    break;
+            }
         }
     }
 }

Assets/Scripts/Core/UI/UTool/UITween/TweenGraphic.cs

@@ -29,7 +29,7 @@ namespace Core.UI.UTool.UITween
             return graphic;
         }
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object CanvasGroup, float allTime)
         {
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)
@@ -49,7 +49,7 @@ namespace Core.UI.UTool.UITween
             graphic.color = color;
         }
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController,Object CanvasGroup)
         {
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)

Assets/Scripts/Core/UI/UTool/UITween/TweenPlayFx.cs

@@ -6,10 +6,6 @@ namespace Core.UI.UTool.UITween
     [System.Serializable]
     public class TweenPlayFx : TweenBasic
     {
-        protected bool isPalyFx;
-
-        protected ParticleSystem[] particleSystems;
-
         public GameObject GetCanvasGroup(Object CanvasGroup)
         {
             GameObject graphic = CanvasGroup as GameObject;
@@ -26,7 +22,7 @@ namespace Core.UI.UTool.UITween
         }
 
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController uiTweenController, Object CanvasGroup, float allTime)
         {
             GameObject graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)
@@ -34,23 +30,25 @@ namespace Core.UI.UTool.UITween
                 return;
             }
 
-            if (!isPalyFx)
+            TweenPlayFxCacheData tweenPlayFxCacheData = uiTweenController.GetCacheData<TweenPlayFxCacheData>(this);
+            if (!tweenPlayFxCacheData.isPalyFx)
             {
-                particleSystems = graphic.transform.GetComponentsInChildren<ParticleSystem>();
-                
-                isPalyFx = true;
+                ParticleSystem[] particleSystems = graphic.transform.GetComponentsInChildren<ParticleSystem>();
+
+                tweenPlayFxCacheData.isPalyFx = true;
                 for (int i = 0; i < particleSystems.Length; i++)
                 {
                     particleSystems[i].Stop();
-                    particleSystems[i].Clear(true);
-                    particleSystems[i].Play(true);
+                    particleSystems[i].Clear(false);
+                    particleSystems[i].Play(false);
                 }
             }
         }
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController, Object CanvasGroup)
         {
-            isPalyFx = false;
+            TweenPlayFxCacheData tweenPlayFxCacheData = uiTweenController.GetCacheData<TweenPlayFxCacheData>(this);
+            tweenPlayFxCacheData.isPalyFx = false;
         }
     }
 }

Assets/Scripts/Core/UI/UTool/UITween/TweenTextMeshProUGUI.cs

@@ -40,7 +40,7 @@ namespace Core.UI.UTool.UITween
             return rectTransform;
         }
 
-        protected override void ProPlay(Object RectTransform, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object RectTransform, float allTime)
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
@@ -60,7 +60,7 @@ namespace Core.UI.UTool.UITween
             }
         }
 
-        protected override void ProRest(Object RectTransform)
+        protected override void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)

Assets/Scripts/Core/UI/UTool/UITween/TweenTransform.cs

@@ -25,7 +25,7 @@ namespace Core.UI.UTool.UITween
             return rectTransform;
         }
 
-        protected override void ProPlay(Object RectTransform, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object RectTransform, float allTime)
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
@@ -45,7 +45,7 @@ namespace Core.UI.UTool.UITween
             }
         }
 
-        protected override void ProRest(Object RectTransform)
+        protected override void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)

Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
+using Utility;
 using Object = UnityEngine.Object;
 
 namespace Core.UI.UTool.UITween
@@ -23,6 +24,8 @@ namespace Core.UI.UTool.UITween
         public bool isLoop;
         private List<UITweenController> _uiTweenControllers = new List<UITweenController>();
 
+        private Map<TweenBasic, TweenCacheDataBasic> _currPayCacheData = new Map<TweenBasic, TweenCacheDataBasic>();
+
         private void OnEnable()
         {
             if (Application.isPlaying)
@@ -30,12 +33,11 @@ namespace Core.UI.UTool.UITween
                 StartPlay(false);
             }
         }
+
         void OnDrawGizmos()
         {
-        
- 
 #if UNITY_EDITOR
-    
+
             if (!Application.isPlaying)
             {
                 UnityEditor.EditorApplication.QueuePlayerLoopUpdate();
@@ -44,6 +46,18 @@ namespace Core.UI.UTool.UITween
 #endif
         }
 
+        public T GetCacheData<T>(TweenBasic tweenBasic) where T : TweenCacheDataBasic, new()
+        {
+            if (_currPayCacheData.TryGetValue(tweenBasic, out TweenCacheDataBasic tweenPlayFxCacheData))
+            {
+                return tweenPlayFxCacheData as T;
+            }
+
+            T t = new T();
+            _currPayCacheData.Add(tweenBasic, t as TweenCacheDataBasic);
+            return t;
+        }
+
         public void Play(string animName, bool isChildren)
         {
             _uiTweenControllers.Clear();
@@ -66,7 +80,7 @@ namespace Core.UI.UTool.UITween
                         isLoop = true;
                     }
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
             }
@@ -126,7 +140,7 @@ namespace Core.UI.UTool.UITween
                         isLoop = true;
                     }
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
             }
@@ -204,20 +218,20 @@ namespace Core.UI.UTool.UITween
                     //     isLoop = true;
                     // }
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
             }
 
             for (int i = 0; i < _currPlay.Count; i++)
             {
-                _currPlay[i].JumpToTime(t);
+                _currPlay[i].JumpToTime(this, t);
                 // allTweenInfo[i].Rest();
             }
 
             for (int i = 0; i < _currPlay.Count; i++)
             {
-                _currPlay[i].PlayTween(t, true);
+                _currPlay[i].PlayTween(this, t, true);
             }
 
             UITweenController[] uiTweenControllers =
@@ -242,7 +256,7 @@ namespace Core.UI.UTool.UITween
         {
             for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                GrpupInfos[i].PlayTween(t, isFallBack);
+                GrpupInfos[i].PlayTween(this, t, isFallBack);
             }
         }
 
@@ -257,7 +271,7 @@ namespace Core.UI.UTool.UITween
 
             for (int i = 0; i < _currPlay.Count; i++)
             {
-                _currPlay[i].PlayTween(currTime, false);
+                _currPlay[i].PlayTween(this, currTime, false);
             }
 
             for (int i = 0; i < _uiTweenControllers.Count; i++)
@@ -268,6 +282,7 @@ namespace Core.UI.UTool.UITween
             if (!isLoop && currTime >= maxDuration)
             {
                 isUpdate = false;
+                _currPlay.Clear();
             }
         }
     }

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatUseSkillEventData.cs

@@ -6,5 +6,9 @@ namespace Common.Utility.CombatEvent
     public class CombatUseSkillEventData: EventDataBasic<CombatUseSkillEventData>
     {
         public SkillBasic useSkill;
+        protected override void ProDispose()
+        {
+            useSkill = null;
+        }
     }
 }

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -294,7 +294,7 @@ namespace Fort23.Mono
                 WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                     poolName: "WidgetHero", root: rectTransform);
                 itemHero.InitHero(keyValuePair.Value);
-
+                itemHero.own.gameObject.name= "hero_battle"+i;
                 widgetHeroes.Add(itemHero);
 
                 if (HeroUITools.IsLvUpShowGuild(keyValuePair.Value))

ProjectSettings/EntitiesClientSettings.asset

@@ -2,7 +2,7 @@
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -24,7 +24,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 8248
+  controlID: 38731
   draggingID: 0
 --- !u!114 &2
 MonoBehaviour:
@@ -48,8 +48,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 64.8
-    width: 683
-    height: 676.6
+    width: 603
+    height: 427
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -102,23 +102,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 683
-      height: 655.6
-    m_Scale: {x: 0.50461817, y: 0.50461817}
-    m_Translation: {x: 341.5, y: 327.8}
+      width: 603
+      height: 406
+    m_Scale: {x: 0.31249997, y: 0.31249997}
+    m_Translation: {x: 301.5, y: 202.99998}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -676.7493
+      x: -964.8001
       y: -649.60004
-      width: 1353.4987
+      width: 1929.6002
       height: 1299.2001
     m_MinimalGUI: 1
-  m_defaultScale: 0.50461817
-  m_LastWindowPixelSize: {x: 853.75, y: 845.75}
+  m_defaultScale: 0.31249997
+  m_LastWindowPixelSize: {x: 753.75, y: 533.75}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -143,12 +143,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1710.4
+    width: 1512
     height: 1029.2
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 1
-  controlID: 8249
+  controlID: 38732
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -170,12 +170,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1710.4
-    height: 697.6
+    width: 1512
+    height: 448
   m_MinSize: {x: 300, y: 50}
   m_MaxSize: {x: 24288, y: 8096}
   vertical: 0
-  controlID: 8250
+  controlID: 38733
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -194,8 +194,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 684
-    height: 697.6
+    width: 604
+    height: 448
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 2}
@@ -218,10 +218,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 684
+    x: 604
     y: 0
-    width: 545.6
-    height: 697.6
+    width: 564.80005
+    height: 448
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 7}
@@ -249,10 +249,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 684
+    x: 604
     y: 64.8
-    width: 543.6
-    height: 676.6
+    width: 562.80005
+    height: 427
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -267,7 +267,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -154.4, y: -26.400024}
+      snapOffset: {x: -154.40002, y: -26.400024}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -319,9 +319,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: -193.60004}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: unity-transform-toolbar
       index: 0
       layout: 2
@@ -345,9 +345,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: -124}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -488,9 +488,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: -204.00006}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: Scene View/Particles
       index: 8
       layout: 4
@@ -600,20 +600,33 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 13
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
-  m_Gizmos: 1
+  m_Gizmos: 0
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 383.9636, y: 920.5768, z: -1.9258623}
+    m_Target: {x: 0.35163987, y: 0.5956631, z: 0.14315319}
     speed: 2
-    m_Value: {x: 383.9636, y: 920.5768, z: -1.9258623}
+    m_Value: {x: 0.35163987, y: 0.5956631, z: 0.14315319}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -622,7 +635,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 0
+    m_AlwaysRefresh: 1
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -641,17 +654,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -659,17 +672,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.33006513, y: 0.034818467, z: -0.012185236, w: -0.94324094}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.33118066, y: 0.035935063, z: -0.012624387, w: -0.9427984}
   m_Size:
-    m_Target: 255.08656
+    m_Target: 3.0769057
     speed: 2
-    m_Value: 255.08656
+    m_Value: 2.9444075
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -707,10 +720,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1229.6
+    x: 1168.8
     y: 0
-    width: 480.80005
-    height: 697.6
+    width: 343.19995
+    height: 448
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 9}
@@ -738,10 +751,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1229.6
+    x: 1168.8
     y: 64.8
-    width: 478.80005
-    height: 676.6
+    width: 341.19995
+    height: 427
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -754,10 +767,10 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 1030.8}
-      m_SelectedIDs: 
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: ac670100
       m_LastClickedID: 0
-      m_ExpandedIDs: 9a03ffff0c0cffff4421ffff4621ffff4022ffff6ce7ffff38edffff86faffff3aa500006aa500008cbf0000e6c7000004c9000014c9000024c90000acd50000
+      m_ExpandedIDs: 341ef5ff7ed1f5ff5cfdf5ffd04af7ff2cccf7ffc44bf8ff7aa0f8ff9e1df9ff2e7cf9ff4ad3f9ff1a9afaff469efaff86fdfaffb68ffbff64cefbff5acbfcff5e60fdffa6e3fdff76f2feffbecaffff44f7ffff86faffff88c7000042ca00005893010012960100da06020094090200c84402008247020040830200fa850200c0c702007aca02006e21030028240300
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -797,9 +810,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 697.6
-    width: 1710.4
-    height: 331.59998
+    y: 448
+    width: 1512
+    height: 581.19995
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 11}
@@ -829,9 +842,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 762.4
-    width: 1709.4
-    height: 310.59998
+    y: 512.8
+    width: 1511
+    height: 560.19995
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -853,24 +866,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art
+    - Assets/Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 91
+  m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art
-  m_LastFoldersGridSize: 91
+  - Assets/Scenes
+  m_LastFoldersGridSize: 16
   m_LastProjectPath: H:\XY001\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 95}
-    m_SelectedIDs: daa50000
-    m_LastClickedID: 42458
-    m_ExpandedIDs: 00000000daa50000dca50000dea50000e0a50000e2a50000e4a50000e6a50000e8a50000eaa50000eca50000eea50000f0a50000f2a50000f4a50000f6a50000f8a50000faa50000fca50000fea5000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a6000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 5763.8}
+    m_SelectedIDs: 8eac0000
+    m_LastClickedID: 44174
+    m_ExpandedIDs: 0000000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a600008aa600008ca600008ea6000090a6000092a6000094a6000096a6000098a600009aa600009ca600009ea60000a0a60000a2a60000a4a60000a6a60000a8a60000aaa60000aca60000aea6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -898,7 +911,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000daa50000dca50000dea50000e0a50000e2a50000e4a50000e6a50000e8a50000eaa50000eca50000eea50000f0a50000f2a50000f4a50000f6a50000f8a50000faa50000fca50000fea5000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a6000000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a600008aa600008ca600008ea6000090a6000092a6000094a6000096a6000098a600009aa600009ca600009ea60000a0a60000a2a60000a4a60000a6a60000a8a60000aaa60000aca60000aea6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -923,10 +936,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: ac670100
+    m_LastClickedInstanceID: 92076
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100
+    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100988c010096820100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -951,7 +964,7 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 91
+    m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 363.8
 --- !u!114 &12
@@ -974,10 +987,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2249
-    y: 726.5
-    width: 920
-    height: 250
+    x: 0
+    y: 683.2
+    width: 1512.6
+    height: 389.79993
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1003,9 +1016,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1710.4
+    x: 1512
     y: 0
-    width: 337.59998
+    width: 536
     height: 1029.2
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
@@ -1034,9 +1047,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1710.4
+    x: 1512
     y: 64.8
-    width: 336.59998
+    width: 535
     height: 1008.19995
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1051,7 +1064,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 160
+    m_CachedPref: 253.40002
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1