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

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
+    - _Alpha: 0.009337337
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Global Volume Profile.asset

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8040186756344281628
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  skipIterations:
+    m_OverrideState: 0
+    m_Value: 1
+  threshold:
+    m_OverrideState: 1
+    m_Value: 0.9
+  intensity:
+    m_OverrideState: 1
+    m_Value: 46.75
+  scatter:
+    m_OverrideState: 0
+    m_Value: 0.7
+  clamp:
+    m_OverrideState: 0
+    m_Value: 65472
+  tint:
+    m_OverrideState: 0
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
+  highQualityFiltering:
+    m_OverrideState: 0
+    m_Value: 0
+  downscale:
+    m_OverrideState: 0
+    m_Value: 0
+  maxIterations:
+    m_OverrideState: 0
+    m_Value: 6
+  dirtTexture:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
+    dimension: 1
+  dirtIntensity:
+    m_OverrideState: 0
+    m_Value: 0
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: Global Volume Profile
+  m_EditorClassIdentifier: 
+  components:
+  - {fileID: -8040186756344281628}

Assets/Global Volume Profile.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BnNKtS/5VH6vll3QaXVGC+VZ/CmyO29qmO2LS11ob88fJ3oWxV73rSg9XRjp
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventLinkConfig.json

@@ -7628,7 +7628,7 @@
       "EventID": 30003,
       "optionType": 2,
       "optionPara1": [
-        1003
+        1004
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/HeroModelConfig.json

@@ -412,8 +412,8 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 100,
-      "hp": 400,
+      "attack": 120,
+      "hp": 240,
       "def": 100,
       "shield": 400,
       "speed_atk": 0.0,
@@ -470,8 +470,8 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 100,
-      "hp": 400,
+      "attack": 120,
+      "hp": 240,
       "def": 100,
       "shield": 400,
       "speed_atk": 0.0,

Assets/Res/Config/ItemConfig.json

@@ -360,7 +360,7 @@
       "ID": 1201,
       "itemName": 250,
       "itemDesc": 259,
-      "icon": "icon_item_1201",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -391,7 +391,7 @@
       "ID": 1202,
       "itemName": 251,
       "itemDesc": 260,
-      "icon": "icon_item_1202",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -422,7 +422,7 @@
       "ID": 1203,
       "itemName": 252,
       "itemDesc": 261,
-      "icon": "icon_item_1203",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -453,7 +453,7 @@
       "ID": 1204,
       "itemName": 253,
       "itemDesc": 262,
-      "icon": "icon_item_1204",
+      "icon": "icon_dujiedan",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -903,7 +903,7 @@
       "ID": 1502,
       "itemName": 1948,
       "itemDesc": 1950,
-      "icon": "icon_haogandugift",
+      "icon": "icon_haogandugift2",
       "itemTag": 6,
       "quality": 4,
       "stack": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38382,7 +38382,7 @@
     },
     {
       "ID": 10336,
-      "txt": "0"
+      "txt": "返回"
     },
     {
       "ID": 10337,

Assets/Res/Config/ShopGroupConfig.json

@@ -3,32 +3,38 @@
     {
       "ID": 1,
       "shopName": 1900,
-      "pageSortNum": 2
+      "pageSortNum": 2,
+      "isShow": true
     },
     {
       "ID": 2,
       "shopName": 1904,
-      "pageSortNum": 4
+      "pageSortNum": 4,
+      "isShow": true
     },
     {
       "ID": 3,
       "shopName": 1905,
-      "pageSortNum": 5
+      "pageSortNum": 5,
+      "isShow": true
     },
     {
       "ID": 4,
       "shopName": 10106,
-      "pageSortNum": 1
+      "pageSortNum": 1,
+      "isShow": true
     },
     {
       "ID": 5,
       "shopName": 10106,
-      "pageSortNum": 6
+      "pageSortNum": 6,
+      "isShow": false
     },
     {
       "ID": 6,
       "shopName": 10330,
-      "pageSortNum": 3
+      "pageSortNum": 3,
+      "isShow": true
     }
   ]
 }

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -245,7 +245,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 4394259989585503546}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -1857,7 +1857,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 6614233195307115645}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2187,7 +2187,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 5838194811331929845}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2919,6 +2919,7 @@ GameObject:
   - component: {fileID: 1323129257164695259}
   - component: {fileID: 2475580319306575879}
   - component: {fileID: 6810677379968457547}
+  - component: {fileID: 5388431150151075162}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2988,3 +2989,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5173\u95ED\u5267\u60C5"
+--- !u!114 &5388431150151075162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185397062077033591}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10336

Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -80,6 +80,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &3946302300112563901
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8208259687597390858}
+  - component: {fileID: 4691782949268009187}
+  - component: {fileID: 5461611333477722381}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FabaoIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8208259687597390858
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3138042374053727249}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 60.0992, y: 60.0997}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4691782949268009187
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  m_CullTransparentMesh: 1
+--- !u!114 &5461611333477722381
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s3201
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6841961338208862055
 GameObject:
   m_ObjectHideFlags: 0
@@ -112,6 +201,7 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4458728715945139816}
+  - {fileID: 8208259687597390858}
   - {fileID: 3608208511281012576}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -151,6 +241,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_FabaoIcon
+    gameObject: {fileID: 5461611333477722381}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7546164237769612545
 GameObject:
@@ -170,7 +265,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4458728715945139816
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-2243743873803255587
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 6338071ae19698349baf2871fb50fc52, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TipMessagePanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 8971930629035168008}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &8971930629035168008
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2243743873803255587}
+    m_Position: {x: 270, y: 50, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2243743873803255587}

Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXtK4XylU3tM1F/bKTT0SXP8D7QAHxWvqP9t1KYiSYaXmpNq/NqLc+vkxnMV
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8939363238171972854}
   - component: {fileID: 6560399385940932289}
+  - component: {fileID: 2256782516058644794}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: TipMessagePanel
@@ -73,6 +74,27 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!95 &2256782516058644794
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 880950410469998858}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f1edf800366771144b7323c7fe314dd4, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2463588081883955419
 GameObject:
   m_ObjectHideFlags: 0
@@ -109,8 +131,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: 0, y: 3.4199}
-  m_SizeDelta: {x: 542.1544, y: 76.4785}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 542.1544, y: 49.8192}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -182,7 +204,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6862210015852255166
 RectTransform:
   m_ObjectHideFlags: 0
@@ -382,6 +404,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6582327781870859720}
+  - component: {fileID: 2252102652261273102}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: dotPoint
@@ -411,6 +434,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &2252102652261273102
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5357924637379588896}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &8464601678468247561
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -0,0 +1,196 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 1574349066
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.6666666
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

Assets/Res/UI/TipMessagePanel/showTips.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CXkcvSqqUioqqed/vA1jIWlqVUuGPIaKk8ROwwBsrWcXzQb8kCXRzl6sKu24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  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: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -10.699951, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

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

@@ -128,7 +128,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 展示文字提示长度
         /// </summary>
-        public int ShowTextCount;
+        public long ShowTextTime;
 
         /// <summary>
         /// 展示文字提示最大长度

Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///是否显示
+		/// </summary>
+#if !COMBAT_SERVER
+		public bool isShow;
+#else
+		public bool isShow{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -199,7 +199,7 @@ public class DialogueManager : Singleton<DialogueManager>
                 //不是一次性事件弹出boss界面
                 if (eventConfig.EventTriggerType != 2)
                 {
-                    bool relust = await BossInfoPanel.OpenPanel(dialogueConfig.optionPara1[0]);
+                    bool relust = await BossInfoPanel.OpenPanel(dialogueConfig.optionPara1[0],CurrentEventList);
                     if (relust)
                     {
                         CTask cTask = CTask.Create();

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -680,13 +680,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         $"该任务需要先解锁[{LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName)}], 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁.");
-                    tipMessagePanel.UIClosed(() =>
+                    // tipMessagePanel.UIClosed(() =>
+                    // {
+                    //   
+                    // });
+                    if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
-                        if (PlayerGuideManager.Instance.GuideIsCanDo(3))
-                        {
-                            PlayerGuideManager.Instance.SetGuid(3);
-                        }
-                    });
+                        PlayerGuideManager.Instance.SetGuid(3);
+                    }
 
                     return;
                 }

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

@@ -18,6 +18,7 @@ namespace Fort23.Mono
 
         private LevelbattleConfig levelbattleConfig;
         private GroupConfig groupConfig;
+
         List<BossInfoHeadWidget> BossInfoHeadWidgets = new List<BossInfoHeadWidget>();
         // private HeroModelConfig heroModelConfig;
         // private MonsterPowerUpConfig heroPowerUpConfig;
@@ -58,28 +59,50 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            await CustomInit((int)uiData[0], uiData[1] as CTask<bool>);
+            await CustomInit((int)uiData[0], uiData[2] as AccountFileInfo.EventList, uiData[2] as CTask<bool>);
             return await base.AsyncInit(uiData);
         }
 
 
-        public async CTask CustomInit(int levebattleId, CTask<bool> result)
+        public async CTask CustomInit(int levebattleId, AccountFileInfo.EventList eventList, CTask<bool> result)
         {
             this.result = result;
             levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levebattleId);
             groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            foreach (var i in groupConfig.GroupMonster)
+            for (var i = 0; i < groupConfig.GroupMonster.Length; i++)
             {
-                HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(i);
-                MonsterPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+                HeroModelConfig heroModelConfig =
+                    ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[i]);
                 CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-                combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                //玩家等级
+                if (groupConfig.GroupMonsterLevel[i] == -1)
+                {
+                    MonsterPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+
+                    combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                }
+                else
+                {
+                    MonsterPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(groupConfig.GroupMonsterLevel[i]);
+
+                    combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                }
 
-                BossInfoHeadWidget bossInfoHeadWidget  = await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null,BossInfoHeadRoot);
+
+                BossInfoHeadWidget bossInfoHeadWidget =
+                    await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null, BossInfoHeadRoot);
                 bossInfoHeadWidget.CustomInit(combatHeroInfo);
                 bossInfoHeadWidget.OnClick = OnClick;
                 BossInfoHeadWidgets.Add(bossInfoHeadWidget);
             }
+            // foreach (var i in groupConfig.GroupMonster)
+            // {
+            //    
+            //   
+            // }
+
             // heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
             // heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
             //
@@ -92,7 +115,7 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             BossInfoHeadWidget bossInfoHeadWidget = obj as BossInfoHeadWidget;
-            UpdateInfo(2,bossInfoHeadWidget._combatHero);
+            UpdateInfo(2, bossInfoHeadWidget._combatHero);
             Icon_Select.transform.SetParent(bossInfoHeadWidget.transform);
             Icon_Select.transform.SetAsFirstSibling();
             Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
@@ -112,14 +135,17 @@ namespace Fort23.Mono
                 Icon_Select.transform.SetParent(Btn_Player.transform);
                 Icon_Select.transform.SetAsFirstSibling();
                 Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-                Text_Name.text = "名称：" + LanguageManager.Instance.Text(PlayerManager.Instance.PlayerName);
+                Text_Name.text = "名称：" + PlayerManager.Instance.PlayerName;
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                Text_Jingjie.text =
+                    "境界：" +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
-                Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
+                Text_Linggen.text =
+                    $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
@@ -159,13 +185,14 @@ namespace Fort23.Mono
             {
                 // Icon_Select.transform.SetParent(Btn_Boss.transform);
                 // Icon_Select.transform.SetAsFirstSibling();
-              
+
                 Text_Name.text = "名称：" + LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
-                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
-                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
+                Text_Jingjie.text =
+                    "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
+                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
+                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
                 {
@@ -175,12 +202,19 @@ namespace Fort23.Mono
                         {
                             int index = i;
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.fabaoActiveLv[i];
-                            cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((faBaoWidget) =>
+                            if (isUlock)
                             {
-                                faBaoWidget.CustomInit(new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index], combatHeroInfo.MonsterPowerUpConfig.FabaoLv, 1),isUlock);
-                                faBaoWidget.OnClick = FaBaoWidgetOnClick;
-                                gongFaWidgetType2s.Add(faBaoWidget);
-                            }, FabaoRoot));
+                                cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
+                                    (faBaoWidget) =>
+                                    {
+                                        faBaoWidget.CustomInit(
+                                            new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index],
+                                                combatHeroInfo.MonsterPowerUpConfig.FabaoLv,
+                                                combatHeroInfo.MonsterPowerUpConfig.FabaoStar), isUlock);
+                                        faBaoWidget.OnClick = FaBaoWidgetOnClick;
+                                        gongFaWidgetType2s.Add(faBaoWidget);
+                                    }, FabaoRoot));
+                            }
                         }
                     }
 
@@ -190,12 +224,18 @@ namespace Fort23.Mono
                         {
                             int index = i;
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.skillActiveLv[i];
-                            cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((skillWidget) =>
+                            if (isUlock)
                             {
-                                skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index], combatHeroInfo.MonsterPowerUpConfig.GongfaLv, combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
-                                skillWidget.OnClick = FaBaoWidgetOnClick;
-                                gongFaWidgetType2s.Add(skillWidget);
-                            }, GongfaRoot));
+                                cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
+                                    (skillWidget) =>
+                                    {
+                                        skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index],
+                                            combatHeroInfo.MonsterPowerUpConfig.GongfaLv,
+                                            combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
+                                        skillWidget.OnClick = FaBaoWidgetOnClick;
+                                        gongFaWidgetType2s.Add(skillWidget);
+                                    }, GongfaRoot));
+                            }
                         }
                     }
 
@@ -203,7 +243,8 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Linggen.text = $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
+                Text_Linggen.text =
+                    $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
                 Text_Hp.text = combatHeroInfo.hp.Value.ToString();
             }
         }
@@ -232,11 +273,12 @@ namespace Fort23.Mono
             }
 
             gongFaWidgetType2s.Clear();
-            
+
             foreach (var bossInfoHeadWidget in BossInfoHeadWidgets)
             {
                 UIManager.Instance.DormancyGComponent(bossInfoHeadWidget);
             }
+
             BossInfoHeadWidgets.Clear();
 
             Icon_Select.transform.SetParent(transform);
@@ -245,11 +287,12 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public async static CTask<bool> OpenPanel(int levebattleId)
+        public async static CTask<bool> OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
         {
             CTask<bool> result = CTask<bool>.Create();
-            
-            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result },isShowBG:true);
+
+            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
+                uiData: new object[] { levebattleId, CurrentEventList, result }, isShowBG: true);
             // bossInfoPanel.CustomInit(levebattleId, result);
             return await result;
         }

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

@@ -25,11 +25,14 @@ namespace Fort23.Mono
         {
         }
 
-        public void CustomInit(FaBaoInfo faBaoInfo,bool isUlock = true)
+        public void CustomInit(FaBaoInfo faBaoInfo, bool isUlock = true)
         {
+            Icon_FabaoIcon.gameObject.SetActive(true);
+            Icon_GongFaIcon.gameObject.SetActive(false);
             this.faBaoInfo = faBaoInfo;
             Text_Level.text = faBaoInfo.FaBaoData.level.ToString() + "级";
-            Icon_GongFaIcon.icon_name = faBaoInfo.SkillConfig.icon;
+            Icon_FabaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
+
             if (isUlock)
             {
                 this.transform.RecoverColor();
@@ -40,8 +43,10 @@ namespace Fort23.Mono
             }
         }
 
-        public void CustomInit(SkillInfo skillInfo,bool isUlock = true)
+        public void CustomInit(SkillInfo skillInfo, bool isUlock = true)
         {
+            Icon_FabaoIcon.gameObject.SetActive(false);
+            Icon_GongFaIcon.gameObject.SetActive(true);
             this.skillInfo = skillInfo;
             Text_Level.text = skillInfo.SkillPowerupConfig.ID.ToString() + "级";
             Icon_GongFaIcon.icon_name = skillInfo.skillConfig.icon;

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

@@ -30,6 +30,17 @@ namespace Fort23.Mono
 	      return _Text_Level;
 	     }
 	   }
+	  private MyImage _Icon_FabaoIcon;
+	  public MyImage Icon_FabaoIcon
+	   {
+	   get{
+	      if (_Icon_FabaoIcon == null)
+	       {
+	         _Icon_FabaoIcon  = GetUIUnit<MyImage>("Icon_FabaoIcon"); 
+	       }
+	      return _Icon_FabaoIcon;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -61,9 +61,31 @@ namespace Fort23.Mono
                 _shopBtnWidgets.Add(shopBtnWidget);
             }
 
+            bool isSelect = false;
+            for (var i = 0; i < _shopBtnWidgets.Count; i++)
+            {
+                if (PlayerManager.Instance.CurrentsmallPlaces.id == _shopBtnWidgets[i].SmallPlacesConfig.ID)
+                {
+                    isSelect = true;
+                    _shopBtnWidgets[i].OnPointerClick();
+                    break;
+                }
+            }
+
+            if (!isSelect)
+            {
+                for (var i = _shopBtnWidgets.Count - 1; i >= _shopBtnWidgets.Count; i--)
+                {
+                    if (_shopBtnWidgets[i].iaUlock)
+                    {
+                        _shopBtnWidgets[i].OnPointerClick();
+                        break;
+                    }
+                }
+            }
 
             // toggleList.GetChildObj();
-            _shopBtnWidgets[0].OnPointerClick();
+
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
@@ -77,7 +99,7 @@ namespace Fort23.Mono
             // }
 
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
-            int jindu =placesData == null ? 0 : placesData.progress;
+            int jindu = placesData == null ? 0 : placesData.progress;
             Text_PlacesComplteProgress.text = $"章节事件：{jindu}/{placesConfig.TotalScore}";
             return await base.AsyncInit(uiData);
         }
@@ -247,7 +269,7 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 UIManager.Instance.HideUIUIPanel(this);
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
-                
+
                 callBack?.Invoke(true);
                 callBack = null;
             }

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

@@ -12,6 +12,8 @@ namespace Fort23.Mono
 
         public SmallPlacesConfig SmallPlacesConfig;
 
+        public bool iaUlock = false;
+
         private void Init()
         {
         }
@@ -49,6 +51,7 @@ namespace Fort23.Mono
                                              lastSmallPlacesData.completionEventCount <
                                              lastSmallPlacesConfig.CompletionEventCount))
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 // TipMessagePanel.OpenTipMessagePanel(
                 //     $"[{LanguageManager.Instance.Text(shopBtnWidget.SmallPlacesConfig.placeName)}]未解锁, 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁. ");
@@ -63,6 +66,7 @@ namespace Fort23.Mono
                         ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
                 if (eventList == null || !eventList.isCompleted)
                 {
+                    iaUlock = false;
                     uiToggle.Hind();
                     return;
                 }
@@ -72,10 +76,12 @@ namespace Fort23.Mono
                 PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID);
             if (currentSmallPlacesData == null)
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 return;
             }
 
+            iaUlock = true;
             uiToggle.Show();
         }
     }

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

@@ -44,7 +44,7 @@ namespace Fort23.Mono
         {
             TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             AppBarPanel.OpenPanel(this);
-           
+
             return base.GetFocus();
         }
 
@@ -55,17 +55,21 @@ namespace Fort23.Mono
         }
 
 
-        public int Sort(ShopGroupConfig s,ShopGroupConfig b)
+        public int Sort(ShopGroupConfig s, ShopGroupConfig b)
         {
             return s.pageSortNum.CompareTo(b.pageSortNum);
         }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-          List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
-          shopGroupConfigs.Sort(Sort);
-          foreach (var shopGroupConfig in shopGroupConfigs)
-          {
-                ShopBtnWidget shopBtnWidget = await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
+            List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
+            shopGroupConfigs.Sort(Sort);
+            foreach (var shopGroupConfig in shopGroupConfigs)
+            {
+                if (!shopGroupConfig.isShow)
+                    continue;
+                ShopBtnWidget shopBtnWidget =
+                    await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
                 shopBtnWidget.CustomInit(shopGroupConfig);
                 shopBtnWidget.OnClick = OnClick;
                 _shopBtnWidgets.Add(shopBtnWidget);
@@ -73,7 +77,7 @@ namespace Fort23.Mono
                 {
                     currentSelectedShopBtnWidget = shopBtnWidget;
                 }
-          }
+            }
 
             ShopBtnContent.GetComponent<UIToggleList>().GetChildObj();
             currentSelectedShopBtnWidget.OnPointerClick();
@@ -86,7 +90,8 @@ namespace Fort23.Mono
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
-            ShopBtnContent.GetComponent<UIToggleList>().ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());
+            ShopBtnContent.GetComponent<UIToggleList>()
+                .ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());
             currentSelectedShopBtnWidget = shopBtnWidget;
             foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
             {
@@ -104,11 +109,10 @@ namespace Fort23.Mono
                 {
                     if (shopConfig.shopItemGroup == 4)
                     {
-
-                        ShopBoxWidget shopBoxWidget = await UIManager.Instance.CreateGComponent<ShopBoxWidget>(null, Content);
+                        ShopBoxWidget shopBoxWidget =
+                            await UIManager.Instance.CreateGComponent<ShopBoxWidget>(null, Content);
                         shopBoxWidget.CustomInit();
                         _shopGroupWidgetType1s.Add(shopBoxWidget);
-
                     }
                     // if (shopData.id == 1 || shopData.id == 5)
                     // {
@@ -121,7 +125,8 @@ namespace Fort23.Mono
                     else
                     {
                         ShopGroupWidgetType1 shopGroupWidgetType1 =
-                            await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(ShopGroupWidgetType2,
+                            await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(
+                                ShopGroupWidgetType2,
                                 null, Content, isInstance: true);
                         _shopGroupWidgetType1s.Add(shopGroupWidgetType1);
                         await shopGroupWidgetType1.CustomInit(shopData);
@@ -197,7 +202,9 @@ namespace Fort23.Mono
 
         public static async CTask<ShopPanel> OpenPanel(bool isPauseCombat = false)
         {
-            ShopPanel shopPanel = await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },isFullUI:true);
+            ShopPanel shopPanel =
+                await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },
+                    isFullUI: true);
 
             AudioManager.Instance.PlayAudio("ui_shangdian.wav");
             return shopPanel;

Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs

@@ -6,20 +6,34 @@ using UnityEngine.UI;
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "TipMessagePanel")]
-    public partial class TipMessagePanel : UIPanel
+    public partial class TipMessagePanel : UIComponent
     {
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(meg, worldPos);
             return tipMessagePanel;
         }
 
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(int meg, Vector2 worldPos = default)
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(LanguageManager.Instance.Text(meg), worldPos);
             return tipMessagePanel;
         }
@@ -32,14 +46,13 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isAddStack = false;
         }
 
-        protected override void AddEvent()
+        public override void AddEvent()
         {
         }
 
-        protected override void DelEvent()
+        public override void DelEvent()
         {
         }
 
@@ -50,7 +63,7 @@ namespace Fort23.Mono
 
         private void OnClickButton_bg()
         {
-            UIManager.Instance.HideUIUIPanel(this);
+            // UIManager.Instance.HideUIUIPanel(this);
         }
 
         public async void SetTipMessage(string msg, Vector2 pos)
@@ -73,7 +86,7 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
             RectTransform bgTran = bg_icon.GetComponent<RectTransform>();
 
-            float y = rectTransform.sizeDelta.y + 40;
+            float y = rectTransform.sizeDelta.y + 20;
             if (y < 100)
             {
                 y = 100;
@@ -96,6 +109,9 @@ namespace Fort23.Mono
 
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+
+            Animator.Play("showTips");
+            TimerComponent.Instance.AddTimer(1450, () => { UIManager.Instance.DormancyGComponent(this); });
         }
     }
 }

Assets/xiuxian/cs/cj01.asset

@@ -33,10 +33,10 @@ MonoBehaviour:
     m_Value: 1
   threshold:
     m_OverrideState: 1
-    m_Value: 1.2
+    m_Value: 4.05
   intensity:
     m_OverrideState: 1
-    m_Value: 4
+    m_Value: 5.93
   scatter:
     m_OverrideState: 1
     m_Value: 0.7

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615