Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/Art/UIAssets/TextrueJson/all.txt   resolved by master version
#	Assets/Res/UIAtlas/all.spriteatlasv2   resolved by master version
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	UserSettings/EditorUserSettings.asset   resolved by origin/master(远端) version
#	美术/unity_use_ui/TextrueJson/all.txt   resolved by master version

Assets/Art/UIAssets/icon/icon_ku.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Ci4fvCutB36dLg8rMSu3EggGZ/y+KvhR6snM2Wt2ca0rQkIOlBmEDB4=
+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: 1
+  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
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    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/Aduio/MainAudio.asset

@@ -77,3 +77,15 @@ MonoBehaviour:
   - describe: "\u6218\u58EB\u97F3\u6548"
     audionClipName: xiaoshe_die.wav
     volume: 1
+  - describe: jingbi
+    audionClipName: jingbi.wav
+    volume: 1
+  - describe: openui
+    audionClipName: openui.wav
+    volume: 1
+  - describe: shibai
+    audionClipName: shibai.wav
+    volume: 1
+  - describe: zhuangbei
+    audionClipName: zhuangbei.wav
+    volume: 1

Assets/Res/Aduio/UI.meta

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

Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CXIY5C+pUn15OyqpIGC9j+uU5gX9TdWvGUxS8J0z04eoI0cND1i4Ksk=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 1
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.01
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/openui.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XixN5Cv8BXgwn75XWXmWg12R/VyPsxXcw4FFyL2Ta/HjETBYb4NWZiQ=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 1
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.01
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/shibai.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DikbtS2sUinIkgMM2D3NwlhbVfEnCHjL+HdXiKJaWYxec1vqSctv8+8=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 1
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.01
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WnhOsiOvUCjf/n5XttnHbWjMPDToGK2VOQY1b7xQ3NDe/HUeaOO3EEU=
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 1
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.01
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DropGroupConfig.json

@@ -23,7 +23,7 @@
     },
     {
       "ID": 40001,
-      "dropRate": 1000,
+      "dropRate": 10,
       "dropItemID": [
         40001,
         40002,
@@ -49,7 +49,7 @@
     },
     {
       "ID": 40002,
-      "dropRate": 1000,
+      "dropRate": 10,
       "dropItemID": [
         40001,
         40002,
@@ -75,7 +75,7 @@
     },
     {
       "ID": 40003,
-      "dropRate": 500,
+      "dropRate": 10,
       "dropItemID": [
         40001,
         40002,
@@ -101,7 +101,7 @@
     },
     {
       "ID": 40004,
-      "dropRate": 1000,
+      "dropRate": 10,
       "dropItemID": [
         40001,
         40002,
@@ -127,7 +127,7 @@
     },
     {
       "ID": 40005,
-      "dropRate": 1000,
+      "dropRate": 10,
       "dropItemID": [
         40001,
         40002,

Assets/Res/Config/OpenBoxConfig.json

@@ -4,7 +4,7 @@
       "ID": 1,
       "oneConsume": 500,
       "tenConsume": 4500,
-      "reward": 40002
+      "reward": 20001
     }
   ]
 }

Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -0,0 +1,685 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &5139397811277715345
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6048544409263046555}
+  - component: {fileID: 3113999078506722049}
+  - component: {fileID: 2240370630937436646}
+  - component: {fileID: 1456376704827506201}
+  - component: {fileID: 3638687807519277488}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button_ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6048544409263046555
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139397811277715345}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1386739977556444607}
+  m_Father: {fileID: 185075131536662509}
+  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: 31.13, y: -145}
+  m_SizeDelta: {x: 242.93, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3113999078506722049
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139397811277715345}
+  m_CullTransparentMesh: 1
+--- !u!114 &2240370630937436646
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139397811277715345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1456376704827506201}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1456376704827506201
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139397811277715345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 0}
+  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
+  _icon_name: btn_l_Green
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &3638687807519277488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139397811277715345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
+--- !u!1 &5614495180248260428
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4732789714552782586}
+  - component: {fileID: 2086373568043157529}
+  - component: {fileID: 1089079095720410397}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4732789714552782586
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614495180248260428}
+  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: 185075131536662509}
+  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: -14.9}
+  m_SizeDelta: {x: 601.6, y: 68}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2086373568043157529
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614495180248260428}
+  m_CullTransparentMesh: 1
+--- !u!114 &1089079095720410397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614495180248260428}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4F60\u592A\u5F31\u4E86\uFF0C\u8BF7\u63D0\u5347\u52BF\u529B\u518D\u6765\u6311\u6218"
+--- !u!1 &6238981342543973910
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5875803508465983850}
+  - component: {fileID: 2373806058026606910}
+  - component: {fileID: 8051041478076049341}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: clickTime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5875803508465983850
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6238981342543973910}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 185075131536662509}
+  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: 31.13001, y: -69.9711}
+  m_SizeDelta: {x: 50.14, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2373806058026606910
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6238981342543973910}
+  m_CullTransparentMesh: 1
+--- !u!114 &8051041478076049341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6238981342543973910}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 30
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7027169326397218615
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 185075131536662509}
+  - component: {fileID: 5576121568784299897}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: CombatHeroDiePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &185075131536662509
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027169326397218615}
+  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: 2367201786333787622}
+  - {fileID: 5875803508465983850}
+  - {fileID: 6048544409263046555}
+  - {fileID: 4732789714552782586}
+  - {fileID: 8026503739820710212}
+  m_Father: {fileID: 0}
+  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: -2603, y: 1760}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5576121568784299897
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027169326397218615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: clickTime
+    gameObject: {fileID: 8051041478076049341}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Button_ok
+    gameObject: {fileID: 2240370630937436646}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &7178446007438412160
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1386739977556444607}
+  - component: {fileID: 1885857017647533627}
+  - component: {fileID: 2617230386661053475}
+  - component: {fileID: 4747770431483140316}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1386739977556444607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178446007438412160}
+  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: 6048544409263046555}
+  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: 160, y: 59.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1885857017647533627
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178446007438412160}
+  m_CullTransparentMesh: 1
+--- !u!114 &2617230386661053475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178446007438412160}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    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: "\u91CD\u65B0\u5F00\u59CB"
+--- !u!114 &4747770431483140316
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178446007438412160}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.13207549, g: 0.085500926, b: 0.016820936, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &7363585873547743305
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8026503739820710212}
+  - component: {fileID: 7762547830626643641}
+  - component: {fileID: 4439915125391523846}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8026503739820710212
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7363585873547743305}
+  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: 185075131536662509}
+  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: 95}
+  m_SizeDelta: {x: 121, y: 124}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7762547830626643641
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7363585873547743305}
+  m_CullTransparentMesh: 1
+--- !u!114 &4439915125391523846
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7363585873547743305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_ku
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7b4b6ed3ba462076c90dfcf7f26605a7
+--- !u!1 &9039228642630835706
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2367201786333787622}
+  - component: {fileID: 7011814973642001039}
+  - component: {fileID: 1256313014308156041}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2367201786333787622
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9039228642630835706}
+  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: 185075131536662509}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7011814973642001039
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9039228642630835706}
+  m_CullTransparentMesh: 1
+--- !u!114 &1256313014308156041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9039228642630835706}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.7019608}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Res/UI/CombatHeroDiePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnsXvH+lBi/eCcyuhrkqmZUhzkluiobzvPZIeKFxz7hONDQCa/ONZ8Q=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/ProfessionEquipmentPanel.prefab

@@ -3390,7 +3390,6 @@ GameObject:
   - component: {fileID: 3586729351620427240}
   - component: {fileID: 1009222206294842427}
   - component: {fileID: 7249347888770177081}
-  - component: {fileID: 471341874296638465}
   - component: {fileID: 5423654994008548922}
   - component: {fileID: 7253064668111474867}
   m_Layer: 0
@@ -3475,33 +3474,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!320 &471341874296638465
-PlayableDirector:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2504868283554003669}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-  m_InitialState: 1
-  m_WrapMode: 2
-  m_DirectorUpdateMode: 1
-  m_InitialTime: 0
-  m_SceneBindings:
-  - key: {fileID: -4398279264670304355, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 8434934333493254702}
-  - key: {fileID: 3098885728808021784, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 8434934333493254702}
-  - key: {fileID: -6019252560737163005, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 8434934333493254702}
-  - key: {fileID: 7089825263001972541, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 5423654994008548922}
-  - key: {fileID: -3648922518979620870, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 8434934333493254702}
-  m_ExposedReferences:
-    m_References: []
 --- !u!225 &5423654994008548922
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -3757,6 +3729,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5064,6 +5038,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5653,6 +5629,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6074,6 +6052,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8254,6 +8234,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9587,6 +9569,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9783,6 +9767,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10577,6 +10563,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11240,6 +11228,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Scenes/testCombat.scene

@@ -1201,6 +1201,67 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &5342889083889272969
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_Name
+      value: fx_shouDong
+      objectReference: {fileID: 0}
+    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -4.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -21.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.48
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1209,3 +1270,4 @@ SceneRoots:
   - {fileID: 111679908}
   - {fileID: 235899921}
   - {fileID: 123020045}
+  - {fileID: 5342889083889272969}

Assets/Scripts/Core/Audio/AudioManager.cs

@@ -228,6 +228,11 @@ namespace Core.Audio
             {
                 if (_currPlayAudio.TryGetValue(audionName, out AudioSourcePool asp))
                 {
+                    if (asp.Progress() < 0.2)
+                    {
+                        return null;
+                    }
+
                     asp.Finish();
                 }
 

Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace Core.Audio
 {
-    public class AudioSourcePool: IDisposable
+    public class AudioSourcePool : IDisposable
     {
         public object TimeLineAudioEventLogic;
         private AudioSource _audioSource;
@@ -16,6 +16,8 @@ namespace Core.Audio
         public bool IsPlay;
 
         public System.Action OnFinish;
+        private float maxTime;
+
         public string CurrPlayName
         {
             get { return _currPlayName; }
@@ -30,7 +32,7 @@ namespace Core.Audio
             gameObject.transform.SetParent(root);
         }
 
-        public void Play(string audioName, AssetHandle audioClip, bool isLoop,float volume, float speed = 1)
+        public void Play(string audioName, AssetHandle audioClip, bool isLoop, float volume, float speed = 1)
         {
             if (audioClip == null)
             {
@@ -61,14 +63,20 @@ namespace Core.Audio
 
 
             _audioSource.Play();
+            maxTime = _audioSource.clip.length;
             if (!isLoop)
             {
-                _timerEntity = TimerComponent.Instance.AddTimer((long) (_audioSource.clip.length * 1000L),
+                _timerEntity = TimerComponent.Instance.AddTimer((long)(maxTime * 1000L),
                     delegate { Finish(); });
             }
         }
 
 
+        public float Progress()
+        {
+            return _audioSource.time / maxTime;
+        }
+
         public void Finish()
         {
             IsPlay = false;
@@ -97,7 +105,6 @@ namespace Core.Audio
 
         public void Dispose()
         {
-         
         }
     }
 }

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
+using Core.Audio;
 using Core.Event.Event;
 using Core.UI.UTool;
 using Fort23.Core;
@@ -244,7 +245,7 @@ namespace Fort23.Mono
                 UGUIIamgeTool.renderOrder = 0;
             }
 
-            if (Input.GetMouseButtonUp(0) && UILayers != null)
+            if (Input.GetMouseButtonUp(0) && UILayers != null&&UICamera!=null)
             {
                 Vector3 pos = UICamera.ScreenToWorldPoint(Input.mousePosition);
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_click.prefab",
@@ -434,6 +435,7 @@ namespace Fort23.Mono
                             NoFocusTopUIPanels.Add(uiPanel);
                         uiPanel.isActiveAnima = isActiveAnima;
                         await uiPanel.Open();
+                        AudioManager.Instance.PlayAudio("openui.wav");
                         currOpenPanel = uiPanel;
 
                         if (current != null)

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Equipment;
 using UnityEngine;
 using Utility;
@@ -139,6 +140,7 @@ namespace GameLogic.Bag
             for (int i = 0; i < itemInfos.Count; i++)
             {
                 ItemInfo itemInfo = itemInfos[i];
+                LogTool.Log("获得了道具"+itemInfo.itemID);
                 AddItem(itemInfo, itemInfo.count.Value);
             }
         }

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

@@ -5,6 +5,7 @@
         Null,
 
         HeroDie,
+        HeroDieFinish,
         HeroResurrection,
         HeroHpUpdate,
         ClearHeroHp,

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -53,6 +53,7 @@ namespace GameLogic.Combat.CombatTool
             AttType attType, TriggerData triggerData,
             HarmType harmType = HarmType.Default)
         {
+           
             HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
             harmReturnInfo.source = source;
             harmReturnInfo.target = target;
@@ -64,7 +65,10 @@ namespace GameLogic.Combat.CombatTool
             {
                 return harmReturnInfo;
             }
-
+            if (CombatController.currActiveCombat.IsGameOver)
+            {
+                return harmReturnInfo;
+            }
             if (target.combatHeroEntity.CombatAIBasic.stateControl.CurrStateName.Equals(CombatHeroStateType.rolling))
             {
                 harmReturnInfo.isMiss = true;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -39,6 +39,7 @@ namespace GameLogic.Combat.CombatTool
 
         private bool _isFullUIShow;
 
+        public bool IsGameOver;
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -52,10 +52,10 @@ namespace GameLogic.Combat.CombatTool
         {
             HeroPowerUpEventData heroPowerUpEventData = eventData as HeroPowerUpEventData;
 
-            if (heroPowerUpEventData.upType == HeroUpType.BasicEquip)
-            {
-                return;
-            }
+            // if (heroPowerUpEventData.upType == HeroUpType.BasicEquip)
+            // {
+            //     return;
+            // }
 
             int id = heroPowerUpEventData.heroModelID;
             CombatHeroEntity combatHeroEntity = null;

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -143,41 +143,48 @@ namespace GameLogic.Combat.CombatType
                 CombatHeroEntity[] myHero = combatController.CombatHeroController.GetHero(false);
                 if (myHero == null || myHero.Length <= 0) //死完了
                 {
-                    HarmReturnInfo newharm = new HarmReturnInfo();
-                    newharm.harmType = HarmType.SystemKo;
-                    CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-                    List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-                    heroEntities.AddRange(allHero);
-                    for (int i = 0; i < heroEntities.Count; i++)
-                    {
-                        heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
-                    }
+                    CombatController.currActiveCombat.IsGameOver = true;
+                }
+            }
+        }
+
+        public void Resume()
+        {
+            
+            HarmReturnInfo newharm = new HarmReturnInfo();
+            newharm.harmType = HarmType.SystemKo;
+            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
+            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+            heroEntities.AddRange(allHero);
+            for (int i = 0; i < heroEntities.Count; i++)
+            {
+                heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+            }
 
-                    Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");
-                    PlayBgm();
-                    AccountFileInfo.Instance.playerData.isAllHeroDie = true;
-                    TimerComponent.Instance.AddTimer(2000, delegate
+            Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");
+            PlayBgm();
+            AccountFileInfo.Instance.playerData.isAllHeroDie = true;
+            TimerComponent.Instance.AddTimer(1000, delegate
+            {
+                CombatController.currActiveCombat.IsGameOver = false;
+                CombatHeroEntity[] allMyHero = combatController.CombatHeroController.GetDieHero();
+                BetterList<CombatHeroEntity> allMyHeroList = CombatListPool<CombatHeroEntity>.Instance.Get();
+                allMyHeroList.AddRange(allMyHero);
+                for (int i = 0; i < allMyHeroList.Count; i++)
+                {
+                    CombatHeroEntity dieHero = allMyHeroList[i];
+                    if (dieHero != null && !dieHero.IsEnemy && dieHero.isDie)
                     {
-                        CombatHeroEntity[] allMyHero = combatController.CombatHeroController.GetDieHero();
-                        BetterList<CombatHeroEntity> allMyHeroList = CombatListPool<CombatHeroEntity>.Instance.Get();
-                        allMyHeroList.AddRange(allMyHero);
-                        for (int i = 0; i < allMyHeroList.Count; i++)
-                        {
-                            CombatHeroEntity dieHero = allMyHeroList[i];
-                            if (dieHero != null && !dieHero.IsEnemy && dieHero.isDie)
-                            {
-                                dieHero.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection, isQiangZhi: true);
-                            }
-                        }
-
-                        allMyHeroList.Dispose();
-                        CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-                        // CombatController.currActiveCombat.speed = 1;
-                    });
-                    isActiveCombat = false;
-                    _isAwaitResurrection = true;
+                        dieHero.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection, isQiangZhi: true);
+                    }
                 }
-            }
+
+                allMyHeroList.Dispose();
+                CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
+                // CombatController.currActiveCombat.speed = 1;
+            });
+            isActiveCombat = false;
+            _isAwaitResurrection = true;
         }
 
         private void PlayBgm()
@@ -206,7 +213,7 @@ namespace GameLogic.Combat.CombatType
                 return;
             }
 
-            BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 1,
+            BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
                 _levelBattleConfig.miniExpAndGold[0]);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds < 20)
@@ -240,7 +247,7 @@ namespace GameLogic.Combat.CombatType
 
 
             // BagController.Instance.AddHeroExp(10);
-            int levelExp = combatHeroEntity.CurrCombatHeroInfo.heroType == 2 ? 1 : 3;
+            int levelExp = combatHeroEntity.CurrCombatHeroInfo.heroType == 2 ? 1 : 1;
             _simulatedExp += levelExp;
             BagController.Instance.DropLevelExp(combatHeroEntity.combatHeroGameObject.position, levelExp, levelExp);
 

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -269,6 +269,7 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
 
         combatHeroGameObject.HeroDie();
         CombatAIBasic.ChangeState(CombatHeroStateType.dile);
+        CombatEventManager.Instance.Dispatch(CombatEventType.HeroDieFinish, heroDieEventData);
     }
 
     public void HeroHurt(HarmReturnInfo harmReturnInfo)

Assets/Scripts/GameLogic/Combat/Hero/PlayerHeroEntity.cs

@@ -18,6 +18,7 @@ namespace GameLogic.Combat.Hero
         public Vector3 endPos;
 
         private Vector3 lasetHeroPos;
+        private float lasetTime;
 
         public override async CTask<CombatHeroEntity> Init(CombatAIBasic combatAIBasic, CombatHeroInfo combatHeroInfo,
             Vector3 pos, Action<CombatHeroEntity> callBack = null)
@@ -59,12 +60,28 @@ namespace GameLogic.Combat.Hero
         {
             combatHeroTimeLineControl.Update(t);
             CombatAIBasic.Update(t);
+            if (CombatController.currActiveCombat.IsGameOver)
+            {
+                return;
+            }
+
             if (Input.GetMouseButtonUp(0))
             {
-                SkillBasic skillBasic = CombatHeroSkillControl.GetSkillBasic(900001);
+                float currTime= Time.time;
+                if (currTime - lasetTime < 0.1f)
+                {
+                    return;
+                }
+
+                S900001 skillBasic = (S900001) CombatHeroSkillControl.GetSkillBasic(900001);
                 BetterList<CombatHeroEntity> allHero =
-                    CombatController.currActiveCombat.CombatHeroController.GetHeroList(false);
+                    CombatController.currActiveCombat.CombatHeroController.GetHeroList(true);
 
+                if (allHero.Count <= 0)
+                {
+                    allHero =
+                        CombatController.currActiveCombat.CombatHeroController.GetHeroList(false);
+                }
 
                 CombatHeroEntity combatHeroEntity = null;
                 if (allHero.Count > 0)
@@ -79,13 +96,13 @@ namespace GameLogic.Combat.Hero
                 }
 
 
-                endPos = lasetHeroPos + new Vector3(CombatCalculateTool.Instance.GetOdd(-5, 5), 0,
-                    CombatCalculateTool.Instance.GetOdd(-7, 4));
-
+                endPos = lasetHeroPos + new Vector3(CombatCalculateTool.Instance.GetOdd(-3, 3), 0,
+                    CombatCalculateTool.Instance.GetOdd(-3, 3));
 
-                startPos = endPos + new Vector3(5, 20, 5);
 
-                CombatHeroSkillControl.AddCommandSkill(skillBasic);
+                startPos = endPos + new Vector3(5, 15, 5);
+                skillBasic.UseSkill();
+                // CombatHeroSkillControl.AddCommandSkill(skillBasic);
             }
         }
     }

Assets/Scripts/GameLogic/Combat/Skill/S900001.cs

@@ -11,6 +11,11 @@ namespace GameLogic.Combat.Skill
     public class S900001 : SkillBasic
     {
         protected override void ProUseSkill()
+        {
+          
+        }
+
+        public void UseSkill()
         {
             PlayerHeroEntity playerHeroEntity = CombatHeroEntity as PlayerHeroEntity;
             Vector3[] pos = new Vector3[] { playerHeroEntity.startPos, playerHeroEntity.endPos };
@@ -19,7 +24,6 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProSkillPlayFinish()
         {
-            
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
@@ -27,20 +31,26 @@ namespace GameLogic.Combat.Skill
             TriggerData triggerData)
         {
             CombatCalculateTool.Instance.TrueHarm(CombatHeroEntity, targetEntity, 1, AttType.Skill, triggerData);
-     
+
             if (targetEntity.combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
             {
-                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 15,
-                    15);
+                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 2,
+                    2);
             }
             else
             {
-                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 5,
-                    5);
+                int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
+                if (odds < 70)
+                {
+                    BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
+                        1,
+                        1);
+                }
             }
         }
 
-        protected override void ProTimeLineTriggerGround(string groupName, ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
+        protected override void ProTimeLineTriggerGround(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
         {
             base.ProTimeLineTriggerGround(groupName, timelineFxLogic, triggerData);
         }

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -148,6 +148,27 @@ namespace GameLogic.Equipment
             
             return info;
         }
+        public ItemInfo BuildEquipmentForItemId(int itemId, int qualityDropID, int lvDropID)
+        {
+            ItemInfo info = null;
+
+
+
+            ItemInfo equipModelInfo = new ItemInfo(itemId);
+            
+            List<ItemInfo> qualityDropItems = DropManager.Instance.DropItem(qualityDropID);
+            List<ItemInfo> lvDropItems = DropManager.Instance.DropItem(lvDropID);
+
+            info = equipModelInfo;
+
+            info.eqInfo = new EquipmentInfo();
+            // info.eqInfo.InitEquipment(info.config,
+            //     lvDropItems[0].dropItemConfig.itemID[0], 
+            //     qualityDropItems[0].dropItemConfig.itemID[0]);
+            info.eqInfo.InitEquipment(equipModelInfo, lvDropItems[0], qualityDropItems[0]);
+            
+            return info;
+        }
 
         /// <summary>
         /// 一键穿职业装备

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -52,7 +52,7 @@ namespace GameLogic.Player
                 int.Parse(eqDropData[1]),
                 int.Parse(eqDropData[2]));
 
-            if(eqItemInfo != null)
+            if (eqItemInfo != null)
                 BagController.Instance.AddEquipmentItem(eqItemInfo);
 
             return eqItemInfo;
@@ -76,14 +76,14 @@ namespace GameLogic.Player
                 {
                     itemInfo = DropEquipment(eqDropStr);
                 }
-            } 
+            }
             else if (monsterType == 2)
             {
                 foreach (string eqDropStr in levelBattleConfig.eliteMonsterItem)
                 {
                     itemInfo = DropEquipment(eqDropStr);
-                }   
-            } 
+                }
+            }
             else if (monsterType == 3)
             {
                 foreach (string eqDropStr in levelBattleConfig.bossItem)
@@ -96,6 +96,7 @@ namespace GameLogic.Player
             {
                 equipmentList.Add(itemInfo);
             }
+
             return equipmentList;
         }
 
@@ -138,9 +139,9 @@ namespace GameLogic.Player
         private void DropItemConfig(List<ItemInfo> itemInfos, int[] dropItemID)
         {
             int rIdx = Random.Next(0, dropItemID.Length);
-            
+
             // DropItemConfig rDropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[rIdx]);
-            
+
             // for (int i = 0; i < dropItemID.Length; i++)
             // {
             //DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[i]);
@@ -165,6 +166,13 @@ namespace GameLogic.Player
                 {
                     itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
                 }
+                else if (dropItemConfig.dropItemType == 4)
+                {
+                    itemInfo = PlayerManager.Instance.eqController.BuildEquipmentForItemId(dropItemConfig.itemID[0],
+                        dropItemConfig.itemID[1],
+                        dropItemConfig.itemID[2]);
+                    // itemInfo = DropEquipment(dropItemConfig.itemID[j]);
+                }
                 else
                 {
                     itemInfo = new ItemInfo(dropItemConfig);

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs

@@ -38,7 +38,10 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                         this.audioSourcePool = audioSourcePool;
                     }
 
-                    audioSourcePool.TimeLineAudioEventLogic = this;
+                    if (audioSourcePool != null)
+                    {
+                        audioSourcePool.TimeLineAudioEventLogic = this;
+                    }
                 }
             }
 #endif

Assets/Scripts/GameUI/Combat/CombatMonoBaisc.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using CombatLibrary.CombatLibrary.CombatCore.Utility;
 using Common.Utility.CombatEvent;
+using Core.Audio;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
@@ -22,6 +23,7 @@ namespace GameUI.Combat
 
         private ShowItemMoveToTargetPanel _showItemMoveToTargetPanel;
 
+        
         public async CTask Init(CombatController combatController)
         {
             this.combatController = combatController;
@@ -33,8 +35,24 @@ namespace GameUI.Combat
         protected void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.Combat_ItemShow, Combat_ItemShow);
+          
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDieFinish, HeroDie);
         }
 
+        protected void HeroDie(IEventData iEventData)
+        {
+            HeroDieEventData heroDieEventData= iEventData as HeroDieEventData;
+            if (heroDieEventData.combatHeroEntity.IsEnemy)
+            {
+                return;
+            }
+
+            BetterList<CombatHeroEntity> myHero = combatController.CombatHeroController.GetHeroList(false);
+            if (myHero.Count <= 0)
+            {
+                CombatHeroDiePanel.OpenCombatHeroDiePanel();
+            }
+        }
 
         protected void Combat_ItemShow(IEventData iEventData)
         {
@@ -126,6 +144,7 @@ namespace GameUI.Combat
                             particleSystemPool.transform.localPosition = Vector3.zero;
                             particleSystemPool.transform.localScale = Vector3.one;
                             BagController.Instance.AddCoin(currAddValue);
+                            AudioManager.Instance.PlayAudio("jingbi.wav");
                             // particleSystemPool.transform.
                         }
                     }

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs

@@ -0,0 +1,62 @@
+using Core.Audio;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "CombatHeroDiePanel")]
+    public partial class CombatHeroDiePanel : UIPanel
+    {
+        private int time;
+        public static async void OpenCombatHeroDiePanel()
+        {
+            CombatHeroDiePanel combatHeroDiePanel= await     UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
+            combatHeroDiePanel.ShowCombatHeroDiePanel();
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Button_ok.onClick.AddListener(Button_ok_onClick);
+        }
+
+        private void Button_ok_onClick()
+        {
+            LevelBattleCombatType levelBattleCombatType=    CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            levelBattleCombatType.Resume();
+            UIManager.Instance.HideUIUIPanel(this);
+            
+        }
+
+        public void ShowCombatHeroDiePanel()
+        {
+            AudioManager.Instance.PauseBGM();
+            AudioManager.Instance.PlayAudio("shibai.wav");
+            time = 30;
+            clickTime.text = time.ToString();
+            TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
+            {
+                time--;
+                clickTime.text = time.ToString();
+                if (time <= 0)
+                {
+                    Button_ok_onClick();
+                }
+            });
+        }
+        
+
+    }
+}

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs.meta

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

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanelData.cs

@@ -0,0 +1,42 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+using TMPro;
+
+namespace Fort23.Mono
+{
+	public partial class CombatHeroDiePanel 
+	{
+	  #region 自定义数据 
+	  private TextMeshProUGUI _clickTime;
+	  public TextMeshProUGUI clickTime
+	   {
+	   get{
+	      if (_clickTime == null)
+	       {
+	         _clickTime  = GetUIUnit<TextMeshProUGUI>("clickTime"); 
+	       }
+	      return _clickTime;
+	     }
+	   }
+	  private Button _Button_ok;
+	  public Button Button_ok
+	   {
+	   get{
+	      if (_Button_ok == null)
+	       {
+	         _Button_ok  = GetUIUnit<Button>("Button_ok"); 
+	       }
+	      return _Button_ok;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanelData.cs.meta

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

UserSettings/EditorUserSettings.asset

@@ -42,10 +42,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

UserSettings/Layouts/default-2022.dwlt

@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 122
-    y: 66
-    width: 1552
-    height: 979
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Scene
   m_RootView: {fileID: 2}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
+  m_Maximized: 1
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -44,8 +44,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1552
-    height: 979
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -69,11 +69,11 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1552
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: mbp
+  m_LastLoadedLayoutName: 
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -90,8 +90,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 959
-    width: 1552
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -112,16 +112,17 @@ MonoBehaviour:
   - {fileID: 9}
   - {fileID: 10}
   - {fileID: 11}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1552
-    height: 929
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 500, y: 100}
+  m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 73798
+  controlID: 163
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -142,12 +143,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 486
-    height: 929
+    width: 940
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 73867
+  controlID: 23
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -159,24 +160,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 486
-    height: 746.5
-  m_MinSize: {x: 201, y: 221}
+    width: 940
+    height: 504
+  m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 12}
   - {fileID: 14}
   - {fileID: 15}
-  m_Selected: 0
+  - {fileID: 16}
+  m_Selected: 2
   m_LastSelected: 1
 --- !u!114 &8
 MonoBehaviour:
@@ -194,14 +194,14 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 746.5
-    width: 486
-    height: 182.5
+    y: 504
+    width: 940
+    height: 795
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &9
@@ -219,15 +219,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 486
+    x: 940
     y: 0
-    width: 263
-    height: 929
+    width: 303
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &10
@@ -245,15 +245,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 749
+    x: 1243
     y: 0
-    width: 350.5
-    height: 929
+    width: 475
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
@@ -264,24 +264,25 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
+  m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1099.5
+    x: 1718
     y: 0
-    width: 452.5
-    height: 929
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+    width: 529
+    height: 1299
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 13}
+  - {fileID: 20}
   m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -291,95 +292,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
+  m_Children: []
+  m_Position:
     serializedVersion: 2
-    x: 122
-    y: 96
-    width: 485
-    height: 725.5
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.5
-    m_HBaseRangeMax: 187.5
-    m_VBaseRangeMin: -406
-    m_VBaseRangeMax: 406
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 485
-      height: 704.5
-    m_Scale: {x: 0.8676108, y: 0.8676108}
-    m_Translation: {x: 242.5, y: 352.25}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -279.5032
-      y: -406
-      width: 559.0064
-      height: 812
-    m_MinimalGUI: 1
-  m_defaultScale: 0.8676108
-  m_LastWindowPixelSize: {x: 970, y: 1451}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
+    x: 2247
+    y: 0
+    width: 313
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 21}
+  m_Panes:
+  - {fileID: 21}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -396,14 +325,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 122
-    y: 96
-    width: 485
-    height: 725.5
+    x: 1718
+    y: 73
+    width: 527
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -418,7 +347,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -171, y: -26}
+      snapOffset: {x: -164, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -496,7 +425,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 25}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Orientation
@@ -639,9 +568,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: -137}
+      snapOffset: {x: -387, y: -197}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 2
+      snapCorner: 3
       id: Scene View/Particles
       index: 8
       layout: 4
@@ -704,9 +633,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 25}
+      snapOffset: {x: -216, y: -172}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: AINavigationOverlay
       index: 9
       layout: 4
@@ -770,14 +699,14 @@ MonoBehaviour:
   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: 411.5323, y: 771.8178, z: -7.0943055}
+    m_Target: {x: 1.3405353, y: 0.2975505, z: 7.735005}
     speed: 2
-    m_Value: {x: 423.90073, y: 750.27966, z: -6.404804}
+    m_Value: {x: 1.3405353, y: 0.2975505, z: 7.735005}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -786,7 +715,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 0
+    m_AlwaysRefresh: 1
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -823,17 +752,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.48231304, y: 0.30325496, z: -0.18252304, w: -0.8013251}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.48231304, y: 0.30325493, z: -0.18252304, w: -0.8013251}
   m_Size:
-    m_Target: 713.5609
+    m_Target: 1.0336097
     speed: 2
-    m_Value: 644.61035
+    m_Value: 1.0336097
   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
@@ -849,7 +778,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.011674443, y: 0.05125597, z: 0.0006001084, w: -0.9986271}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -872,14 +801,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Animator
-    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1209
-    height: 436
+    width: 887
+    height: 844
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1016,8 +945,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1188
-    height: 641
+    width: 887
+    height: 844
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1125,6 +1054,49 @@ MonoBehaviour:
       data:
         _ScrollPosition: {x: 0, y: 0}
 --- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 939
+    height: 483
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1140,14 +1112,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 122
-    y: 842.5
-    width: 485
-    height: 161.5
+    x: 0
+    y: 577
+    width: 939
+    height: 774
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1158,7 +1130,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1174,14 +1146,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 608
-    y: 96
-    width: 261
-    height: 908
+    x: 940
+    y: 73
+    width: 301
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1197,7 +1169,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 16c7e8ffc63ae9ff8053e9ff9053e9ff8656e9ff2c57e9ff7872e9ff8672e9ffea81e9ff4a25eaff3875eafffcf5ebffd808ecffe608ecfffa08ecff0809ecff542fecff0244ecff0844ecff3e46ecffe646ecffb87aecffc67aecff727decff92b7ecff98b7ecffceb9ecff74baecff88baecff96baecff30deecffb0abeeffbcabeeffccabeeff2ef1eeff3cf1eeff0cfeeeffccfeeeffdcfeeeff2e48efff3c48efffa6e5efffc0e5efffdae5efffe0e5efff3ae6efff4ae6efff4431f0ff5231f0ff5434f0ff02c9f0ff3ec9f0ff5cc9f0ff8ec9f0ff92c9f0ff40caf0ffacdef0ffbadef0ffbcdef0ff4ae1f0ff1213f1ff4815f1ffb833f1ff1834f1ff5037f1ffe438f1ff0239f1ff2039f1ff3e39f1ff6a39f1ff7039f1ff7439f1ff223af1ffa64ef1ffaa4ef1ffb44ef1ffc24ef1ff1a48f2ff085ef2ff3c45f3ffcc45f3ff7a46f3ff8e46f3ff9046f3ff9246f3ff9c46f3ff564cf3ff664df3ff724df3ffae59f3ff5a5af3ff8ea0f3ff1ea1f3ffaca1f3ffcca1f3ff40aef3ff78aef3ff86aef3ff92aef3ff6eb2f3ff70b2f3ff7cb2f3ff76c2f3ffee04f4fffc04f4ff9a07f4ffa007f4ffea07f4ff6208f4ff7608f4ff8408f4ff420bf4ffca65f4ffca6bf4ffd86bf4ffaa78f4ffb878f4ffb49bf4ff30bdf4ff3ebdf4ff5cc3f4ff6cc3f4ff72c3f4ffa8c5f4ff44e0f4ffe0e0f4fffc17f9ff8a42f9ff9842f9ff5c55f9ffeea6fffff0a6fffff2a6fffffca6ffffa8adffff5aaeffff08afffffeabbffff9ebdffffa0bdffff084d0400f64f0400645c0400eaa4040028a6040002a70400b6a70400505b0500825d05003a5e0500
+      m_ExpandedIDs: 84faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1221,7 +1193,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &18
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1237,14 +1209,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 871
-    y: 96
-    width: 348.5
-    height: 908
+    x: 1243
+    y: 73
+    width: 473
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1266,7 +1238,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/Scripts/GameStart
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1274,16 +1246,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI
+  - Assets/Scripts/GameStart
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
+  m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 03ca9a3b
-    m_LastClickedID: 1000000003
-    m_ExpandedIDs: 0000000078f902007af902007cf902007ef9020080f9020082f9020084f9020086f902008af902008cf902008ef9020090f9020092f9020094f90200a8f902004efa020000ca9a3b
+    scrollPos: {x: 0, y: 746}
+    m_SelectedIDs: b8ac0000
+    m_LastClickedID: 44216
+    m_ExpandedIDs: 0000000018a900001aa900001ca900001ea9000020a9000022a9000024a9000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a9000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1311,7 +1283,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000078f902007af902007cf902007ef9020080f9020084f9020086f902008af902008cf902008ef9020090f9020094f902004efa020000ca9a3b
+    m_ExpandedIDs: 0000000018a900001aa900001ca900001ea9000020a9000022a9000024a9000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1339,7 +1311,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010088960000069a00008c8b0000728b0000
+    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a300002435010070d000000c9e00006e180100561b0100fc1a01006ca200008ea00000000000005aa7000010bc000068a70000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1366,8 +1338,106 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 180.5
---- !u!114 &19
+  m_DirectoriesAreaWidth: 188
+--- !u!114 &20
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1718
+    y: 73
+    width: 527
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 0
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 527
+      height: 1257
+    m_Scale: {x: 0.70266664, y: 0.70266664}
+    m_Translation: {x: 263.5, y: 628.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -375
+      y: -894.44977
+      width: 750
+      height: 1788.8995
+    m_MinimalGUI: 1
+  m_defaultScale: 0.70266664
+  m_LastWindowPixelSize: {x: 527, y: 1278}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1383,14 +1453,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1221.5
-    y: 96
-    width: 451.5
-    height: 908
+    x: 2247
+    y: 73
+    width: 312
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1404,7 +1474,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 151
+    m_CachedPref: 501
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1