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

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

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

Assets/Res/Config/EventLinkConfig.json

@@ -7569,7 +7569,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 119,
+      "NPCID": 155,
       "LanID": [
         5544
       ],
@@ -17730,7 +17730,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6318
       ],
@@ -17766,7 +17766,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6320
       ],
@@ -17784,7 +17784,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6321
       ],
@@ -20273,7 +20273,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6486
       ],
@@ -20309,7 +20309,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6488
       ],
@@ -20363,7 +20363,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6491
       ],
@@ -20399,7 +20399,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6493
       ],
@@ -20435,7 +20435,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6495
       ],
@@ -20526,7 +20526,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6502
       ],
@@ -20562,7 +20562,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6504
       ],
@@ -20577,7 +20577,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6506
       ],
@@ -20613,7 +20613,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6508
       ],
@@ -20649,7 +20649,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6510
       ],
@@ -20703,7 +20703,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6513
       ],
@@ -20848,7 +20848,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6524
       ],
@@ -20866,7 +20866,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6525
       ],
@@ -20956,7 +20956,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6530
       ],

Assets/Res/Config/EventNPC.json

@@ -75,13 +75,13 @@
     {
       "ID": 101,
       "name": 3001,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_chouniao",
       "DaoyouID": 0
     },
     {
       "ID": 102,
       "name": 3002,
-      "icon": "bg_lh_quelinger",
+      "icon": "bg_lh_xiaomaque",
       "DaoyouID": 0
     },
     {
@@ -111,19 +111,19 @@
     {
       "ID": 107,
       "name": 3007,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 108,
       "name": 3008,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 109,
       "name": 3009,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
@@ -141,37 +141,37 @@
     {
       "ID": 112,
       "name": 3021,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 113,
       "name": 3034,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 114,
       "name": 3067,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 115,
       "name": 2091,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xmqhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 116,
       "name": 2092,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_chidaorenhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 117,
       "name": 2093,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_emuzhilinghy",
       "DaoyouID": 0
     },
     {
@@ -183,19 +183,19 @@
     {
       "ID": 119,
       "name": 2095,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_kunpeng1",
       "DaoyouID": 0
     },
     {
       "ID": 120,
       "name": 2096,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 121,
       "name": 2097,
-      "icon": "bg_lh_zhiyao",
+      "icon": "bg_lh_yunzhi",
       "DaoyouID": 0
     },
     {
@@ -207,193 +207,205 @@
     {
       "ID": 123,
       "name": 2099,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 124,
       "name": 2100,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 125,
       "name": 2101,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 126,
       "name": 2102,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laozhang",
       "DaoyouID": 0
     },
     {
       "ID": 127,
       "name": 2103,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laoli",
       "DaoyouID": 0
     },
     {
       "ID": 128,
       "name": 2104,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 129,
       "name": 2105,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_lingji",
       "DaoyouID": 0
     },
     {
       "ID": 130,
       "name": 2106,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yuanhun",
       "DaoyouID": 0
     },
     {
       "ID": 131,
       "name": 2107,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xiner",
       "DaoyouID": 0
     },
     {
       "ID": 132,
       "name": 2108,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xinshi",
       "DaoyouID": 0
     },
     {
       "ID": 133,
       "name": 2109,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 134,
       "name": 2110,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_liuqingyan1",
       "DaoyouID": 0
     },
     {
       "ID": 135,
       "name": 2111,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 136,
       "name": 2112,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 137,
       "name": 2113,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_chongxu",
       "DaoyouID": 0
     },
     {
       "ID": 138,
       "name": 2114,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 139,
       "name": 2115,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_mengmianjingying",
       "DaoyouID": 0
     },
     {
       "ID": 140,
       "name": 2116,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_chuyunmiao",
       "DaoyouID": 0
     },
     {
       "ID": 141,
       "name": 2117,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_qinglangsanren",
       "DaoyouID": 0
     },
     {
       "ID": 142,
       "name": 2118,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_linfeng",
       "DaoyouID": 0
     },
     {
       "ID": 143,
       "name": 2119,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_liuqingqing",
       "DaoyouID": 0
     },
     {
       "ID": 144,
       "name": 2120,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xuanshui",
       "DaoyouID": 0
     },
     {
       "ID": 145,
       "name": 2121,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yunxiaolongying",
       "DaoyouID": 0
     },
     {
       "ID": 146,
       "name": 2122,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yuguai",
       "DaoyouID": 0
     },
     {
       "ID": 147,
       "name": 2123,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_shitoujing",
       "DaoyouID": 0
     },
     {
       "ID": 148,
       "name": 2124,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xiaoleitingshou",
       "DaoyouID": 0
     },
     {
       "ID": 149,
       "name": 2125,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_wenzi",
       "DaoyouID": 0
     },
     {
       "ID": 150,
       "name": 2126,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_lingque",
       "DaoyouID": 0
     },
     {
       "ID": 151,
       "name": 2127,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laoquan",
       "DaoyouID": 0
     },
     {
       "ID": 152,
       "name": 2128,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yinghuochong",
       "DaoyouID": 0
     },
     {
       "ID": 153,
       "name": 2129,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_diaoyaxiaoyao",
       "DaoyouID": 0
     },
     {
       "ID": 154,
       "name": 2130,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laowugui",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 155,
+      "name": 2131,
+      "icon": "bg_lh_kunpeng2",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 156,
+      "name": 2132,
+      "icon": "bg_lh_liuqingyan2",
       "DaoyouID": 0
     }
   ]

Assets/Res/Config/LanguageChineseConfig.json

@@ -38386,11 +38386,11 @@
     },
     {
       "ID": 10337,
-      "txt": "0"
+      "txt": "需要达到{0}才能升级"
     },
     {
       "ID": 10338,
-      "txt": "0"
+      "txt": "法宝已经满级"
     },
     {
       "ID": 10339,

Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -1113,7 +1113,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 58.41, y: -21.027552}
-  m_SizeDelta: {x: 49, y: 35.3449}
+  m_SizeDelta: {x: 0, y: 35.3449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1507516687379950841
 CanvasRenderer:

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -37,7 +37,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 320.29395, y: -37.5}
+  m_AnchoredPosition: {x: 320.29395, y: -20}
   m_SizeDelta: {x: 628.4258, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -132,6 +132,95 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: -1624}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1680852692060812093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1038933148604553361}
+  - component: {fileID: 4080066748957196770}
+  - component: {fileID: 1803307630020314717}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1038933148604553361
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1680852692060812093}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 122522014000563328}
+  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: -12.4, y: 19.4}
+  m_SizeDelta: {x: 82.6629, y: 67.9421}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4080066748957196770
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1680852692060812093}
+  m_CullTransparentMesh: 1
+--- !u!114 &1803307630020314717
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1680852692060812093}
+  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: dec_zhuangshiyunwen
+  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: 9cac66ffa5050edb28f072b7aefe4150
+  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 &1839336511828419025
 GameObject:
   m_ObjectHideFlags: 0
@@ -578,6 +667,98 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &2996157684196886011
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 122522014000563328}
+  - component: {fileID: 7771274597643959951}
+  - component: {fileID: 1114050142350163097}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: PLayerNameRoot2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &122522014000563328
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2996157684196886011}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1038933148604553361}
+  - {fileID: 5038673450278911488}
+  - {fileID: 2400922631753279394}
+  m_Father: {fileID: 3275273584098972649}
+  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: 185, y: -495.5}
+  m_SizeDelta: {x: 379.7488, y: 61.396}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7771274597643959951
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2996157684196886011}
+  m_CullTransparentMesh: 1
+--- !u!114 &1114050142350163097
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2996157684196886011}
+  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.45098042, g: 0.67058825, b: 0.62352943, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fenge_jianbian
+  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: 9cac66ffa5050edb28f072b7aefe4150
+  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 &3043169252525830932
 GameObject:
   m_ObjectHideFlags: 0
@@ -1146,6 +1327,102 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5004748515326800122
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2400922631753279394}
+  - component: {fileID: 5821227268569234904}
+  - component: {fileID: 7264135017109924803}
+  - component: {fileID: 484757691607684543}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2400922631753279394
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5004748515326800122}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 122522014000563328}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 28.6007, y: 0}
+  m_SizeDelta: {x: -57.2013, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5821227268569234904
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5004748515326800122}
+  m_CullTransparentMesh: 1
+--- !u!114 &7264135017109924803
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5004748515326800122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 44
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!114 &484757691607684543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5004748515326800122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.46274513, g: 0.5686275, b: 0.49411768, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &5411678273692701274
 GameObject:
   m_ObjectHideFlags: 0
@@ -1165,7 +1442,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4876923545589450363
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1173,7 +1450,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5411678273692701274}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000004371139}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1226,7 +1503,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: jkojk
 --- !u!114 &5449355301414130522
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1395,6 +1672,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Name2
+    gameObject: {fileID: 1853797216306254397}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5501269362975452296
 GameObject:
@@ -2645,6 +2927,95 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: -1624}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8519069136630032906
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5038673450278911488}
+  - component: {fileID: 3427367943651399934}
+  - component: {fileID: 8763951868145556999}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5038673450278911488
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8519069136630032906}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 122522014000563328}
+  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: -135.5, y: 3}
+  m_SizeDelta: {x: 146, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3427367943651399934
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8519069136630032906}
+  m_CullTransparentMesh: 1
+--- !u!114 &8763951868145556999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8519069136630032906}
+  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: dec_zhuangshiyunwen
+  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: 9cac66ffa5050edb28f072b7aefe4150
+  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 &8841265337799555239
 GameObject:
   m_ObjectHideFlags: 0
@@ -2656,6 +3027,7 @@ GameObject:
   - component: {fileID: 3275273584098972649}
   - component: {fileID: 7792863436289110911}
   - component: {fileID: 8702702673051204598}
+  - component: {fileID: 7212875555655410251}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: DialgueType1
@@ -2663,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2680,6 +3052,7 @@ RectTransform:
   - {fileID: 5617782115550842872}
   - {fileID: 3450449309247689875}
   - {fileID: 6037835178821244997}
+  - {fileID: 122522014000563328}
   m_Father: {fileID: 1803833552231621266}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -2727,6 +3100,71 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!114 &7212875555655410251
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8841265337799555239}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 9062071681843881045}
+      UIStateV4Types: 080000000200000010000000
+      UIStateV4Datas:
+      - {x: -185.12561, y: -495.5, z: 0, w: 0}
+      - {x: 1, y: 1, z: 1, w: 0}
+      - {x: -0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 5411678273692701274}
+      UIStateV4Types: 040000000200000010000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      - {x: 1, y: 1, z: 1, w: 0}
+      - {x: -0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 9117437417368447086}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 9062071681843881045}
+      UIStateV4Types: 080000000200000010000000
+      UIStateV4Datas:
+      - {x: 184, y: -495.5, z: 0, w: 0}
+      - {x: 1, y: 1, z: 1, w: 0}
+      - {x: -0, y: 180, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 5411678273692701274}
+      UIStateV4Types: 040000000200000010000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      - {x: 1, y: 1, z: 1, w: 0}
+      - {x: -0, y: 180, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 9117437417368447086}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 9062071681843881045}
+  - {fileID: 5411678273692701274}
+  - {fileID: 9117437417368447086}
+  AllComsStateTypes: 1a0000001600000004000000
+  CurrIndex: 1
 --- !u!1 &9062071681843881045
 GameObject:
   m_ObjectHideFlags: 0
@@ -2753,7 +3191,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9062071681843881045}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000004371139}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2761,11 +3199,12 @@ RectTransform:
   - {fileID: 8219184921327069462}
   - {fileID: 247744923402932}
   - {fileID: 4876923545589450363}
+  - {fileID: 3975152748973005260}
   m_Father: {fileID: 3275273584098972649}
   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: -185.12561, y: -495.5}
+  m_AnchoredPosition: {x: 184, y: -495.5}
   m_SizeDelta: {x: 379.7488, y: 61.396}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2253655063094105127
@@ -2908,6 +3347,102 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &9117437417368447086
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3975152748973005260}
+  - component: {fileID: 7608873429098424788}
+  - component: {fileID: 1853797216306254397}
+  - component: {fileID: 4290477937660040991}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3975152748973005260
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117437417368447086}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6037835178821244997}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 28.6007, y: 0}
+  m_SizeDelta: {x: -57.2013, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7608873429098424788
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117437417368447086}
+  m_CullTransparentMesh: 1
+--- !u!114 &1853797216306254397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117437417368447086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 44
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8BD7\u7ECF"
+--- !u!114 &4290477937660040991
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9117437417368447086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.46274513, g: 0.5686275, b: 0.49411768, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &9185397062077033591
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -3171,8 +3171,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: -29.6, y: 0}
-  m_SizeDelta: {x: 148.1876, y: 63.271}
+  m_AnchoredPosition: {x: -1.5343018, y: 0}
+  m_SizeDelta: {x: 204.319, y: 63.271}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5162277799350772259
 CanvasRenderer:
@@ -3775,8 +3775,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: -187.4, y: 0}
-  m_SizeDelta: {x: 148.1876, y: 63.271}
+  m_AnchoredPosition: {x: -200.5893, y: 0}
+  m_SizeDelta: {x: 152.4114, y: 63.271}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4489076972431299764
 CanvasRenderer:
@@ -3813,7 +3813,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -132,7 +132,7 @@ RectTransform:
   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: 542.1544, y: 49.8192}
+  m_SizeDelta: {x: 542.1544, y: 44}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -515,7 +515,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -526,7 +526,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u8FD9\u662F\u4E00\u4E2A\u63CF\u8FF0\u8FD9\u662F"
+  m_Text: "\u8FD9\u662F\u4E00\u4E2A\u63CF\u8FF0\u8FD9\u662F\u8FD9\u662F\u4E00"
 --- !u!114 &4427224063004206928
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -1,6 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
+using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 
 namespace Fort23.Mono
 {
@@ -57,11 +60,27 @@ namespace Fort23.Mono
             }
 
             widgets.Clear();
+            
+            
+            HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>().ToList()
+                .Where(hpc =>
+                    hpc.jingjie1 == PlayerManager.Instance.myHero.powerUpConfig.jingjie1 &&
+                    hpc.jingjie1 == PlayerManager.Instance.myHero.powerUpConfig.jingjie2).ToArray();
+
+            int allexp = 0;
+            foreach (var heroPowerUpConfig in heroPowerUpConfigs)
+            {
+                allexp += heroPowerUpConfig.levelUpExp;
+            }
+
+            int bl = (PlayerManager.Instance.myHero.exp.Value / allexp) * 100;
+
             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]) +
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) + " " +
+                bl + "%";
+            
+
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
 

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

@@ -168,6 +168,12 @@ namespace Fort23.Mono
 
             if (eventConditionConfig.NPCID == 100)
             {
+                DialgueType1.GetComponent<CustomStateController>().ChangeState(0);
+                // if (eventConditionConfig.DialogueType == 0 || eventConditionConfig.DialogueType == 1)
+                // {
+                //    
+                // }
+
                 Text_Name1.text = PlayerManager.Instance.PlayerName;
                 PLayerNameRoot.SetActive(true);
             }
@@ -177,9 +183,10 @@ namespace Fort23.Mono
             }
             else
             {
+                DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
                 PLayerNameRoot.SetActive(true);
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-                Text_Name1.text = LanguageManager.Instance.Text(eventNpc.name);
+                Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
             }
 
        

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

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

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -35,7 +35,7 @@ namespace Fort23.Mono
             }
 
 
-            Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}";
+            Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -86,7 +86,16 @@ namespace Fort23.Mono
                     if (selectedFaBaoInfo.FabaoPowerupConfig.ID >=
                         ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
                     {
-                        TipMessagePanel.OpenTipMessagePanel("已经满级");
+                        TipMessagePanel.OpenTipMessagePanel(10338);
+                        return;
+                    }
+
+                    if (PlayerManager.Instance.myHero.powerUpConfig.ID < selectedFaBaoInfo.FabaoPowerupConfig.NeedLv)
+                    {
+                       string jingjie = 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]);
+                        TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10337,jingjie) );
                         return;
                     }
 
@@ -97,7 +106,7 @@ namespace Fort23.Mono
                                 selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
                         {
                             ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
-                            TipMessagePanel.OpenTipMessagePanel("道具不足");
+                            // TipMessagePanel.OpenTipMessagePanel("道具不足");
                             return;
                         }
                     }

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

@@ -247,11 +247,24 @@ namespace Fort23.Mono
 
 
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
+
+            HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>().ToList()
+                .Where(hpc =>
+                    hpc.jingjie1 == PlayerManager.Instance.myHero.powerUpConfig.jingjie1 &&
+                    hpc.jingjie1 == PlayerManager.Instance.myHero.powerUpConfig.jingjie2).ToArray();
+
+            int allexp = 0;
+            foreach (var heroPowerUpConfig in heroPowerUpConfigs)
+            {
+                allexp += heroPowerUpConfig.levelUpExp;
+            }
+
+            int bl = (PlayerManager.Instance.myHero.exp.Value / allexp) * 100;
+
             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]) +
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) + " " +
+                bl + "%";
 
             foreach (var energyWidget in widgets)
             {

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

@@ -110,7 +110,7 @@ namespace Fort23.Mono
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
 
-            Animator.Play("showTips");
+            // Animator.Play("showTips");
             TimerComponent.Instance.AddTimer(1450, () => { UIManager.Instance.DormancyGComponent(this); });
         }
     }