功能更改

Assets/Content/Prefabs/UI/UIVoyage/UIVoyageRobbery.prefab

@@ -2233,6 +2233,173 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3334918218901800117
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2532217536704572650}
+  - component: {fileID: 2269729730611803932}
+  - component: {fileID: 1988318433767915440}
+  - component: {fileID: 6601412128134699938}
+  - component: {fileID: 8446276620568537023}
+  - component: {fileID: 3991998711694774632}
+  m_Layer: 5
+  m_Name: BtnAdd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2532217536704572650
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  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: 9107271259175808878}
+  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: -180, y: 0}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2269729730611803932
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_CullTransparentMesh: 0
+--- !u!114 &1988318433767915440
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: cec7371851a1c4a42ba0f960b1394b06, type: 3}
+  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
+--- !u!114 &6601412128134699938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1988318433767915440}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!95 &8446276620568537023
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 651b2a90a9fc1e744882599674fe5181, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &3991998711694774632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3334918218901800117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.Button
+  - UnityEngine.Animator
+  - UINode
+  values: 000000010000
+  depObjs: []
+  activeType: 0
 --- !u!1 &3572693489592908964
 GameObject:
   m_ObjectHideFlags: 0
@@ -4232,6 +4399,7 @@ RectTransform:
   - {fileID: 2834949626211989799}
   - {fileID: 4127076554929066558}
   - {fileID: 2411046397131090061}
+  - {fileID: 2532217536704572650}
   m_Father: {fileID: 2112945718131300219}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Content/Prefabs/UI/UIVoyage/VoyageRankItem.prefab

@@ -461,6 +461,255 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_key: DscShipScore
+--- !u!1 &4132567781270581212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5047814827893416825}
+  - component: {fileID: 1946478339754126991}
+  - component: {fileID: 1850762919262425590}
+  - component: {fileID: 4550218019529810771}
+  - component: {fileID: 2319406472159236020}
+  m_Layer: 0
+  m_Name: RewordNode
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5047814827893416825
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  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:
+  - {fileID: 227612782194376160}
+  m_Father: {fileID: 4389347264851794669}
+  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: -150, y: -40}
+  m_SizeDelta: {x: 260, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1946478339754126991
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_CullTransparentMesh: 1
+--- !u!114 &1850762919262425590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &4550218019529810771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b8a986ea914e134996e17fd0c96dde3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  totalCount: 0
+  reverseDirection: 0
+  rubberScale: 1
+  threshold: 100
+  lowGrid: 0
+  m_Cell: {fileID: 70813078944487029, guid: 72497a2a74d401f468ffb167fe95054d, type: 3}
+  m_Content: {fileID: 8382862851887915090}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 227612782194376160}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2319406472159236020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4132567781270581212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.LoopHorizontalScrollRect
+  - UINode
+  values: 0000000100
+  depObjs: []
+  activeType: 0
+--- !u!1 &6738552363692779572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 227612782194376160}
+  - component: {fileID: 7628327736910483951}
+  - component: {fileID: 4216871993346235313}
+  - component: {fileID: 7598088572733092324}
+  - component: {fileID: 9013227157714934232}
+  m_Layer: 0
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &227612782194376160
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.55, y: 0.55, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8382862851887915090}
+  m_Father: {fileID: 5047814827893416825}
+  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: 15}
+  m_SizeDelta: {x: 428, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7628327736910483951
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_CullTransparentMesh: 1
+--- !u!114 &4216871993346235313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 10917, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &7598088572733092324
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &9013227157714934232
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6738552363692779572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 428
+  m_PreferredHeight: 129
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &6757395737562323709
 GameObject:
   m_ObjectHideFlags: 0
@@ -577,6 +826,106 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 12c233871d685934bbb4e45fb7619c9e, type: 3}
   - {fileID: 21300000, guid: 08ec1b31fafd73743b5fca6c3e6971a5, type: 3}
   - {fileID: 21300000, guid: 6f60d745b0835ea4dbf40b0c594d0440, type: 3}
+--- !u!1 &6970701208680136947
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8382862851887915090}
+  - component: {fileID: 8114645539336504935}
+  - component: {fileID: 2961229266382133589}
+  - component: {fileID: 121567052452394427}
+  m_Layer: 0
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8382862851887915090
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  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: 227612782194376160}
+  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_SizeDelta: {x: 0, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8114645539336504935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UINode
+  - UnityEngine.UI.ContentSizeFitter
+  - UnityEngine.UI.HorizontalLayoutGroup
+  values: 00000001
+  depObjs: []
+  activeType: 0
+--- !u!114 &2961229266382133589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &121567052452394427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6970701208680136947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 15
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &7101257515868871008
 GameObject:
   m_ObjectHideFlags: 0
@@ -615,6 +964,7 @@ RectTransform:
   - {fileID: 2863844733627312013}
   - {fileID: 6729797696364947679}
   - {fileID: 2483072297388255532}
+  - {fileID: 5047814827893416825}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Lua/Core/PlatformPack.lua

@@ -1,6 +1,6 @@
 local PlatformPack = {
 	URL_KEY = 'http://165.154.29.92:81//',
-	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist2',
+	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist',
 	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/NoticeNew/',
 	SPECIAL_INFO_URL = 'http://165.154.29.92:81//channel',
 	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.29.92:81//vipService',

Assets/Lua/Enum/UIEventNames.lua

@@ -565,8 +565,13 @@ local UIEventNames = {
     VOYAGE_CHECK_AIRSHIP_CHANGED = id(),
     VOYAGE_LOG_CHANGED = id(),
     VOYAGE_LOCATION_CHANGED = id(),
+    VOYAGE_CHALLENGE_COUNT_CHANGED = id(),
+
 
     DOJO_CHALLENGE_RESULT_CHANGED = id(),
+
+
+
     --神器事件
     SKILL_EQUIP_LV_UP_REFRESH = id(),
     SKILL_EQUIP_SLOT_REFRESH = id(),

Assets/Lua/Logic/Voyage/VoyageDataMgr.lua

@@ -38,6 +38,7 @@ function VoyageDataMgr:ctor()
     self.buyNumCost = 0
     self.buyType = 2
     self.numLimit = 0
+    self.challengeCountLimit  = 0
     -- if self.selfAirShipCompleteTimer then
     --     self.selfAirShipCompleteTimer:Stop()
     --     self.selfAirShipCompleteTimer = nil
@@ -106,6 +107,8 @@ function VoyageDataMgr:RegisterNetEvents()
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_CHALLENGE_RESULT_ACK, self.OnVoyageChallengeResultAck, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_RANK_LIST_ACK, self.OnVoyageRankDatasAck, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_LOG_ACK, self.OnVoyageLogAck, self)
+
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK ,self.OnBuyNumAck,self)
 end
 
 function VoyageDataMgr:UnRegisterNetEvents()
@@ -120,6 +123,8 @@ function VoyageDataMgr:UnRegisterNetEvents()
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_CHALLENGE_RESULT_ACK)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_RANK_LIST_ACK)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_LOG_ACK)
+
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK )
 end
 
 function VoyageDataMgr:IsCanSend(key, cdTime)
@@ -168,6 +173,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     self.buyType = data.buy_type
     self:RefreshSelfAirShip(data.trial_data)
     self:RefNumimit()
+    self:RefChallengeCount()
     if changed1 then
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_CHALLENGE_NUM_CHANGED)
     end
@@ -811,11 +817,73 @@ end
 
 
 function VoyageDataMgr:RefNumimit()
-	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323) + self.buyNum
+	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323)
 end
 
 
+function VoyageDataMgr:RefChallengeCount()
+    self.challengeCountLimit = GlobalConfig.Instance:GetConfigIntValue(325) + self.buyNum
+end
+
+
+function VoyageDataMgr:GetChallengeCountLimit()
+    return self.challengeCountLimit 
+end
+
 function  VoyageDataMgr:GetNumLimit()
     return self.numLimit
 end
+
+
+
+function VoyageDataMgr:GetRewardByRank(rank)
+    if rank == nil or rank == 0 then
+        return nil
+    end
+
+    local rankRewardCfg = ManagerContainer.CfgMgr:GetYuanHangTrialRankCfg()
+
+    for _, rankRewardItem in pairs(rankRewardCfg) do
+        local rankLimit = rankRewardItem.YuanHangTrialRankCondition[1]
+        --LogError(rank.."--------------------rankLimit-----"..Inspect(rankLimit))
+        if rank == rankLimit[1]  then
+            return rankRewardItem.YuanHangTrialRankReward
+        elseif rank >= rankLimit[1]  and  rank <= rankLimit[2] then
+            return rankRewardItem.YuanHangTrialRankReward         
+        end
+    end
+    return nil
+end
+
+
+function VoyageDataMgr:OnBuyNumAck(data)
+	LogError(" SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK  = " .. Inspect(data))
+	if ManagerContainer.NetManager:IsErrorData(data) then return end
+    ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_CHALLENGE_COUNT_CHANGED)
+end
+
+
+
+function VoyageDataMgr:SendChallengeCountBuyReq()
+	
+	local buyNum = self:GetBuyNum()
+	
+	local buyNumLimit = self:GetBuyNumLimit()
+
+	if (buyNumLimit - buyNum) <= 0 then
+		LogError("购买次数达到上限")
+		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("312")
+		return
+	end
+	local buyType = self:GetBuyType()
+	local cost = self:GetBuyCost()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {cost, nil, self.SureBuyChallengeNumBtn, self,nil,buyType})
+	
+end
+
+
+function VoyageDataMgr:SureBuyChallengeNumBtn()
+	ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
+end
+
 return VoyageDataMgr

Assets/Lua/Managers/CfgMgr.lua

@@ -138,6 +138,7 @@ function CfgMgr:ctor()
     self.LevelDebuffCfg = InternalRequire("LevelDebuffCfg")
     self.LevelEnemyAttributeAdditionCfg = InternalRequire("LevelEnemyAttributeAddition")--LevelEnemyAttributeAddition
     self.HardMissionCfg = InternalRequire("HardMissionCfg")
+    self.YuanHangTrialRankCfg = InternalRequire("YuanHangTrialRankCfg")
 
     self.ActivitiesTiredChargeCfg_new = self:ActivitiesTiredChargeCfg_CreatNewCfg()
 end
@@ -2166,4 +2167,9 @@ end
 function CfgMgr:GetHardMissionCfg()
     return self.HardMissionCfg
 end
+
+
+function CfgMgr:GetYuanHangTrialRankCfg()
+    return self.YuanHangTrialRankCfg
+end
 return CfgMgr

Assets/Lua/Managers/LuaBattleMgr.lua

@@ -1255,7 +1255,16 @@ function LuaBattleMgr:OnLoadingClose()
         ManagerContainer.LuaTimerMgr:AddTimer(500, 1,self,function ()
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("DifNtfTxt")
         end,nil);
+    else
+      local cfg = ManagerContainer.CfgMgr:GetPrivilegeCardCfgByLv(2)
+      local curmaplvID = self:GetCurLevelUniqueId()
+       if cfg and cfg.UnlockCond and cfg.UnlockCond[2] == curmaplvID then
+        
+       end 
+
     end
+
+    --if 
 end
 
 function LuaBattleMgr:IsShowDifficultyTxt()

Assets/Lua/UI/GridViewItem/VoyageRankItem_Generate.lua

@@ -1,3 +1,11 @@
+---@class VoyageRankItem__Generate_content
+---@field public gameObject UnityEngine.GameObject
+---@field public horizontalLayoutGroup UnityEngine.UI.HorizontalLayoutGroup
+
+---@class VoyageRankItem__Generate_rewordNode
+---@field public gameObject UnityEngine.GameObject
+---@field public loopHorizontalScrollRect UnityEngine.UI.LoopHorizontalScrollRect
+
 ---@class VoyageRankItem__Generate_scoreTxt
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
@@ -31,6 +39,8 @@
 ---@field private vipIcon VoyageRankItem__Generate_vipIcon
 ---@field private nameTxt VoyageRankItem__Generate_nameTxt
 ---@field private scoreTxt VoyageRankItem__Generate_scoreTxt
+---@field private rewordNode VoyageRankItem__Generate_rewordNode
+---@field private content VoyageRankItem__Generate_content
 local VoyageRankItemView = class("VoyageRankItemView")
 
 function VoyageRankItemView:ctor()
@@ -54,6 +64,8 @@ function VoyageRankItemView:InitGenerate(Root, data)
 	self:InitGenerate__5(Root,data)
 	self:InitGenerate__6(Root,data)
 	self:InitGenerate__7(Root,data)
+	self:InitGenerate__8(Root,data)
+	self:InitGenerate__9(Root,data)
 
 
 end
@@ -150,6 +162,34 @@ function VoyageRankItemView:InitGenerate__7(Root, data)
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
+---@private
+function VoyageRankItemView:InitGenerate__8(Root, data)
+--[[
+	RewordNode
+--]]
+	local tmp = Root:Find("RewordNode").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.rewordNode = tmp
+
+	tmp.loopHorizontalScrollRect = tmp:GetComponent(Enum.TypeInfo.LoopHorizontalScrollRect)
+end
+
+---@private
+function VoyageRankItemView:InitGenerate__9(Root, data)
+--[[
+	RewordNode/Viewport/Content
+--]]
+	local tmp = Root:Find("RewordNode/Viewport/Content").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.content = tmp
+
+	tmp.horizontalLayoutGroup = tmp:GetComponent(Enum.TypeInfo.HorizontalLayoutGroup)
+end
+
 ---@private
 function VoyageRankItemView:GenerateDestroy()
 	if tolua.getpeer(self.rankTxt) ~= nil then
@@ -179,6 +219,14 @@ function VoyageRankItemView:GenerateDestroy()
 		tolua.setpeer(self.scoreTxt, nil)
 	end
 	self.scoreTxt = nil
+	if tolua.getpeer(self.rewordNode) ~= nil then
+		tolua.setpeer(self.rewordNode, nil)
+	end
+	self.rewordNode = nil
+	if tolua.getpeer(self.content) ~= nil then
+		tolua.setpeer(self.content, nil)
+	end
+	self.content = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UITask/UIDiffTaskView.lua

@@ -71,7 +71,7 @@ end
 function UIDiffTaskView:SetItems()
 	local curgroup = self.controller:GetShowTaskData()
 
-	LogError("--------curgroup---"..Inspect(curgroup))
+	--LogError("--------curgroup---"..Inspect(curgroup))
 	self.CurGroup = curgroup
 	local datalist = {}--{1,2,3,}
 	if curgroup ~= nil and curgroup.groupTask ~= nil then

Assets/Lua/UI/UIVoyage/UIVoyageRankView.lua

@@ -87,104 +87,130 @@ function UIVoyageRankView:OnClickCancelBtn()
 	self:UIClose()
 end
 
-
 function UIVoyageRankView:GetItemByIndex(loopListView, idx, dataIdx)
-	local itemData = self.controller:GetRankDataById(dataIdx + 1)
-	if not itemData then return nil end
-	local item = loopListView:NewListViewItem('VoyageRankItem')
-	local itemLua = CommonUtil.BindGridViewItem2Lua(self, 'VoyageRankItem', item.gameObject)
-	if itemLua then
-		local playerBrief = itemData.playerBrief
-		local data = {IsHero = true}
-		local headFrameId = nil
-		local vipLv = nil
-		local name = nil
-		if playerBrief then
-			local uid = playerBrief.uid
-			vipLv = playerBrief.vipLv
-			headFrameId = playerBrief.headFrame
-			if int64.equals(uid, ManagerContainer.DataMgr.UserData:GetUserId()) then
-				headFrameId = ManagerContainer.DataMgr.UserData:GetHeadFrameId()
-				vipLv = ManagerContainer.DataMgr.UserData:GetVipLv()
-			end
-			local jobCfg = ManagerContainer.CfgMgr:GetJobDataById(playerBrief.configId)
-			local jobIcon = ''
-			if jobCfg then
-				jobIcon = jobCfg.JobIcon
-			end
-			data.Level = playerBrief.level
-			data.ProfessionIcon = jobIcon
-			data.HeadIcon = playerBrief.headPortraitName
-			name = playerBrief.nickName
-		end
-		self:RefreshVoyageRankItem(itemLua, name, vipLv, data, headFrameId, itemData.score, itemData.rank)
-	end
-	return item
+    local itemData = self.controller:GetRankDataById(dataIdx + 1)
+    if not itemData then
+        return nil
+    end
+    local item = loopListView:NewListViewItem('VoyageRankItem')
+    local itemLua = CommonUtil.BindGridViewItem2Lua(self, 'VoyageRankItem', item.gameObject)
+    if itemLua then
+        local playerBrief = itemData.playerBrief
+        local data = {
+            IsHero = true
+        }
+        local headFrameId = nil
+        local vipLv = nil
+        local name = nil
+        if playerBrief then
+            local uid = playerBrief.uid
+            vipLv = playerBrief.vipLv
+            headFrameId = playerBrief.headFrame
+            if int64.equals(uid, ManagerContainer.DataMgr.UserData:GetUserId()) then
+                headFrameId = ManagerContainer.DataMgr.UserData:GetHeadFrameId()
+                vipLv = ManagerContainer.DataMgr.UserData:GetVipLv()
+            end
+            local jobCfg = ManagerContainer.CfgMgr:GetJobDataById(playerBrief.configId)
+            local jobIcon = ''
+            if jobCfg then
+                jobIcon = jobCfg.JobIcon
+            end
+            data.Level = playerBrief.level
+            data.ProfessionIcon = jobIcon
+            data.HeadIcon = playerBrief.headPortraitName
+            name = playerBrief.nickName
+        end
+        self:RefreshVoyageRankItem(itemLua, name, vipLv, data, headFrameId, itemData.score, itemData.rank)
+    end
+    return item
 end
 
 function UIVoyageRankView:RefreshSelfVoyageRankItem()
-	local userdata = ManagerContainer.DataMgr.UserData
-	local data = {IsHero = true}
-	data.Level = userdata:GetRoleLv()
-	local jobCfg = ManagerContainer.CfgMgr:GetJobDataById(userdata:GetJobCfgId())
-	local jobIcon = ''
-	if jobCfg then
-		jobIcon = jobCfg.JobIcon
-	end
-	data.ProfessionIcon = jobIcon
-	data.HeadIcon = userdata:GetUserHeadIcon()
-	local headFrameId = userdata:GetHeadFrameId()
-	local vipLv = userdata:GetVipLv()
-	local name = userdata:GetUserNickname()
-	self:RefreshVoyageRankItem(self.selfVoyageRankItem, name, vipLv, data, headFrameId, self.controller:GetSelfScore(), self.controller:GetSelfRank())
+    local userdata = ManagerContainer.DataMgr.UserData
+    local data = {
+        IsHero = true
+    }
+    data.Level = userdata:GetRoleLv()
+    local jobCfg = ManagerContainer.CfgMgr:GetJobDataById(userdata:GetJobCfgId())
+    local jobIcon = ''
+    if jobCfg then
+        jobIcon = jobCfg.JobIcon
+    end
+    data.ProfessionIcon = jobIcon
+    data.HeadIcon = userdata:GetUserHeadIcon()
+    local headFrameId = userdata:GetHeadFrameId()
+    local vipLv = userdata:GetVipLv()
+    local name = userdata:GetUserNickname()
+    self:RefreshVoyageRankItem(self.selfVoyageRankItem, name, vipLv, data, headFrameId, self.controller:GetSelfScore(),
+        self.controller:GetSelfRank())
 end
 
 function UIVoyageRankView:RefreshVoyageRankItem(itemLua, name, vipLv, headData, headFrameId, score, rank)
-	itemLua.nameTxt.text.text = tostring(name)
-	if not score or score <= 0 then
-		itemLua.scoreTxt.text.text = "0"
-	else
-		itemLua.scoreTxt.text.text = tostring(score)
-	end
-	if not rank or rank <= 0 then
-		itemLua.rankTxt.text.text = string.formatbykey('NoRank')
-		itemLua.rankTxt:SetActive(true)
-		itemLua.rankSp:SetActive(false)
-	elseif rank == 1 then
-		itemLua.rankTxt:SetActive(false)
-		itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(0)
-		itemLua.rankSp:SetActive(true)
-	elseif rank == 2 then
-		itemLua.rankTxt:SetActive(false)
-		itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(1)
-		itemLua.rankSp:SetActive(true)
-	elseif rank == 3 then
-		itemLua.rankTxt:SetActive(false)
-		itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(2)
-		itemLua.rankSp:SetActive(true)
-	else
-		itemLua.rankTxt.text.text = tostring(rank)
-		itemLua.rankTxt:SetActive(true)
-		itemLua.rankSp:SetActive(false)
-	end
-	itemLua.headItem.head.button.enabled = false
-	CommonUtil.SetPlayerHeadAndFrame(self, itemLua.headItem, headData, false, headFrameId)
-
-	itemLua.vipIcon.image.enabled = false
-	itemLua.vipIcon.image.sprite = nil
-	if vipLv and vipLv >= 0 then
-		local vipCfg = ManagerContainer.CfgMgr:GetVipCfgById(vipLv)
-		if vipCfg then
-			CommonUtil.LoadIcon(self, vipCfg.SmallIcon, function(sprite)
-				if sprite then
-					itemLua.vipIcon.image.sprite = sprite
-					itemLua.vipIcon.image.enabled = true
-				end
-			end, itemLua, 'VipIcon')
-		end
-	end
+    itemLua.nameTxt.text.text = tostring(name)
+    if not score or score <= 0 then
+        itemLua.scoreTxt.text.text = "0"
+    else
+        itemLua.scoreTxt.text.text = tostring(score)
+    end
+    if not rank or rank <= 0 then
+        itemLua.rankTxt.text.text = string.formatbykey('NoRank')
+        itemLua.rankTxt:SetActive(true)
+        itemLua.rankSp:SetActive(false)
+    elseif rank == 1 then
+        itemLua.rankTxt:SetActive(false)
+        itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(0)
+        itemLua.rankSp:SetActive(true)
+    elseif rank == 2 then
+        itemLua.rankTxt:SetActive(false)
+        itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(1)
+        itemLua.rankSp:SetActive(true)
+    elseif rank == 3 then
+        itemLua.rankTxt:SetActive(false)
+        itemLua.rankSp.uIImageSwitchSprite:ChangeSprite(2)
+        itemLua.rankSp:SetActive(true)
+    else
+        itemLua.rankTxt.text.text = tostring(rank)
+        itemLua.rankTxt:SetActive(true)
+        itemLua.rankSp:SetActive(false)
+    end
+    itemLua.headItem.head.button.enabled = false
+    CommonUtil.SetPlayerHeadAndFrame(self, itemLua.headItem, headData, false, headFrameId)
+
+    itemLua.vipIcon.image.enabled = false
+    itemLua.vipIcon.image.sprite = nil
+    if vipLv and vipLv >= 0 then
+        local vipCfg = ManagerContainer.CfgMgr:GetVipCfgById(vipLv)
+        if vipCfg then
+            CommonUtil.LoadIcon(self, vipCfg.SmallIcon, function(sprite)
+                if sprite then
+                    itemLua.vipIcon.image.sprite = sprite
+                    itemLua.vipIcon.image.enabled = true
+                end
+            end, itemLua, 'VipIcon')
+        end
+    end
+
+    local reward = ManagerContainer.DataMgr.VoyageDataMgr:GetRewardByRank(rank)
+    if reward then
+		local rewardList = ManagerContainer.DataMgr.HardMissionDataMgr:GetReward(reward)
+		--LogError("rewardList = "..Inspect(rewardList))
+		--LogError("reward = "..Inspect(reward))
+        CommonUtil.LoopGridViewEleCreateNew(self, 
+			itemLua.rewordNode.loopHorizontalScrollRect,
+            itemLua.content.horizontalLayoutGroup,
+			 rewardList, 
+			 0, 
+			 self, 
+			 self.UpdateRewards, 
+			 nil, nil, 0);
+    end
+
+end
+
+function UIVoyageRankView:UpdateRewards(_itemLua, _idx,_data)
+	if not _itemLua or not _data then return end
+	CommonUtil.UpdateItemPrefab(self, _itemLua, _data, Enum.ItemIEnterType.Bag)
 end
-
 function UIVoyageRankView:OnBeginLoad(isBegin)
 	local errorCode = self.controller:SendGetVoyageRankDatasReq(isBegin)
 	if errorCode ~= 0 then
@@ -209,5 +235,7 @@ function UIVoyageRankView:RefreshList()
 	self:RefreshSelfVoyageRankItem()
 end
 
+
+
 return UIVoyageRankView
 

Assets/Lua/UI/UIVoyage/UIVoyageRobberyCtr.lua

@@ -30,7 +30,7 @@ function UIVoyageRobberyCtr:OnDispose()
 end
 
 function UIVoyageRobberyCtr:InitData()
-	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(325)
+	self.numLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetChallengeCountLimit()
 	if self.data then
 		self.airShipData = ManagerContainer.DataMgr.VoyageDataMgr:GetAirShipDataByUid(self.data)
 	else
@@ -38,6 +38,11 @@ function UIVoyageRobberyCtr:InitData()
 	end
 end
 
+function UIVoyageRobberyCtr:RefChallengeCount()
+	self.numLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetChallengeCountLimit()
+end
+
+
 function UIVoyageRobberyCtr:GetAirShipData()
 	return self.airShipData
 end

Assets/Lua/UI/UIVoyage/UIVoyageRobberyView.lua

@@ -9,6 +9,8 @@ end
 function UIVoyageRobberyView:AddEventListener()
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_CHALLENGE_NUM_CHANGED, self, self.RefreshRobNum)
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_CHECK_AIRSHIP_CHANGED, self, self.OnCheckAirShipChanged)
+	--VOYAGE_CHALLENGE_COUNT_CHANGED
+	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_CHALLENGE_COUNT_CHANGED, self, self.OnVoyageChallengeCountChanged)
 end
 
 function UIVoyageRobberyView:FillContent(data, uiBase)
@@ -37,6 +39,7 @@ function UIVoyageRobberyView:Init()
 	self:RefreshView()
 	self:RefreshRobNum()
 	self.box:SetActive(true)
+	self.btnAdd:SetActive(true)
 	--self.robNum:SetActive(false)
 	self.transform:Find("UIAnimator/Window/BG/Title").gameObject:SetActive(true)
 end
@@ -50,6 +53,7 @@ function UIVoyageRobberyView:AddUIEventListener()
 	self.uiBase:AddButtonUniqueEventListener(self.btnClose.button, self, self.OnClickCloseBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnCancle.button, self, self.OnClickCloseBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnChallenge.button, self, self.OnClickChallengeBtn)
+	self.uiBase:AddButtonUniqueEventListener(self.btnAdd.button, self, self.OnClickAddBth)
 end
 
 function UIVoyageRobberyView:OnHide()
@@ -230,6 +234,14 @@ function UIVoyageRobberyView:RefreshCurrencyItem(currency, reward)
 		currency:SetActive(false)
 	end
 end
+function UIVoyageRobberyView:OnVoyageChallengeCountChanged()
+	self.controller:RefChallengeCount()
+	self:RefreshRobNum()
+end
 
+
+function UIVoyageRobberyView:OnClickAddBth()
+	ManagerContainer.DataMgr.VoyageDataMgr:SendChallengeCountBuyReq()
+end
 return UIVoyageRobberyView
 

Assets/Lua/UI/UIVoyage/UIVoyageRobberyView_Generate.lua

@@ -1,3 +1,7 @@
+---@class UIVoyageRobbery__Generate_btnAdd
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
 ---@class UIVoyageRobbery__Generate_robNum
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
@@ -91,6 +95,7 @@
 ---@field private btnCancleText UIVoyageRobbery__Generate_btnCancleText
 ---@field private btnChallenge UIVoyageRobbery__Generate_btnChallenge
 ---@field private robNum UIVoyageRobbery__Generate_robNum
+---@field private btnAdd UIVoyageRobbery__Generate_btnAdd
 local UIVoyageRobberyView = class("UIVoyageRobberyView", require("UIViewBase"))
 
 function UIVoyageRobberyView:ctor()
@@ -131,6 +136,7 @@ function UIVoyageRobberyView:InitGenerate(Root, data)
 	self:InitGenerate__19(Root,data)
 	self:InitGenerate__20(Root,data)
 	self:InitGenerate__21(Root,data)
+	self:InitGenerate__22(Root,data)
 
 
 end
@@ -417,6 +423,20 @@ function UIVoyageRobberyView:InitGenerate__21(Root, data)
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
 end
 
+---@private
+function UIVoyageRobberyView:InitGenerate__22(Root, data)
+--[[
+	UIAnimator/Window/BG/Title/BtnAdd
+--]]
+	local tmp = Root:Find("UIAnimator/Window/BG/Title/BtnAdd").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.btnAdd = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
 ---@private
 function UIVoyageRobberyView:GenerateDestroy()
 	if tolua.getpeer(self.currency3.text) ~= nil then
@@ -497,6 +517,10 @@ function UIVoyageRobberyView:GenerateDestroy()
 		tolua.setpeer(self.robNum, nil)
 	end
 	self.robNum = nil
+	if tolua.getpeer(self.btnAdd) ~= nil then
+		tolua.setpeer(self.btnAdd, nil)
+	end
+	self.btnAdd = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -48,11 +48,11 @@ end
 
 function UIVoyageView:RemoveEventListener()
 	ManagerContainer.LuaEventMgr:Unregister(self.uiData.name)
-	ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK )
+	--ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK )
 end
 
 function UIVoyageView:AddUIEventListener()
-	ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK ,self.OnBuyNumAck,self)
+	--ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK ,self.OnBuyNumAck,self)
 	self.uiBase:AddButtonUniqueEventListener(self.backBtn.button, self, self.OnClickBackBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnInfo.button, self, self.OnClickInfoBtn)
 

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
+  productName: "\u5FC3\u529B\u7269\u8BED"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1