噩梦任务修改

Assets/Content/Config/LanguagePackage_cn.csv

@@ -10022,12 +10022,14 @@ DifNtfTxt,您进入了邪恶之地，部分能力已被封印！
 ic_buff_100011_Desc,进入了邪恶之地封印部分能力\n攻擊减少{0}%\n暴擊减少{1}%\n防禦减少{2}%
 ic_buff_100011_Name,Name
 ic_buff_100011_Icon,buff/ic_buff_018
-DiffTaskConditionTxt,通關困難模式{0}  {1}/1
-Diff_S_TaskConditionTxt,通關噩夢模式{0}  {1}/1
+DiffTaskConditionTxt,通關困難模式<color=blue>{0}</color>  {1}/1
+Diff_S_TaskConditionTxt,通關噩夢模式<color=blue>{0}</color>  {1}/1
 DiffTaskTitleTxt,任務
 DiffGroupTaskConditionTxt,任務完成：{0}/{1}
 Notice_TeQuanKa,畢業特權卡以開放，購買特權後禮金使用額度將無上限。
 MapModeTxt_0,普通模式
 MapModeTxt_1,困難模式
 MapModeTxt_2,噩夢模式
-SelectMapModeTxt,模式切換
+SelectMapModeTxt,模式切換
+TaskUI_1,困難任務
+TaskUI_2,噩夢任務

Assets/Content/Prefabs/UI/UITask/UIDiffTask.prefab

@@ -299,6 +299,164 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &1364867037315530241
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2785434909319541859}
+  - component: {fileID: 6902272344761697582}
+  - component: {fileID: 3236940786658508844}
+  - component: {fileID: 4825746332802329788}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2785434909319541859
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1364867037315530241}
+  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: 3151090880979479083}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -126}
+  m_SizeDelta: {x: 1000, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6902272344761697582
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1364867037315530241}
+  m_CullTransparentMesh: 1
+--- !u!114 &3236940786658508844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1364867037315530241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u56F0\u96BE\u4EFB\u52A1"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
+  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 1
+  m_colorMode: 2
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    topRight: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    bottomLeft: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+    bottomRight: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 72
+  m_fontSizeBase: 72
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 4
+  m_fontSizeMax: 32
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &4825746332802329788
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1364867037315530241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - TMPro.TextMeshProUGUI
+  - UINode
+  values: 00000100
+  depObjs: []
+  activeType: 0
 --- !u!1 &1537929120024240259
 GameObject:
   m_ObjectHideFlags: 0
@@ -375,6 +533,164 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2070582152377595469
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9034928751210610329}
+  - component: {fileID: 9215840841472190277}
+  - component: {fileID: 534210360085391615}
+  - component: {fileID: 2990552326467797759}
+  m_Layer: 5
+  m_Name: LBtntxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9034928751210610329
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070582152377595469}
+  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: 1990761888132255720}
+  m_RootOrder: 1
+  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: 190, y: 0}
+  m_SizeDelta: {x: 180, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9215840841472190277
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070582152377595469}
+  m_CullTransparentMesh: 1
+--- !u!114 &534210360085391615
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070582152377595469}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u56F0\u96BE\u4EFB\u52A1"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
+  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 1
+  m_colorMode: 2
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    topRight: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    bottomLeft: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+    bottomRight: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 42
+  m_fontSizeBase: 42
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 4
+  m_fontSizeMax: 32
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &2990552326467797759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070582152377595469}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - TMPro.TextMeshProUGUI
+  - UINode
+  values: 00000100
+  depObjs: []
+  activeType: 0
 --- !u!1 &2490765453155890821
 GameObject:
   m_ObjectHideFlags: 0
@@ -856,7 +1172,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3157367528919840068
 RectTransform:
   m_ObjectHideFlags: 0
@@ -870,13 +1186,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 16490288260480085}
+  - {fileID: 1814819428951670642}
   m_Father: {fileID: 3151090880979479083}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -75, y: 110}
-  m_SizeDelta: {x: 150, y: 150}
+  m_AnchoredPosition: {x: -140, y: -808}
+  m_SizeDelta: {x: 280, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7581662911102343116
 MonoBehaviour:
@@ -1222,6 +1539,7 @@ RectTransform:
   - {fileID: 4018236366412242542}
   - {fileID: 3128102697512386174}
   - {fileID: 8923951826798285289}
+  - {fileID: 2785434909319541859}
   m_Father: {fileID: 459890423312920801}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2074,6 +2392,164 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6593255861662281065
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1814819428951670642}
+  - component: {fileID: 7414334233302464291}
+  - component: {fileID: 3138222741290828120}
+  - component: {fileID: 4003738280764760837}
+  m_Layer: 5
+  m_Name: RBtntxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1814819428951670642
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593255861662281065}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3157367528919840068}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -190, y: 0.011973}
+  m_SizeDelta: {x: 180, y: 149.98}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7414334233302464291
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593255861662281065}
+  m_CullTransparentMesh: 1
+--- !u!114 &3138222741290828120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593255861662281065}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u56F0\u96BE\u4EFB\u52A1"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
+  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 1
+  m_colorMode: 2
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    topRight: {r: 1, g: 0.95294124, b: 0.6784314, a: 1}
+    bottomLeft: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+    bottomRight: {r: 1, g: 0.7490196, b: 0.3019608, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 42
+  m_fontSizeBase: 42
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 4
+  m_fontSizeMax: 32
+  m_fontStyle: 0
+  m_HorizontalAlignment: 4
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &4003738280764760837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593255861662281065}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - TMPro.TextMeshProUGUI
+  - UINode
+  values: 00000100
+  depObjs: []
+  activeType: 0
 --- !u!1 &6618605392803127881
 GameObject:
   m_ObjectHideFlags: 0
@@ -2738,7 +3214,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1990761888132255720
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2752,13 +3228,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3533236735056731720}
+  - {fileID: 9034928751210610329}
   m_Father: {fileID: 3151090880979479083}
   m_RootOrder: 4
   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: 75, y: 110}
-  m_SizeDelta: {x: 150, y: 150}
+  m_AnchoredPosition: {x: 140, y: -808}
+  m_SizeDelta: {x: 280, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7727681976613145202
 MonoBehaviour:
@@ -3315,9 +3792,9 @@ RectTransform:
   m_Father: {fileID: 3157367528919840068}
   m_RootOrder: 0
   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_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -40, y: 0}
   m_SizeDelta: {x: 64, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1941734823684889263
@@ -3576,9 +4053,9 @@ RectTransform:
   m_Father: {fileID: 1990761888132255720}
   m_RootOrder: 0
   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_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 40, y: 0}
   m_SizeDelta: {x: 64, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2070774240918612765

Assets/Lua/UI/UITask/UIDiffTaskView.lua

@@ -14,6 +14,8 @@ function UIDiffTaskView:AddEventListener()
 	self.uiBase:AddButtonEventListener(self.BtnClose.button,self,self.OnCloseClick)
 	self.uiBase:AddButtonEventListener(self.getBtn.button,self,self.OnClickGetGroupReward)
 	self.uiBase:AddButtonEventListener(self.btnGoto.button,self,self.OnClickJump)
+	self.uiBase:AddButtonEventListener(self.btnArrowL.button,self,self.OnClickLeft)
+	self.uiBase:AddButtonEventListener(self.btnArrowR.button,self,self.OnClickRight)
 end
 
 function UIDiffTaskView:FillContent(data, uiBase)
@@ -29,6 +31,10 @@ function UIDiffTaskView:FillContent(data, uiBase)
 end
 
 function UIDiffTaskView:Init()
+	
+	self.lBtntxt.text.text = I18N.T("TaskUI_1")
+	self.rBtntxt.text.text = I18N.T("TaskUI_2")
+	self:ShowChangeModeBtn()
 	self:SetItems()
 	--self:SetGroupReward({{100,100},{110,50},{47,1000000},{529,5}})
 end
@@ -70,7 +76,7 @@ end
 
 function UIDiffTaskView:SetItems()
 	local curgroup = self.controller:GetShowTaskData()
-
+	self.title.text.text = self:GetTitleText()
 	--LogError("--------curgroup---"..Inspect(curgroup))
 	self.CurGroup = curgroup
 	local datalist = {}--{1,2,3,}
@@ -85,6 +91,7 @@ function UIDiffTaskView:SetItems()
 	
 		--self.getBtn.button.interactable = curgroup.groupTask._got == 1
 	else
+		self.goodsItems.loopHorizontalScrollRect:ClearCells()
 		self.getBtn:SetActive(false)
 		self.sealBtn:SetActive(false)
 		self.btnGoto:SetActive(false)
@@ -155,8 +162,9 @@ end
 
 function UIDiffTaskView:OnClickJump()
 	self:OnCloseClick()
-	if(ManagerContainer.LuaBattleMgr:GetBattleMode() ~= 1) then
-		ManagerContainer.LuaBattleMgr:SendChangeMapLevelTypeReq(1)
+	local curType = self.controller.TaskType
+	if(ManagerContainer.LuaBattleMgr:GetBattleMode() ~= curType) then
+		ManagerContainer.LuaBattleMgr:SendChangeMapLevelTypeReq(curType)
 	end	
 end
 
@@ -192,6 +200,12 @@ function  UIDiffTaskView:GetCurTaskTextKey()
 
 end
 
+
+function UIDiffTaskView:GetTitleText()
+	local txt = I18N.T("TaskUI_"..self.controller.TaskType)
+	return txt
+end
+
 function UIDiffTaskView:GetConditionTxt(task)
 	
 	local condition = task._cfgData.MissionCondition[1]
@@ -207,5 +221,24 @@ function UIDiffTaskView:GetConditionTxt(task)
 	return txt
 end
 
+
+function  UIDiffTaskView:OnClickRight()
+	
+	self.controller:SetTypeData(2)
+	self:SetItems()
+	self:ShowChangeModeBtn()
+end
+
+function UIDiffTaskView:OnClickLeft()	
+	self.controller:SetTypeData(1)
+	self:SetItems()
+	self:ShowChangeModeBtn()
+end
+
+function UIDiffTaskView:ShowChangeModeBtn()
+	local isShowLeft = self.controller.TaskType == 2
+	self.btnArrowR:SetActive(not isShowLeft)
+	self.btnArrowL:SetActive(isShowLeft)
+end
 return UIDiffTaskView
 

Assets/Lua/UI/UITask/UIDiffTaskView_Generate.lua

@@ -1,3 +1,7 @@
+---@class UIDiffTask__Generate_title
+---@field public gameObject UnityEngine.GameObject
+---@field public text TMPro.TextMeshProUGUI
+
 ---@class UIDiffTask__Generate_taskTxt
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
@@ -22,10 +26,18 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public loopHorizontalScrollRect UnityEngine.UI.LoopHorizontalScrollRect
 
+---@class UIDiffTask__Generate_rBtntxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text TMPro.TextMeshProUGUI
+
 ---@class UIDiffTask__Generate_btnArrowR
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
 
+---@class UIDiffTask__Generate_lBtntxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text TMPro.TextMeshProUGUI
+
 ---@class UIDiffTask__Generate_btnArrowL
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -58,13 +70,16 @@
 ---@field private sealBtn UnityEngine.GameObject
 ---@field private btnGoto UIDiffTask__Generate_btnGoto
 ---@field private btnArrowL UIDiffTask__Generate_btnArrowL
+---@field private lBtntxt UIDiffTask__Generate_lBtntxt
 ---@field private btnArrowR UIDiffTask__Generate_btnArrowR
+---@field private rBtntxt UIDiffTask__Generate_rBtntxt
 ---@field private scrollView UIDiffTask__Generate_scrollView
 ---@field private content UIDiffTask__Generate_content
 ---@field private BtnClose UIDiffTask__Generate_BtnClose
 ---@field private goodsItems UIDiffTask__Generate_goodsItems
 ---@field private goodsItemsContent UIDiffTask__Generate_goodsItemsContent
 ---@field private taskTxt UIDiffTask__Generate_taskTxt
+---@field private title UIDiffTask__Generate_title
 local UIDiffTaskView = class("UIDiffTaskView", require("UIViewBase"))
 
 function UIDiffTaskView:ctor()
@@ -100,6 +115,9 @@ function UIDiffTaskView:InitGenerate(Root, data)
 	self:InitGenerate__14(Root,data)
 	self:InitGenerate__15(Root,data)
 	self:InitGenerate__16(Root,data)
+	self:InitGenerate__17(Root,data)
+	self:InitGenerate__18(Root,data)
+	self:InitGenerate__19(Root,data)
 
 
 end
@@ -224,6 +242,20 @@ end
 
 ---@private
 function UIDiffTaskView:InitGenerate__10(Root, data)
+--[[
+	UIAnimator/Window/BtnArrowL/LBtntxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/BtnArrowL/LBtntxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.lBtntxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+end
+
+---@private
+function UIDiffTaskView:InitGenerate__11(Root, data)
 --[[
 	UIAnimator/Window/BtnArrowR
 --]]
@@ -237,7 +269,21 @@ function UIDiffTaskView:InitGenerate__10(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__11(Root, data)
+function UIDiffTaskView:InitGenerate__12(Root, data)
+--[[
+	UIAnimator/Window/BtnArrowR/RBtntxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/BtnArrowR/RBtntxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.rBtntxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+end
+
+---@private
+function UIDiffTaskView:InitGenerate__13(Root, data)
 --[[
 	UIAnimator/Window/TaskItems/ScrollView
 --]]
@@ -251,7 +297,7 @@ function UIDiffTaskView:InitGenerate__11(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__12(Root, data)
+function UIDiffTaskView:InitGenerate__14(Root, data)
 --[[
 	UIAnimator/Window/TaskItems/ScrollView/Viewport/Content
 --]]
@@ -265,7 +311,7 @@ function UIDiffTaskView:InitGenerate__12(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__13(Root, data)
+function UIDiffTaskView:InitGenerate__15(Root, data)
 --[[
 	UIAnimator/Window/BtnCloseFlat
 --]]
@@ -279,7 +325,7 @@ function UIDiffTaskView:InitGenerate__13(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__14(Root, data)
+function UIDiffTaskView:InitGenerate__16(Root, data)
 --[[
 	UIAnimator/Window/GoodsItems
 --]]
@@ -293,7 +339,7 @@ function UIDiffTaskView:InitGenerate__14(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__15(Root, data)
+function UIDiffTaskView:InitGenerate__17(Root, data)
 --[[
 	UIAnimator/Window/GoodsItems/Viewport/GoodsItemsContent
 --]]
@@ -307,7 +353,7 @@ function UIDiffTaskView:InitGenerate__15(Root, data)
 end
 
 ---@private
-function UIDiffTaskView:InitGenerate__16(Root, data)
+function UIDiffTaskView:InitGenerate__18(Root, data)
 --[[
 	UIAnimator/Window/TaskTxt
 --]]
@@ -320,6 +366,20 @@ function UIDiffTaskView:InitGenerate__16(Root, data)
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
+---@private
+function UIDiffTaskView:InitGenerate__19(Root, data)
+--[[
+	UIAnimator/Window/Title
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Title").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.title = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+end
+
 ---@private
 function UIDiffTaskView:GenerateDestroy()
 	if tolua.getpeer(self.btnGoto.text) ~= nil then
@@ -356,10 +416,18 @@ function UIDiffTaskView:GenerateDestroy()
 		tolua.setpeer(self.btnArrowL, nil)
 	end
 	self.btnArrowL = nil
+	if tolua.getpeer(self.lBtntxt) ~= nil then
+		tolua.setpeer(self.lBtntxt, nil)
+	end
+	self.lBtntxt = nil
 	if tolua.getpeer(self.btnArrowR) ~= nil then
 		tolua.setpeer(self.btnArrowR, nil)
 	end
 	self.btnArrowR = nil
+	if tolua.getpeer(self.rBtntxt) ~= nil then
+		tolua.setpeer(self.rBtntxt, nil)
+	end
+	self.rBtntxt = nil
 	if tolua.getpeer(self.scrollView) ~= nil then
 		tolua.setpeer(self.scrollView, nil)
 	end
@@ -384,6 +452,10 @@ function UIDiffTaskView:GenerateDestroy()
 		tolua.setpeer(self.taskTxt, nil)
 	end
 	self.taskTxt = nil
+	if tolua.getpeer(self.title) ~= nil then
+		tolua.setpeer(self.title, nil)
+	end
+	self.title = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false