Explorar el Código

修改触发事件,搭建简单ui

lzx hace 1 mes
padre
commit
0659cf6bb2

+ 0 - 203
Assets/Art/UIAssets/decorate/dec_Bubble_Arrow.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CXtJ5imuBnyySTrf9CdEKrYv/sdNn31vuRirPDngyffnwMY8zby2KtJQ3pcq
-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: iPhone
-    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: Android
-    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
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    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: OpenHarmony
-    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: 

+ 16 - 2
Assets/Art/UIAssets/decorate/dec_dadi_02.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 32, y: 66, z: 34, w: 66}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     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: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 16 - 2
Assets/Art/UIAssets/decorate/dec_duihua_01.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 100, y: 39, z: 64, w: 19}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     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: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 16 - 2
Assets/Art/UIAssets/decorate/dec_duihua_04.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 63, y: 47, z: 41, w: 14}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -168,6 +168,20 @@ TextureImporter:
     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: []
@@ -175,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 0 - 203
Assets/Art/UIAssets/decorate/dec_star_21.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: B3kf5y6oVnu9dEQZGnvafcWi2kOIJcCZ17LQUE/yB9J2RmTFgpC0VOec5ZCo
-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: iPhone
-    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: Android
-    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
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    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: OpenHarmony
-    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: 

+ 13 - 13
Assets/Res/UI/DialoguePanel/DialogueBubblePanel.prefab

@@ -93,7 +93,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2149943221234425788
 RectTransform:
   m_ObjectHideFlags: 0
@@ -216,7 +216,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 129, y: -89}
+  m_AnchoredPosition: {x: 129, y: -95}
   m_SizeDelta: {x: 230, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8563214976376415512
@@ -240,7 +240,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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
@@ -260,7 +260,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 123456789/*56464564565465654656565645564556456
+  m_Text: 123123123123123123121312312321321321312
 --- !u!114 &7854699503480604488
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -333,8 +333,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.016868591, y: 20.999634}
-  m_SizeDelta: {x: 258.3326, y: 0}
+  m_AnchoredPosition: {x: 3.6314, y: 20.999634}
+  m_SizeDelta: {x: 265.63, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2010396863693640005
 CanvasRenderer:
@@ -374,14 +374,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round09
+  _icon_name: dec_duihua_04
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7f6af24b7e68d556cab4cc7ac439f1bb
+    packName: event
+    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
+    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
+    lasetJsonGUID: df80f818a4f258d33b8038600af6f215
 --- !u!114 &1124545658821086857
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -411,7 +411,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 14
     m_Right: 14
-    m_Top: 14
+    m_Top: 20
     m_Bottom: 14
   m_ChildAlignment: 0
   m_Spacing: 0

+ 86 - 13
Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -11,6 +11,8 @@ GameObject:
   - component: {fileID: 4229809311072735734}
   - component: {fileID: 5086374945530126731}
   - component: {fileID: 2934525852061817999}
+  - component: {fileID: 6116667400179102108}
+  - component: {fileID: 6887871023316888409}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_desc
@@ -33,10 +35,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8347964422981004825}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 65, y: -23.5}
+  m_SizeDelta: {x: 128, y: 46.8846}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731
 CanvasRenderer:
@@ -79,7 +81,36 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 12321312
+--- !u!114 &6116667400179102108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250408078146684751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &6887871023316888409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 250408078146684751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &1586153670201676115
 GameObject:
   m_ObjectHideFlags: 0
@@ -93,6 +124,8 @@ GameObject:
   - component: {fileID: 4525636567960331388}
   - component: {fileID: 2912968521683004226}
   - component: {fileID: 1772693467188324289}
+  - component: {fileID: 1077933337324274719}
+  - component: {fileID: 1072443894772605252}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: DialogueOptionWidget
@@ -119,7 +152,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 191.9208, y: 79.2737}
+  m_SizeDelta: {x: 0, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2619129949825441592
 CanvasRenderer:
@@ -150,7 +183,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -159,14 +192,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Blue
+  _icon_name: btn_01
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: c93feb71466e7c38c2ebc85e8f3a6296
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
 --- !u!114 &2912968521683004226
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -235,3 +268,43 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1077933337324274719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1586153670201676115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1072443894772605252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1586153670201676115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 1
+    m_Right: 2
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

+ 11 - 11
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -321,14 +321,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round09
+  _icon_name: dec_dadi_02
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
 --- !u!1 &6132341106075266429
 GameObject:
   m_ObjectHideFlags: 0
@@ -348,7 +348,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6614233195307115645
 RectTransform:
   m_ObjectHideFlags: 0
@@ -365,7 +365,7 @@ RectTransform:
   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: 300.3, y: -48.77356}
+  m_AnchoredPosition: {x: 310.6, y: -61.8}
   m_SizeDelta: {x: 38, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2729643428166531704
@@ -426,7 +426,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxDuration: 1
+  maxDuration: 0
   isUpdate: 0
   currTime: 130.62094
   GrpupInfos:
@@ -438,7 +438,7 @@ MonoBehaviour:
     - {fileID: 6614233195307115645}
     TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
     TargetFoldout: 0
-    maxDuration: 1
+    maxDuration: 0
     isUpdate: 1
     currTime: 0
   MinMaxGradient:
@@ -694,7 +694,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5617782115550842872
 RectTransform:
   m_ObjectHideFlags: 0

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1334 - 25
Assets/Res/UI/MainPanel.prefab


+ 2 - 2
Assets/Res/UI/RewardsPanel/RewardsPanel.prefab

@@ -239,7 +239,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -830,7 +830,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -2037, y: 1755}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9111758787558866785
 CanvasRenderer:

+ 8 - 9
Assets/Scripts/GameLogic/EventManager/EventManager.cs → Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -70,21 +70,20 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         if (triggeredEvents.Count == 0)
         {
-            Debug.Log("没有可以触发的事件");
+            LogTool.Error("没有可以触发的事件");
             return default;
         }
 
         return triggeredEvents;
-        // // 触发事件
-        // foreach (var evt in triggeredEvents)
-        // {
-        //     TriggerEvent(evt);
-        // }
+
     }
 
+    /// <summary>
+    /// 触发随机事件
+    /// </summary>
     public void DetectRandomEvents()
     {
-        // 获取通用事件
+        // 获取随机事件
         List<EventConfig> randomEvents = eventConfigs.Where(e => e.EventTriggerType == 2 && CanTriggerEvent(e.ID)).ToList();
 
         
@@ -102,11 +101,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
     /// <summary>
-    /// 触发单个事件,处理对话、奖励和完成逻辑。
+    /// 触发事件
     /// </summary>
     public void TriggerEvent(EventConfig evt)
     {
-        Debug.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
+        LogTool.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
 
         DialogueManager.Instance.StartDialogue(evt.EventType, evt.ID,() =>
         {

+ 1 - 1
Assets/Scripts/GameLogic/EventManager/EventManager.cs.meta → Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Di9K5H+tBilXP5VcUl204bQLyBo6vHDxH1FHFRtrwIUNzxkNOvzyyFSBTL/W
+guid: CX8fsCv7V3gPOLPESgRQO+WR7oq0iHBAP4xHFtN0dPr65UlJqZp2yhv4aRe5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 14 - 2
Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs

@@ -56,6 +56,8 @@ namespace Fort23.Mono
         private void SkipTyping()
         {
             _skipTyping = true;
+            _timerEntity?.Dispose();
+            _timerEntity = null;
             if (_isUpdate)
             {
                 _sb.Clear();
@@ -94,6 +96,8 @@ namespace Fort23.Mono
 
         private void StartShowMassge()
         {
+            _timerEntity?.Dispose();
+            _timerEntity = null;
             if (index >= dialogueMessaga.Length)
             {
                 UIManager.Instance.HideUIUIPanel(this);
@@ -133,6 +137,8 @@ namespace Fort23.Mono
             StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         }
 
+        private TimerEntity _timerEntity;
+
         public void Update()
         {
             if (!_isUpdate) return;
@@ -142,11 +148,15 @@ namespace Fort23.Mono
                 if (_currShowIndex >= _currShowMessage.Length)
                 {
                     _isUpdate = false;
-                    TimerComponent.Instance.AddTimer(300, () =>
+                    _timerEntity?.Dispose();
+                    _timerEntity = null;
+                    _timerEntity = TimerComponent.Instance.AddTimer(800, () =>
                     {
+                        _timerEntity?.Dispose();
+                        _timerEntity = null;
                         StartShowMassge();
                     });
-                   
+
                     return;
                 }
 
@@ -166,6 +176,8 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
             _isShowingOptions = false;
             _skipTyping = false;
+            _timerEntity?.Dispose();
+            _timerEntity = null;
             base.Close();
         }
     }

+ 1 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -203,6 +203,7 @@ namespace Fort23.Mono
                 if (_currShowIndex >= _currShowMessage.Length)
                 {
                     _isUpdate = false;
+                    ShowNextIcon();
                     if (index >= dialogueMessaga.Length)
                     {
                         // 所有句子显示完成,检查是否有选项

+ 16 - 16
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -27,22 +27,22 @@ namespace Fort23.Mono
 
         private async void Bnt_shengShi_onClick()
         {
-            EventSystemManager.Instance.DetectRandomEvents();
-            
-            // UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            // CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
-            //     .CombatHeroController.playerHeroEntity.GameObject.transform);
-            // List<EventConfig> eventConfigs = EventSystemManager.Instance.DetectEvents(1);
-            // if (eventConfigs == null || eventConfigs.Count == 0)
-            //     return;
-            // for (var i = 0; i < eventConfigs.Count; i++)
-            // {
-            //     ShengShiEventWidget shengShiEventWidget =
-            //         await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
-            //             DynamicEvent,
-            //             isInstance: true);
-            //     shengShiEventWidget.InitShengShiEventWidget(eventConfigs[i].ID);
-            // }
+            // EventSystemManager.Instance.DetectRandomEvents();
+
+            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+            CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
+                .CombatHeroController.playerHeroEntity.GameObject.transform);
+            List<EventConfig> eventConfigs = EventSystemManager.Instance.DetectEvents(1);
+            if (eventConfigs == null || eventConfigs.Count == 0)
+                return;
+            for (var i = 0; i < eventConfigs.Count; i++)
+            {
+                ShengShiEventWidget shengShiEventWidget =
+                    await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
+                        DynamicEvent,
+                        isInstance: true);
+                shengShiEventWidget.InitShengShiEventWidget(eventConfigs[i].ID);
+            }
         }
 
         public async static CTask OpenPanel()

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio