Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/Config/ShopGroupConfig.json   resolved by master version
#	Excel2Json/Excel/Shop.xlsx   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.6299298
+    - _Alpha: 0.05407384
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Res/Config/InitialPlayerConfig.json

@@ -25,7 +25,7 @@
         1405,
         1501
       ],
-      "shenshiPoint": 100
+      "shenshiPoint": 200
     }
   ]
 }

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/54ade351deed7a46ac648b209cc249f9.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHJLsXikWnrr/XXX157O7Uo92gDWqcmnq1tGgbt34yk5H9JNiNYzns6O8xcF
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: 

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -34,10 +34,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1723988732018600186}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -81, y: 0.15570068}
-  m_SizeDelta: {x: -232.2491, y: 0.31146}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 193.31482, y: -21.61725}
+  m_SizeDelta: {x: 100, y: 43.2345}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2840349042557368767
 CanvasRenderer:
@@ -60,7 +60,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9686275, g: 0.9803922, b: 0.93725497, a: 1}
+  m_Color: {r: 0.9450981, g: 0.95294124, b: 0.9058824, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -93,7 +93,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.5529412, g: 0.41176474, b: 0.3019608, a: 1}
+  m_EffectColor: {r: 0.5294118, g: 0.38823533, b: 0.2901961, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
 --- !u!1 &741793683712924752
@@ -470,6 +470,7 @@ GameObject:
   - component: {fileID: 1665665082766802650}
   - component: {fileID: 4894967930061506653}
   - component: {fileID: 7853302422099559857}
+  - component: {fileID: 6532971743992211403}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: ItemRoot
@@ -492,10 +493,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1723988732018600186}
   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: 59.4, y: -2}
-  m_SizeDelta: {x: 0, y: 39.411}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 193.3148, y: -53.10725}
+  m_SizeDelta: {x: 61, y: 19.7455}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1665665082766802650
 CanvasRenderer:
@@ -518,8 +519,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
+    m_Left: 20
+    m_Right: 20
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
@@ -545,6 +546,49 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &6532971743992211403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1213606337501340908}
+  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: 0, g: 0, b: 0, a: 0.33333334}
+  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: dec_juxing_135
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d570df61e5e429dc2d9169bbaecec167
+  imageH: 39.411
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1562856270352118058
 GameObject:
   m_ObjectHideFlags: 0
@@ -1862,6 +1906,8 @@ GameObject:
   - component: {fileID: 6154986573805993436}
   - component: {fileID: 9030765967915296015}
   - component: {fileID: 9012515141624647526}
+  - component: {fileID: 666138290641028018}
+  - component: {fileID: 9125103460406995663}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ManTips
@@ -1910,7 +1956,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: 0.9686275, g: 0.9803922, b: 0.93725497, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1931,6 +1977,41 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5DF2\u6EE1\u7EA7"
+--- !u!114 &666138290641028018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314419697092224364}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.65882355, g: 0.5176471, b: 0.37647063, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &9125103460406995663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314419697092224364}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3341266077164049528
 GameObject:
   m_ObjectHideFlags: 0
@@ -2264,6 +2345,9 @@ GameObject:
   - component: {fileID: 1087691984517513849}
   - component: {fileID: 4188353976954862433}
   - component: {fileID: 2725410468052320680}
+  - component: {fileID: 6455921579910473774}
+  - component: {fileID: 414044791521804828}
+  - component: {fileID: 65899356648462701}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_UpGrade
@@ -2291,8 +2375,8 @@ 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: 113.50552, y: -3.23}
-  m_SizeDelta: {x: 386.6296, y: 66.788}
+  m_AnchoredPosition: {x: 118.3, y: 0.000015259}
+  m_SizeDelta: {x: 386.6296, y: 67.98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
 CanvasRenderer:
@@ -2315,7 +2399,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.7294118, b: 0.38823533, a: 1}
+  m_Color: {r: 0.8862746, g: 0.6509804, b: 0.3019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2402,6 +2486,66 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &6455921579910473774
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 30
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 5
+  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
+--- !u!114 &414044791521804828
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &65899356648462701
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3931340268851502278
 GameObject:
   m_ObjectHideFlags: 0
@@ -3293,7 +3437,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2f804576dbd24134f8a5d2df5dac3c6a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 38d4b9919935dc042932434c2f7153d7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4640,8 +4784,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 317265118546245604}
   - {fileID: 4212652325341776174}
+  - {fileID: 317265118546245604}
   - {fileID: 8626833803530248980}
   - {fileID: 3478042439320372479}
   - {fileID: 4776823611480169892}
@@ -5216,14 +5360,18 @@ PrefabInstance:
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_Font
       value: 
-      objectReference: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+      objectReference: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_MinSize
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 38
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_Pivot.x
@@ -5251,7 +5399,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 111.4134
+      value: 66.386
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
@@ -5299,11 +5447,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 547.9074
+      value: 493.3019
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1073.5739
+      value: -1087.4612
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -5327,11 +5475,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 58.4134
+      value: 33.386
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 58.4134
+      value: 33.386
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -5351,7 +5499,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 53
+      value: 33
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
@@ -5359,7 +5507,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 84.9134
+      value: 49.886
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -5385,7 +5533,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1705337346385368726}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 

Assets/Res/UI/SkillSelectPanel/1830dd2f7a003facd906901b3588d294.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: By5KsX+rBnInaT/6+1BocBCFxcg5Jwf6IaWtm/rpBDTCsOFblLLXui+w9Qg8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: 

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs

@@ -54,6 +54,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///导航栏显示的道具
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] titleShowItemIds;
+#else
+		public int[] titleShowItemIds{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -44,16 +44,16 @@ namespace Fort23.Mono
         {
             switch (GroupId)
             {
+                //上阵的功法可以升级显示红点
                 case 1:
                     isEnable = false;
-                    switch (EnableId) //具体出现条件
+                    switch (EnableId) 
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
-                            var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
-                            foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
+                            foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
                             {
                                 if (RedDotManager.Instance.isSkillUpgrade(_skillInfo))
                                 {
@@ -66,14 +66,16 @@ namespace Fort23.Mono
                     }
 
                     break;
-                case 5: //具体组
+                //境界升级
+                case 5: 
                     isEnable = false;
-                    switch (EnableId) //具体出现条件
+                    switch (EnableId) 
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
+
                             int currentMiao =
                                 (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
                                       1000);
@@ -86,12 +88,78 @@ namespace Fort23.Mono
                                 return;
                             }
 
+                            int redDotID = 5;
+                            AccountFileInfo.RedDot redDot = RedDotManager.Instance.GetRedDot(redDotID);
+
+                            HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
+                            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                                PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
+
+                            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+                            {
+                                //小突破
+                                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 ==
+                                    heroInfo.powerUpConfig.jingjie2)
+                                {
+                                    isEnable = true;
+                                    return;
+                                }
+                                //大突破
+                                else
+                                {
+                                    for (var i = 0;
+                                         i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                                         i++)
+                                    {
+                                        if (!PlayerManager.Instance.BagController.IsEnough(
+                                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                                        {
+                                            isEnable = false;
+                                            return;
+                                        }
+                                    }
+
+                                    //当前升级已经查看了也不显示红点
+                                    if (redDot != null &&
+                                        redDot.Params.Contains(
+                                            PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                    {
+                                        isEnable = false;
+                                        return;
+                                    }
+                                }
+                            }
+                            //渡劫
+                            else
+                            {
+                                for (var i = 0;
+                                     i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                                     i++)
+                                {
+                                    if (!PlayerManager.Instance.BagController.IsEnough(
+                                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                                    {
+                                        isEnable = false;
+                                        return;
+                                    }
+                                }
+
+                                //当前升级已经查看了也不显示红点
+                                if (redDot != null &&
+                                    redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                {
+                                    isEnable = false;
+                                    return;
+                                }
+                            }
+
+
                             isEnable = true;
                             break;
                     }
 
                     break;
-                case 7: //具体组
+                case 7: //具上的代金卷可以免费抽
                     isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
@@ -116,7 +184,7 @@ namespace Fort23.Mono
 
                     break;
 
-                case 8: //具体组
+                case 8: //法宝可以升级或者有新槽位
                     isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
@@ -139,7 +207,7 @@ namespace Fort23.Mono
 
                     break;
 
-                case 11: //具体组
+                case 11: //挂机奖励大于300分钟
                     isEnable = false;
                     switch (EnableId) //具体出现条件
                     {

Assets/Scripts/GameLogic/Shop/ShopManger.cs

@@ -277,7 +277,7 @@ public class ShopManger : Singleton<ShopManger>
             isOk = true;
         }
         //人名币购买
-        else if (shopItemConfig.costItemId == 1031)
+        else if (shopItemConfig.costItemId == 9999)
         {
 #if UNITY_ANDROID && !UNITY_EDITOR
             // var dic = new Dictionary<string, string>();

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -103,6 +103,8 @@ namespace Fort23.Mono
 
         public async void Bnt_ShengShi_Click()
         {
+      
+
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
@@ -198,15 +200,6 @@ namespace Fort23.Mono
 
         private async void Bnt_shengShi_onClick(int count, List<ItemInfo> useItems)
         {
-            if (AccountFileInfo.Instance.playerData.divineSensePoint <
-                PlayerManager.Instance.gameConstantConfig.DetectEventCount)
-            {
-                await DivineSenceRestoredPanel.OpenPanel();
-                // await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
-                return;
-            }
-            
-
             if (count == 0)
             {
                 return;
@@ -323,7 +316,7 @@ namespace Fort23.Mono
             }
 
             appBarPanel.CustomInit(uiPanel);
-            
+
             RedDotManager.Instance.AllRedDotUpDate();
         }
 

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -183,6 +183,7 @@ namespace Fort23.Mono
             onCion.text = "x" + openBoxConfig.oneConsume;
             tenCion.text = "x" + openBoxConfig.tenConsume;
             Slider_Count.maxValue = openBoxConfig.reward2para1;
+            TitlePanel.OpenPanel(new List<int>() { openBoxConfig.CostItemID });
             UpdateUi();
         }
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -251,6 +251,15 @@ namespace Fort23.Mono
                 icon.icon_name = "bg_lh_di1";
             }
 
+            if (eventConditionConfig.EventID == 10000)
+            {
+                Btn_Cancel.gameObject.SetActive(false);
+            }
+            else
+            {
+                Btn_Cancel.gameObject.SetActive(true);
+            }
+
             Btn_Bag.gameObject.SetActive(false);
             if (index >= dialogueMessaga.Length)
             {

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -59,7 +59,7 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            await CustomInit((int)uiData[0], uiData[2] as AccountFileInfo.EventList, uiData[2] as CTask<bool>);
+            await CustomInit((int)uiData[0], uiData[1] as AccountFileInfo.EventList, uiData[2] as CTask<bool>);
             return await base.AsyncInit(uiData);
         }
 
@@ -75,7 +75,7 @@ namespace Fort23.Mono
                     ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[i]);
                 CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
                 //玩家等级
-                if (groupConfig.GroupMonsterLevel[i] == -1)
+                if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
                 {
                     MonsterPowerUpConfig heroPowerUpConfig =
                         ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -35,7 +35,7 @@ namespace Fort23.Mono
                 PlayerGuideManager.Instance.NextGuide();
             }
 
-            if (PlayerGuideManager.Instance.GuideIsCanDo(3, 2))
+            if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -33,9 +33,15 @@ namespace Fort23.Mono
         public override CTask GetFocus()
         {
             AppBarPanel.OpenPanel(this);
+            CustomInit(callback);
             return base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            return base.LoseFocus();
+        }
+
         protected override void AddEvent()
         {
         }
@@ -46,7 +52,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_Ok.onClick.AddListener(() =>
+            Btn_Ok.onClick.AddListener(async () =>
             {
                 if (EventSystemManager.Instance.GetShenShiCount() >=
                     divineSenseConfig.MaxNum)
@@ -55,6 +61,23 @@ namespace Fort23.Mono
                     return;
                 }
 
+                // if (useCount == 0)
+                // {
+                //     // DivineSenceRestoredPanel divineSenceRestoredPanel =  await DivineSenceRestoredPanel.OpenPanel();
+                //     // await divineSenceRestoredPanel.UIClosed();
+                //     // CustomInit(callback);
+                //     return;
+                // }
+
+                if (AccountFileInfo.Instance.playerData.divineSensePoint <
+                    PlayerManager.Instance.gameConstantConfig.DetectEventCount)
+                {
+                    DivineSenceRestoredPanel divineSenceRestoredPanel = await DivineSenceRestoredPanel.OpenPanel();
+                    await divineSenceRestoredPanel.UIClosed();
+                    CustomInit(callback);
+                    return;
+                }
+
                 useItems.Clear();
                 foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
                 {
@@ -65,7 +88,8 @@ namespace Fort23.Mono
                 }
 
                 callback?.Invoke(useCount, useItems);
-                UIManager.Instance.HideUIUIPanel(this);
+                GObjectPoolInterface.SetActive(false);
+                // UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });
@@ -76,7 +100,8 @@ namespace Fort23.Mono
             Btn_Event.onClick.AddListener(async () =>
             {
                 await DivineSenceEventPreviewPanel.OpenPanel();
-                UIManager.Instance.HideUIUIPanel(this, isBreadcrumbBarPanel: false);
+                GObjectPoolInterface.SetActive(false);
+                // UIManager.Instance.HideUIUIPanel(this, isBreadcrumbBarPanel: false);
             });
         }
 
@@ -85,7 +110,7 @@ namespace Fort23.Mono
             useCount = (int)value;
             Text_Count.text = LanguageManager.Instance.Text(10253, value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
-            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() }/{maxCount})";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
                 senceInfoBtnWidget.UpdateItermCount(useCount);
@@ -99,10 +124,10 @@ namespace Fort23.Mono
                 PlayerGuideManager.Instance.NextGuide();
             }
 
-            if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
-            {
-                PlayerGuideManager.Instance.NextGuide();
-            }
+            // if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
+            // {
+            //     PlayerGuideManager.Instance.NextGuide();
+            // }
 
             _divineSenceInfoBtnWidgets.Clear();
             divineSenseConfig =
@@ -124,7 +149,7 @@ namespace Fort23.Mono
                 : count;
 
 
-            if (count == 1)
+            if (count == 1 || count == 0)
             {
                 Slider_Count.minValue = 0;
                 Slider_Count.maxValue = count;
@@ -169,12 +194,14 @@ namespace Fort23.Mono
             this.callback = callback;
         }
 
-        private void OnClick(ItemWidgetBasic obj)
+        private async void OnClick(ItemWidgetBasic obj)
         {
             DivineSenceInfoBtnWidget divineSenceInfoBtnWidget = obj as DivineSenceInfoBtnWidget;
             if (divineSenceInfoBtnWidget.type == 1)
             {
-                DivineSenceRestoredPanel.OpenPanel();
+                DivineSenceRestoredPanel divineSenceRestoredPanel = await DivineSenceRestoredPanel.OpenPanel();
+                await divineSenceRestoredPanel.UIClosed();
+                CustomInit(callback);
                 return;
             }
 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredPanel.cs

@@ -109,9 +109,10 @@ namespace Fort23.Mono
         }
 
 
-        public async static CTask OpenPanel()
+        public async static CTask<DivineSenceRestoredPanel> OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Top, isShowBG: true);
+            DivineSenceRestoredPanel divineSenceRestoredPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Top, isShowBG: true);
+            return divineSenceRestoredPanel;
         }
 
         public override CTask Close()

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -66,102 +66,107 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel<GongFaUpgradePanel>();
             });
 
+            Btn_UpGradeOk.onClick.AddListener(() => { UpgradeClick(); });
 
-            Btn_UpGrade.onClick.AddListener(() =>
+
+            Btn_UpGrade.onClick.AddListener(() => { UpgradeClick(); });
+
+            Btn_UpStar.onClick.AddListener(() => { UpStarClick(); });
+            Btn_UpStarOk.onClick.AddListener(() => { UpStarClick(); });
+        }
+
+        private void UpStarClick()
+        {
+            if (!isUpStar)
             {
-                if (_skillInfo.SkillData == null)
-                {
-                    return;
-                }
+                isUpStar = true;
+                UpdateStarBtn();
+                return;
+            }
 
-                if (!isUpGrad)
-                {
-                    isUpGrad = true;
-                    UpdateStarBtn();
-                    return;
-                }
+            if (_skillInfo.SkillData == null)
+            {
+                return;
+            }
 
-                if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Count)
-                {
-                    TipMessagePanel.OpenTipMessagePanel("已经满级！");
-                    return;
-                }
+            if (_skillInfo.SkillData.star > _gongFaUpgradeInfoWidgets.Count)
+            {
+                TipMessagePanel.OpenTipMessagePanel("已经满星！");
+                return;
+            }
 
-                if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
-                {
-                    HeroPowerUpConfig heroPowerUpConfig =
-                        ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
-                    TipMessagePanel.OpenTipMessagePanel(
-                        $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}");
-                    return;
-                }
+            ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
 
-                for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
-                {
-                    if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i],
-                            _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
-                    {
-                        ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
-                        TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                        return;
-                    }
-                }
+            SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
 
-                // for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
-                // {
-                //     if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i],
-                //             _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
-                //     {
-                //         ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
-                //         TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                //         return;
-                //     }
-                // }
-
-                _skillInfo.SkillData.level++;
-                _skillInfo.CustomInt(_skillInfo.SkillData);
-                CustomInit(_skillInfo);
-                AccountFileInfo.Instance.SavePlayerData();
-            });
+            int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
 
-            Btn_UpStar.onClick.AddListener(() =>
+            if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
             {
-                if (!isUpStar)
-                {
-                    isUpStar = true;
-                    UpdateStarBtn();
-                    return;
-                }
+                ItemSourcePanel.OpenPanel(_skillInfo.skillConfig.PieceID);
+                TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                return;
+            }
 
-                if (_skillInfo.SkillData == null)
-                {
-                    return;
-                }
 
-                if (_skillInfo.SkillData.star > _gongFaUpgradeInfoWidgets.Count)
-                {
-                    TipMessagePanel.OpenTipMessagePanel("已经满星！");
-                    return;
-                }
+            _skillInfo.SkillData.star++;
+            _skillInfo.CustomInt(_skillInfo.SkillData);
+            CustomInit(_skillInfo);
+            AccountFileInfo.Instance.SavePlayerData();
+        }
 
-                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
+        private void UpgradeClick()
+        {
+            if (_skillInfo.SkillData == null)
+            {
+                return;
+            }
+
+            if (!isUpGrad)
+            {
+                isUpGrad = true;
+                UpdateStarBtn();
+                return;
+            }
 
-                SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
+            if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Count)
+            {
+                TipMessagePanel.OpenTipMessagePanel("已经满级！");
+                return;
+            }
 
-                int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
+            if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
+            {
+                HeroPowerUpConfig heroPowerUpConfig =
+                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
+                TipMessagePanel.OpenTipMessagePanel(
+                    $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}");
+                return;
+            }
 
-                if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
+            for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
+            {
+                if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i],
+                        _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
                 {
-                    ItemSourcePanel.OpenPanel(_skillInfo.skillConfig.PieceID);
+                    ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
                     TipMessagePanel.OpenTipMessagePanel("道具不足！");
                     return;
                 }
+            }
 
-                _skillInfo.SkillData.star++;
-                _skillInfo.CustomInt(_skillInfo.SkillData);
-                CustomInit(_skillInfo);
-                AccountFileInfo.Instance.SavePlayerData();
-            });
+            //扣除道具
+            for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
+            {
+                PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i],
+                    _skillInfo.SkillPowerupConfig.LevelupItemNum[i]);
+            }
+
+
+            _skillInfo.SkillData.level++;
+            _skillInfo.CustomInt(_skillInfo.SkillData);
+            CustomInit(_skillInfo);
+            AccountFileInfo.Instance.SavePlayerData();
         }
 
         public async void CustomInit(SkillInfo skillInfo)
@@ -230,39 +235,6 @@ namespace Fort23.Mono
                 }
             }
 
-            // for (var i = 0; i < StarRoot.Count; i++)
-            // {
-            //     MyImage myImage = StarRoot[i] as MyImage;
-            //     myImage.gameObject.SetActive(false);
-            // }
-            //
-            // int yinstar = skillInfo.skillConfig.level - 5;
-            // for (var i = 0; i < StarRoot.Count; i++)
-            // {
-            //     MyImage icon = StarRoot[i] as MyImage;
-            //     if (skillInfo.skillConfig.level > 5)
-            //     {
-            //         if (i < yinstar)
-            //         {
-            //             icon.icon_name = "dec_star_2";
-            //             icon.gameObject.SetActive(true);
-            //         }
-            //         else
-            //         {
-            //             icon.icon_name = "dec_gfxingji";
-            //             icon.gameObject.SetActive(true);
-            //         }
-            //     }
-            //     else
-            //     {
-            //         if (i < skillInfo.skillConfig.level)
-            //         {
-            //             icon.icon_name = "dec_gfxingji";
-            //             icon.gameObject.SetActive(true);
-            //         }
-            //     }
-            // }
-
 
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
@@ -299,6 +271,10 @@ namespace Fort23.Mono
 
             if (isUpGrad)
             {
+                Btn_UpStar.gameObject.SetActive(false);
+                Btn_UpGrade.gameObject.SetActive(false);
+                Btn_UpStarOk.gameObject.SetActive(false);
+                Btn_UpGradeOk.gameObject.SetActive(true);
                 if (_skillInfo.SkillData.level < _skillPowerupConfigs.Count)
                 {
                     AccountFileInfo.SkillData skillData = new AccountFileInfo.SkillData();
@@ -333,8 +309,7 @@ namespace Fort23.Mono
                     Text_GongFaDesc.text =
                         UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), effs);
 
-                    Btn_UpStar.gameObject.SetActive(false);
-                    Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
+                    // Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
                     if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
                     {
                         HeroPowerUpConfig heroPowerUpConfig =
@@ -342,12 +317,12 @@ namespace Fort23.Mono
                                 .PlayerLevelLimit);
                         Text_UpGrade.text =
                             $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}";
-                        Btn_UpGrade.gameObject.transform.Gray(true);
+                        Btn_UpGradeOk.gameObject.transform.Gray(true);
                         UpGradeItemRoot.SetActive(false);
                     }
                     else
                     {
-                        Btn_UpGrade.gameObject.transform.RecoverColor();
+                        Btn_UpGradeOk.gameObject.transform.RecoverColor();
                         Text_UpGrade.text = LanguageManager.Instance.Text(10220);
                         UpGradeItemRoot.SetActive(true);
                         for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
@@ -375,7 +350,7 @@ namespace Fort23.Mono
                     Text_NextLevel.text = LanguageManager.Instance.Text(10221, _skillInfo.skillConfig.level,
                         "Max");
                     Text_UpGrade.text = LanguageManager.Instance.Text(10264);
-                    Btn_UpStar.gameObject.SetActive(false);
+                    // Btn_UpStarOk.gameObject.SetActive(false);
                     UpGradeItemRoot.SetActive(false);
                 }
             }
@@ -383,39 +358,37 @@ namespace Fort23.Mono
 
             if (isUpStar)
             {
-                Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(481, 80);
                 foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
                 {
                     gongFaUpgradeInfoWidget.SelectWidget(true);
                 }
 
+                Btn_UpStar.gameObject.SetActive(false);
+                Btn_UpGrade.gameObject.SetActive(false);
+                Btn_UpGradeOk.gameObject.SetActive(false);
+                Btn_UpStarOk.gameObject.SetActive(true);
                 if (_skillInfo.skillConfig.level < 6)
                 {
-                    Btn_UpStar.gameObject.transform.RecoverColor();
+                    Btn_UpStarOk.gameObject.transform.RecoverColor();
                     Text_UpStar.text = LanguageManager.Instance.Text(10219);
-                    Btn_UpGrade.gameObject.SetActive(false);
+
                     UpStarItemRoot.SetActive(true);
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
 
                     SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
 
                     int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
-                    // int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level];
                     ItemWidgetType1 itemWidgetType1 =
                         await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null,
                             UpStarItemRoot.GetComponent<RectTransform>(), isInstance: true);
                     itemWidgetType1.CustomInit(_skillInfo.skillConfig.PieceID, count);
                     _itemWidgetType1.Add(itemWidgetType1);
-
-                    // EnergyWidget energyWidget =
-                    //     await UIManager.Instance.CreateGComponent<EnergyWidget>(null, EnergyRoot);
-                    // energyWidget.CustomInit(_skillInfo.skillConfig.PieceID);
-                    // _energyWidgets.Add(energyWidget);
                 }
                 else
                 {
+                    Btn_UpStarOk.transform.Gray(true);
                     Text_UpStar.text = LanguageManager.Instance.Text(10265);
-                    Btn_UpGrade.gameObject.SetActive(false);
+                    // Btn_UpStarOk.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(false);
                 }
             }
@@ -423,16 +396,15 @@ namespace Fort23.Mono
 
             if (!isUpGrad && !isUpStar)
             {
-                Btn_UpGrade.GetComponent<RectTransform>().sizeDelta = new Vector2(253, 80);
-                Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(253, 80);
-
                 Btn_UpGrade.gameObject.SetActive(true);
                 Btn_UpStar.gameObject.SetActive(true);
+                Btn_UpGradeOk.gameObject.SetActive(false);
+                Btn_UpStarOk.gameObject.SetActive(false);
                 UpStarItemRoot.SetActive(false);
                 UpGradeItemRoot.SetActive(false);
                 Text_UpStar.text = LanguageManager.Instance.Text(10219);
                 Text_UpGrade.text = LanguageManager.Instance.Text(10220);
-                Btn_UpGrade.gameObject.transform.RecoverColor();
+                Btn_UpGradeOk.gameObject.transform.RecoverColor();
                 foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
                 {
                     gongFaUpgradeInfoWidget.SelectWidget(false);

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -250,6 +250,28 @@ namespace Fort23.Mono
 	      return _csc;
 	     }
 	   }
+	  private Button _Btn_UpGradeOk;
+	  public Button Btn_UpGradeOk
+	   {
+	   get{
+	      if (_Btn_UpGradeOk == null)
+	       {
+	         _Btn_UpGradeOk  = GetUIUnit<Button>("Btn_UpGradeOk"); 
+	       }
+	      return _Btn_UpGradeOk;
+	     }
+	   }
+	  private Button _Btn_UpStarOk;
+	  public Button Btn_UpStarOk
+	   {
+	   get{
+	      if (_Btn_UpStarOk == null)
+	       {
+	         _Btn_UpStarOk  = GetUIUnit<Button>("Btn_UpStarOk"); 
+	       }
+	      return _Btn_UpStarOk;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs

@@ -26,7 +26,7 @@ namespace Fort23.Mono.Phases
             base.Active();
             actionList.Add(OnStep301);
             actionList.Add(OnStep302);
-            actionList.Add(OnStep303);
+            // actionList.Add(OnStep303);
 
 
             actionList.Add(OnStepEnd);
@@ -73,20 +73,20 @@ namespace Fort23.Mono.Phases
 
 
         /// <summary>
-        /// 点击主界面神识
+        /// 点击主界面铃铛按钮
         /// </summary>
         /// <param name="obj"></param>
         public async CTask OnStep301(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            GameObject gameObject = UIManager.Instance.GetComponent<AppBarPanel>().bnt_shengShi.gameObject;
+            GameObject gameObject = UIManager.Instance.GetComponent<MainPanel>().Btn_Event.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-            AccountFileInfo.Instance.playerData.divineSensePoint += 300;
+            // AccountFileInfo.Instance.playerData.divineSensePoint += 300;
 
             await pgm.ConfigLogic(301, delegate() { });
 
@@ -94,30 +94,30 @@ namespace Fort23.Mono.Phases
             pgm.SetFingerVisiable(true);
         }
 
-        /// <summary>
-        /// 开始探索
-        /// </summary>
-        /// <param name="obj"></param>
-        public async CTask OnStep302(UnityEngine.Object obj)
-        {
-            pgm.StepInit();
-            await TimerComponent.Instance.WaitAsync(100);
-            GameObject gameObject = UIManager.Instance.GetComponent<DivineSenceInfoPanel>().Btn_Ok.gameObject;
-            Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
-            Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
+        // /// <summary>
+        // /// 
+        // /// </summary>
+        // /// <param name="obj"></param>
+        // public async CTask OnStep302(UnityEngine.Object obj)
+        // {
+        //     pgm.StepInit();
+        //     await TimerComponent.Instance.WaitAsync(100);
+        //     GameObject gameObject = UIManager.Instance.GetComponent<DivineSenceInfoPanel>().Btn_Ok.gameObject;
+        //     Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
+        //     Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
+        //
+        //     pgm.SetfxTransVisiable(true);
+        //     pgm.SetMaskTarget(gameObject);
+        //     pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
+        //
+        //     await pgm.ConfigLogic(302, delegate() { });
+        //
+        //     pgm.SetFingerPos(localPos);
+        //     pgm.SetFingerVisiable(true);
+        // }
 
-            pgm.SetfxTransVisiable(true);
-            pgm.SetMaskTarget(gameObject);
-            pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-
-            await pgm.ConfigLogic(302, delegate() { });
 
-            pgm.SetFingerPos(localPos);
-            pgm.SetFingerVisiable(true);
-        }
-
-
-        public async CTask OnStep303(UnityEngine.Object obj)
+        public async CTask OnStep302(UnityEngine.Object obj)
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -92,7 +92,7 @@ namespace Fort23.Mono
             });
 
 
-            Btn_TuPo.onClick.AddListener(() =>
+            Btn_TuPo.onClick.AddListener(async () =>
             {
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
                 {
@@ -120,14 +120,17 @@ namespace Fort23.Mono
                     //大突破
                     else
                     {
-                        HeroBreakthroughPanel.OpenPanel();
+                        HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
+                        await heroBreakthroughPanel.UIClosed();
                         // PlayerManager.Instance.myHero.Upgrade();
-                        // CustomInit();
+                        CustomInit();
                     }
                 }
                 else
                 {
-                    HeroBreakthroughPanel.OpenPanel();
+                    HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
+                    await heroBreakthroughPanel.UIClosed();
+                    CustomInit();
                     // TipMessagePanel.OpenTipMessagePanel("")
                 }
             });
@@ -150,6 +153,64 @@ namespace Fort23.Mono
             heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
                 PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
 
+
+            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
+                                    1000);
+
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            int redDotID = 5;
+            AccountFileInfo.RedDot redDot = RedDotManager.Instance.GetRedDot(redDotID);
+            if (redDot == null)
+            {
+                redDot = new AccountFileInfo.RedDot();
+                redDot.id = redDotID;
+            }
+
+
+            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+            {
+                //大突破
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
+                {
+                    for (var i = 0;
+                         i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                         i++)
+                    {
+                        if (!PlayerManager.Instance.BagController.IsEnough(
+                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                        {
+                            break;
+                        }
+                    }
+
+                    if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                    {
+                        redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                        RedDotManager.Instance.AddRedDot(redDot);
+                    }
+                }
+            }
+            else
+            {
+                for (var i = 0;
+                     i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                     i++)
+                {
+                    if (!PlayerManager.Instance.BagController.IsEnough(
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                    {
+                        break;
+                    }
+                }
+
+                if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                {
+                    redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                    RedDotManager.Instance.AddRedDot(redDot);
+                }
+            }
+
+
             HeroAttributeWidget heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
@@ -157,13 +218,15 @@ namespace Fort23.Mono
                 "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
-            heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+            heroAttributeWidget =
+                await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
                 PlayerManager.Instance.myHero.attack.Value.ToString(),
                 "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
-            heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+            heroAttributeWidget =
+                await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
                 PlayerManager.Instance.myHero.defense.Value.ToString(),
                 "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToString()));
@@ -198,9 +261,7 @@ namespace Fort23.Mono
             }
 
             Text_Level.text = $"LV{PlayerManager.Instance.myHero.level}";
-            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
 
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
                               (PlayerManager.Instance.myHero.heroData.exp + allexp)) /
@@ -233,7 +294,8 @@ namespace Fort23.Mono
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
-            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
+            int currentMiao =
+                (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
             float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
 
@@ -378,7 +440,7 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("dujie_pizhong.wav");
                 await TimerComponent.Instance.WaitAsync(200);
                 showTextWidgets[i].ShowUI(hpPos.transform.position, -h, HarmType.Default, false);
-     
+
                 hp -= h;
                 hp = hp < 0 ? 0 : hp;
                 Slider_Hp.value = hp;

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -168,6 +168,11 @@ namespace Fort23.Mono
 
             Btn_StartEvent.onClick.AddListener(() =>
             {
+                if (PlayerGuideManager.Instance.curPhase == 3)
+                {
+                    return;
+                }
+
                 if (PlayerGuideManager.Instance.GuideIsCanDo(1, 3))
                 {
                     PlayerGuideManager.Instance.NextGuide();

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -42,7 +42,7 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
-            TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
+         
             AppBarPanel.OpenPanel(this);
 
             return base.GetFocus();
@@ -89,6 +89,7 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
+            TitlePanel.OpenPanel(shopBtnWidget.ShopGroupConfig.titleShowItemIds.ToList());
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
             ShopBtnContent.GetComponent<UIToggleList>()
                 .ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());