瀏覽代碼

修改bug

lzx 15 小時之前
父節點
當前提交
d1a5a4974f

+ 0 - 66
Assets/Res/Config/PlayerGuideConfig.json

@@ -22,9 +22,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.0,
       "Handle": 1,
@@ -61,9 +58,6 @@
       "SpeakerStyle": 3,
       "SpeakerImage": 3,
       "desc": 10132,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -100,9 +94,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10133,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -139,9 +130,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10134,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -178,9 +166,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10135,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -217,9 +202,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10136,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -256,9 +238,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10137,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -295,9 +274,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10138,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -334,9 +310,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10139,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -373,9 +346,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -412,9 +382,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10140,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -451,9 +418,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -490,9 +454,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10141,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -529,9 +490,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10142,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -568,9 +526,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10143,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -607,9 +562,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10144,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -646,9 +598,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10145,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -685,9 +634,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10146,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -724,9 +670,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10147,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -763,9 +706,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10148,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -802,9 +742,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10149,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -841,9 +778,6 @@
       "SpeakerStyle": 4,
       "SpeakerImage": 3,
       "desc": 10150,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.0,
       "Handle": 1,

+ 14 - 0
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -1939,6 +1939,7 @@ GameObject:
   - component: {fileID: 3925115245566125737}
   - component: {fileID: 1904143301479141578}
   - component: {fileID: 1075934160111142449}
+  - component: {fileID: 764988950268057874}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: nextButton
@@ -2061,6 +2062,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &764988950268057874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6329833342161083256}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6411070171000765822
 GameObject:
   m_ObjectHideFlags: 0

+ 240 - 32
Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -174,7 +174,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 167.3161, y: -2.6021}
-  m_SizeDelta: {x: 387, y: 80}
+  m_SizeDelta: {x: 387, y: 78}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &814894868109143079
 CanvasRenderer:
@@ -281,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.7725491, b: 0.52156866, a: 1}
+  m_Color: {r: 0.8980392, g: 0.8745098, b: 0.81960785, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -349,8 +349,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 193.5, y: -40}
-  m_SizeDelta: {x: 337, y: 30}
+  m_AnchoredPosition: {x: 193.5, y: -39}
+  m_SizeDelta: {x: 337, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &814894868293352296
 CanvasRenderer:
@@ -387,8 +387,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.42352945, g: 0.3137255, b: 0.11764707, a: 1}
-  m_RaycastTarget: 1
+  m_Color: {r: 0.43921572, g: 0.42352945, b: 0.36862746, a: 1}
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -396,18 +396,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 3
+    m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1231231231233
+  m_Text: "\u4F60"
 --- !u!114 &6543867474228140514
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -475,11 +475,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8182811813724673281}
   m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 748, y: 750}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_SizeDelta: {x: 586, y: 714}
+  m_Pivot: {x: 0, y: 0}
 --- !u!222 &814894869017551462
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -510,7 +510,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 21300000, guid: 6efb7f25d946f9347939dbedc9c9de2a, type: 3}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -567,8 +567,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 277.6, y: -577}
-  m_SizeDelta: {x: 293.8185, y: 56}
+  m_AnchoredPosition: {x: 190, y: -498.4}
+  m_SizeDelta: {x: 379.7488, y: 61.396}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8287340557764392678
 CanvasRenderer:
@@ -591,7 +591,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.34509805, g: 0.21960786, b: 0.10588236, a: 1}
+  m_Color: {r: 0.4509804, g: 0.67058825, b: 0.62352943, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -599,7 +599,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -608,14 +608,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_fenge_jianbian
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: b39e74e42cc681f983ecfc42f07a793d
   imageH: 56
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1146,7 +1146,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -2.831787, y: 93.941}
+  m_AnchoredPosition: {x: -2.831787, y: 114}
   m_SizeDelta: {x: -49.8521, y: 153.88}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8791954983721479922
@@ -1170,7 +1170,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9686275, g: 0.9294118, b: 0.8705883, a: 1}
+  m_Color: {r: 0.43921572, g: 0.42352945, b: 0.36862746, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1179,18 +1179,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 50
+    m_MaxSize: 40
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0D\u8981\u592A\u5728\u610F\uFF0C\u4ECA\u5929\u7684\u76EE\u6807\u65F6\u591A\u91C7\u96C6\u3002"
+  m_Text: "\u4F60"
 --- !u!114 &1845232215623678945
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1659,6 +1659,184 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4507148789392172355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2815992014292067430}
+  - component: {fileID: 7799779643118040571}
+  - component: {fileID: 3350989837012966946}
+  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 &2815992014292067430
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4507148789392172355}
+  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: 1931274364700685989}
+  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: -199.90002, y: -476.1}
+  m_SizeDelta: {x: 82.6629, y: 67.9421}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7799779643118040571
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4507148789392172355}
+  m_CullTransparentMesh: 1
+--- !u!114 &3350989837012966946
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4507148789392172355}
+  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 &4515232672608341618
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5725629596367284490}
+  - component: {fileID: 5373843540095897668}
+  - component: {fileID: 3911663214339525645}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5725629596367284490
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4515232672608341618}
+  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: 1931274364700685989}
+  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: -323, y: -492.5}
+  m_SizeDelta: {x: 146, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5373843540095897668
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4515232672608341618}
+  m_CullTransparentMesh: 1
+--- !u!114 &3911663214339525645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4515232672608341618}
+  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 &4770417467400332109
 GameObject:
   m_ObjectHideFlags: 0
@@ -1691,6 +1869,8 @@ RectTransform:
   - {fileID: 8182811813724673281}
   - {fileID: 4576193744740830177}
   - {fileID: 39395148305306886}
+  - {fileID: 2815992014292067430}
+  - {fileID: 5725629596367284490}
   - {fileID: 2838846067074877960}
   m_Father: {fileID: 5518757894177767966}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1735,7 +1915,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 208}
+  m_SizeDelta: {x: 0, y: 285.3234}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3858394161036032153
 CanvasRenderer:
@@ -1758,7 +1938,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.09411766, g: 0.0627451, b: 0.04705883, a: 1}
+  m_Color: {r: 0.8980393, g: 0.8745099, b: 0.8196079, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1932,6 +2112,7 @@ GameObject:
   - component: {fileID: 9040054184057829087}
   - component: {fileID: 1125320672945780424}
   - component: {fileID: 182199638483687804}
+  - component: {fileID: 91344913829063957}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Skip
@@ -2055,6 +2236,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &91344913829063957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5825692397346359953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6330229591782499235
 GameObject:
   m_ObjectHideFlags: 0
@@ -2158,6 +2352,7 @@ GameObject:
   - component: {fileID: 6330229591859497049}
   - component: {fileID: 6330229591859497055}
   - component: {fileID: 540167728960414508}
+  - component: {fileID: 1216353677419973199}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
@@ -2281,6 +2476,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _Mask: {fileID: 0}
   target: {fileID: 0}
+--- !u!114 &1216353677419973199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6330229591859497051}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6330229592131453683
 GameObject:
   m_ObjectHideFlags: 0

+ 0 - 10
Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs

@@ -134,16 +134,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///额外演示 0/不填 无 1,par  图文 2,par  动画
-		/// </summary>
-#if !COMBAT_SERVER
-		public string[] ExtraShow;
-#else
-		public string[] ExtraShow{ set; get; }
-#endif
-		
-
 		/// <summary>
 		///高亮动效框 0/不填:无 1:默认动效框
 		/// </summary>

+ 17 - 1
Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -653,6 +653,22 @@ namespace Fort23.Mono
                     break;
             }
         }
+        
+        
+        public void SetfxTransImageVisiable(bool b, int type = 0)
+        {
+            switch (type)
+            {
+                case 0:
+                    fxTrans01.gameObject.GetComponent<MyImage>().enabled = b;
+
+                    break;
+                case 1:
+                    fxTrans02.gameObject.GetComponent<MyImage>().enabled = b;
+
+                    break;
+            }
+        }
 
         public void SetBlackBaseVisiable(bool b)
         {
@@ -715,7 +731,7 @@ namespace Fort23.Mono
 
             if (guideConfig.Highlighting == 0)
             {
-                SetfxTransVisiable(false);
+                SetfxTransImageVisiable(false);
             }
 
 

二進制
Excel2Json/Excel/PlayerGuide.xlsx