开场剧情配图

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.18160027
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventLinkConfig.json

@@ -1345,7 +1345,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 157,
       "LanID": [
         5126
       ],
@@ -1363,7 +1363,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 157,
       "LanID": [
         5127
       ],
@@ -1381,7 +1381,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 157,
       "LanID": [
         5128
       ],
@@ -1399,7 +1399,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 158,
       "LanID": [
         5129
       ],
@@ -1417,7 +1417,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 158,
       "LanID": [
         5130
       ],
@@ -1435,7 +1435,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 159,
       "LanID": [
         5131
       ],
@@ -1453,7 +1453,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 159,
       "LanID": [
         5132
       ],
@@ -1471,7 +1471,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 159,
       "LanID": [
         5133
       ],
@@ -1489,7 +1489,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 159,
       "LanID": [
         5134
       ],
@@ -1507,7 +1507,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 160,
       "LanID": [
         5135
       ],
@@ -1689,7 +1689,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 157,
       "LanID": [
         5148
       ],
@@ -1707,7 +1707,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 161,
       "LanID": [
         5149
       ],

Assets/Res/Config/EventNPC.json

@@ -3,410 +3,513 @@
     {
       "ID": 1,
       "name": 3000,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 0
     },
     {
       "ID": 2,
       "name": 1953,
+      "isNpc": true,
       "icon": "bg_lh_quelinger",
       "DaoyouID": 1
     },
     {
       "ID": 3,
       "name": 1954,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 2
     },
     {
       "ID": 4,
       "name": 1955,
+      "isNpc": true,
       "icon": "bg_lh_fengyao",
       "DaoyouID": 3
     },
     {
       "ID": 5,
       "name": 1956,
+      "isNpc": true,
       "icon": "bg_lh_wanxi",
       "DaoyouID": 4
     },
     {
       "ID": 6,
       "name": 1957,
+      "isNpc": true,
       "icon": "bg_lh_xuyou",
       "DaoyouID": 5
     },
     {
       "ID": 7,
       "name": 1958,
+      "isNpc": true,
       "icon": "bg_lh_fengdaoren",
       "DaoyouID": 6
     },
     {
       "ID": 8,
       "name": 1959,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 7
     },
     {
       "ID": 9,
       "name": 1960,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 8
     },
     {
       "ID": 10,
       "name": 1961,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 9
     },
     {
       "ID": 11,
       "name": 1962,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 10
     },
     {
       "ID": 100,
       "name": 3000,
+      "isNpc": true,
       "icon": "",
       "DaoyouID": 0
     },
     {
       "ID": 101,
       "name": 3001,
+      "isNpc": true,
       "icon": "bg_lh_chouniao",
       "DaoyouID": 0
     },
     {
       "ID": 102,
       "name": 3002,
+      "isNpc": true,
       "icon": "bg_lh_xiaomaque",
       "DaoyouID": 0
     },
     {
       "ID": 103,
       "name": 3003,
+      "isNpc": true,
       "icon": "bg_lh_fengdaoren",
       "DaoyouID": 0
     },
     {
       "ID": 104,
       "name": 3004,
+      "isNpc": true,
       "icon": "bg_lh_chidaoren",
       "DaoyouID": 0
     },
     {
       "ID": 105,
       "name": 3005,
+      "isNpc": true,
       "icon": "bg_lh_yao",
       "DaoyouID": 0
     },
     {
       "ID": 106,
       "name": 3006,
+      "isNpc": true,
       "icon": "bg_lh_xuyou",
       "DaoyouID": 0
     },
     {
       "ID": 107,
       "name": 3007,
+      "isNpc": true,
       "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 108,
       "name": 3008,
+      "isNpc": true,
       "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 109,
       "name": 3009,
+      "isNpc": true,
       "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 110,
       "name": 3010,
+      "isNpc": true,
       "icon": "bg_lh_emuzhiling",
       "DaoyouID": 0
     },
     {
       "ID": 111,
       "name": 2078,
+      "isNpc": true,
       "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 112,
       "name": 3021,
+      "isNpc": true,
       "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 113,
       "name": 3034,
+      "isNpc": true,
       "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 114,
       "name": 3067,
+      "isNpc": true,
       "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 115,
       "name": 2091,
+      "isNpc": true,
       "icon": "bg_lh_xmqhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 116,
       "name": 2092,
+      "isNpc": true,
       "icon": "bg_lh_chidaorenhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 117,
       "name": 2093,
+      "isNpc": true,
       "icon": "bg_lh_emuzhilinghy",
       "DaoyouID": 0
     },
     {
       "ID": 118,
       "name": 2094,
+      "isNpc": true,
       "icon": "bg_lh_gushexianzi",
       "DaoyouID": 0
     },
     {
       "ID": 119,
       "name": 2095,
+      "isNpc": true,
       "icon": "bg_lh_kunpeng1",
       "DaoyouID": 0
     },
     {
       "ID": 120,
       "name": 2096,
+      "isNpc": true,
       "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 121,
       "name": 2097,
+      "isNpc": true,
       "icon": "bg_lh_yunzhi",
       "DaoyouID": 0
     },
     {
       "ID": 122,
       "name": 2098,
+      "isNpc": true,
       "icon": "bg_lh_fengyao",
       "DaoyouID": 0
     },
     {
       "ID": 123,
       "name": 2099,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 124,
       "name": 2100,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 125,
       "name": 2101,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 126,
       "name": 2102,
+      "isNpc": true,
       "icon": "bg_lh_laozhang",
       "DaoyouID": 0
     },
     {
       "ID": 127,
       "name": 2103,
+      "isNpc": true,
       "icon": "bg_lh_laoli",
       "DaoyouID": 0
     },
     {
       "ID": 128,
       "name": 2104,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 129,
       "name": 2105,
+      "isNpc": true,
       "icon": "bg_lh_lingji",
       "DaoyouID": 0
     },
     {
       "ID": 130,
       "name": 2106,
+      "isNpc": true,
       "icon": "bg_lh_yuanhun",
       "DaoyouID": 0
     },
     {
       "ID": 131,
       "name": 2107,
+      "isNpc": true,
       "icon": "bg_lh_xiner",
       "DaoyouID": 0
     },
     {
       "ID": 132,
       "name": 2108,
+      "isNpc": true,
       "icon": "bg_lh_xinshi",
       "DaoyouID": 0
     },
     {
       "ID": 133,
       "name": 2109,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 134,
       "name": 2110,
+      "isNpc": true,
       "icon": "bg_lh_liuqingyan1",
       "DaoyouID": 0
     },
     {
       "ID": 135,
       "name": 2111,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 136,
       "name": 2112,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 137,
       "name": 2113,
+      "isNpc": true,
       "icon": "bg_lh_chongxu",
       "DaoyouID": 0
     },
     {
       "ID": 138,
       "name": 2114,
+      "isNpc": true,
       "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 139,
       "name": 2115,
+      "isNpc": true,
       "icon": "bg_lh_mengmianjingying",
       "DaoyouID": 0
     },
     {
       "ID": 140,
       "name": 2116,
+      "isNpc": true,
       "icon": "bg_lh_chuyunmiao",
       "DaoyouID": 0
     },
     {
       "ID": 141,
       "name": 2117,
+      "isNpc": true,
       "icon": "bg_lh_qinglangsanren",
       "DaoyouID": 0
     },
     {
       "ID": 142,
       "name": 2118,
+      "isNpc": true,
       "icon": "bg_lh_linfeng",
       "DaoyouID": 0
     },
     {
       "ID": 143,
       "name": 2119,
+      "isNpc": true,
       "icon": "bg_lh_liuqingqing",
       "DaoyouID": 0
     },
     {
       "ID": 144,
       "name": 2120,
+      "isNpc": true,
       "icon": "bg_lh_xuanshui",
       "DaoyouID": 0
     },
     {
       "ID": 145,
       "name": 2121,
+      "isNpc": true,
       "icon": "bg_lh_yunxiaolongying",
       "DaoyouID": 0
     },
     {
       "ID": 146,
       "name": 2122,
+      "isNpc": true,
       "icon": "bg_lh_yuguai",
       "DaoyouID": 0
     },
     {
       "ID": 147,
       "name": 2123,
+      "isNpc": true,
       "icon": "bg_lh_shitoujing",
       "DaoyouID": 0
     },
     {
       "ID": 148,
       "name": 2124,
+      "isNpc": true,
       "icon": "bg_lh_xiaoleitingshou",
       "DaoyouID": 0
     },
     {
       "ID": 149,
       "name": 2125,
+      "isNpc": true,
       "icon": "bg_lh_wenzi",
       "DaoyouID": 0
     },
     {
       "ID": 150,
       "name": 2126,
+      "isNpc": true,
       "icon": "bg_lh_lingque",
       "DaoyouID": 0
     },
     {
       "ID": 151,
       "name": 2127,
+      "isNpc": true,
       "icon": "bg_lh_laoquan",
       "DaoyouID": 0
     },
     {
       "ID": 152,
       "name": 2128,
+      "isNpc": true,
       "icon": "bg_lh_yinghuochong",
       "DaoyouID": 0
     },
     {
       "ID": 153,
       "name": 2129,
+      "isNpc": true,
       "icon": "bg_lh_diaoyaxiaoyao",
       "DaoyouID": 0
     },
     {
       "ID": 154,
       "name": 2130,
+      "isNpc": true,
       "icon": "bg_lh_laowugui",
       "DaoyouID": 0
     },
     {
       "ID": 155,
       "name": 2131,
+      "isNpc": true,
       "icon": "bg_lh_kunpeng2",
       "DaoyouID": 0
     },
     {
       "ID": 156,
       "name": 2132,
+      "isNpc": true,
       "icon": "bg_lh_liuqingyan2",
       "DaoyouID": 0
+    },
+    {
+      "ID": 157,
+      "name": -1,
+      "isNpc": false,
+      "icon": "bg_cj_kaichang1",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 158,
+      "name": -1,
+      "isNpc": false,
+      "icon": "bg_cj_kaichang2",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 159,
+      "name": -1,
+      "isNpc": false,
+      "icon": "bg_cj_kaichang3",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 160,
+      "name": -1,
+      "isNpc": false,
+      "icon": "bg_lh_chongxu",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 161,
+      "name": -1,
+      "isNpc": false,
+      "icon": "bg_cj_kaichang4",
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -259,7 +259,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 189}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -2598,7 +2598,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3035,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

Assets/Scripts/GameData/ExcelConfig/EventNPC.cs

@@ -34,6 +34,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///不是npc直接显示背景
+		/// </summary>
+#if !COMBAT_SERVER
+		public bool isNpc;
+#else
+		public bool isNpc{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///半身像icon
 		/// </summary>

Assets/Scripts/GameUI/GameApplction.cs

@@ -195,6 +195,7 @@ public class GameApplction : IGameStart
             if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
                 mainPanel.GObjectPoolInterface.SetActive(false);
+                AppBarPanel.ClosePanel();
             }
         }
 

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

@@ -183,10 +183,19 @@ namespace Fort23.Mono
             }
             else
             {
-                DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
-                PLayerNameRoot.SetActive(true);
-                EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-                Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
+               EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
+               if (eventNpc.isNpc)
+               {
+                   DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
+                   PLayerNameRoot.SetActive(true);
+            
+                   Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
+               }
+               else
+               {
+                   PLayerNameRoot.SetActive(false);
+               }
+           
             }
 
 
@@ -225,17 +234,22 @@ namespace Fort23.Mono
             if (isOver)
                 return;
             icon.gameObject.SetActive(false);
+            icon.onSpriteAlter = () =>
+            {
+                icon.SetNativeSize();
+                icon.gameObject.SetActive(true);
+            };
             if (eventConditionConfig.NPCID != 100 && eventConditionConfig.NPCID != 0)
             {
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
 
-                icon.onSpriteAlter = () =>
-                {
-                    icon.SetNativeSize();
-                    icon.gameObject.SetActive(true);
-                };
+           
                 icon.icon_name = eventNpc.icon;
             }
+            else
+            {
+                icon.icon_name = "bg_lh_di1";
+            }
 
             Btn_Bag.gameObject.SetActive(false);
             if (index >= dialogueMessaga.Length)