军团战战斗预演

ProjectNLD/Assets/Art/Scene/Map/Mat/Maps03_Woodland_b_5_2.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84e80750b5a59cb42b7639a8b70a2e30
+guid: 5ede66ec927b9c54abf94f7a16ed7ab0
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

ProjectNLD/Assets/Art_Out/UI/Prefab/LegionBattleNew/UI_LB_BattleRes.prefab

@@ -24764,141 +24764,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &4836953860966565037
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5385278835410328557}
-  - component: {fileID: 4652670500835870520}
-  - component: {fileID: 4828544980558355245}
-  m_Layer: 5
-  m_Name: TextRes
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5385278835410328557
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4836953860966565037}
-  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: 3388828544067979572}
-  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: 109.3, y: -45.600006}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4652670500835870520
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4836953860966565037}
-  m_CullTransparentMesh: 1
---- !u!114 &4828544980558355245
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4836953860966565037}
-  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: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: "\u52BF\u5747\u529B\u654C"
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
-  m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
-    type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4278190335
-  m_fontColor: {r: 1, g: 0, b: 0, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, 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: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  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: 0
-  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!1 &4838355405782606475
 GameObject:
   m_ObjectHideFlags: 0
@@ -24928,7 +24793,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2177017390283887315}
-  - {fileID: 5385278835410328557}
   - {fileID: 6736714497376719573}
   - {fileID: 5577855119359796392}
   m_Father: {fileID: 1963831367310329197}
@@ -28826,8 +28690,8 @@ RectTransform:
   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: -80.7, y: -45.600006}
-  m_SizeDelta: {x: 200, y: 50}
+  m_AnchoredPosition: {x: 0, y: -45.5}
+  m_SizeDelta: {x: 600, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3512033394659237961
 CanvasRenderer:
@@ -28857,7 +28721,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u6218\u6597\u7ED3\u679C-"
+  m_text: "\u6218\u6597\u7ED3\u679C-<color=#ff0000>\u5168\u519B\u8986\u6CA1</color>"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
   m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
@@ -28892,8 +28756,8 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0

ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GlobalConfig.cs

@@ -997,6 +997,14 @@ public partial class GlobalConfig
     /// </summary>
      public float LegionPveCharacterPowerParam => _data.LegionPveCharacterPowerParam;
     /// <summary>
+    /// 军团战伤害公式K
+    /// </summary>
+     public float LegionPveDefFactor => _data.LegionPveDefFactor;
+    /// <summary>
+    /// 军团战战斗结果，0:大获全胜，1：略占上风，2：势均力敌，3：损失惨重
+    /// </summary>
+     public System.Collections.Generic.List<float> LegionPvePredictList => _data.LegionPvePredictList;
+    /// <summary>
     /// 训练关卡载具最大数量
     /// </summary>
      public int TrainingLevelVehicleCountLimit => _data.TrainingLevelVehicleCountLimit;
@@ -1025,10 +1033,6 @@ public partial class GlobalConfig
     /// </summary>
      public float RefundLimit => _data.RefundLimit;
     /// <summary>
-    /// 军团战伤害公式K
-    /// </summary>
-     public float LegionPveDefFactor => _data.LegionPveDefFactor;
-    /// <summary>
     /// 敌人战斗AI是否不清理攻击距离以外的目标
     /// </summary>
      public int NormalFightAI => _data.NormalFightAI;

ProjectNLD/Assets/Config/Data/globalconfig.json

@@ -363,6 +363,13 @@
     "LegionPveSeasonResurrectionItem": 5005,
     "LegionPveSeasonResurrectionCount": 10,
     "LegionPveCharacterPowerParam": 1.12,
+    "LegionPveDefFactor": 300,
+    "LegionPvePredictList": [
+      0.7,
+      0.2,
+      -0.2,
+      -0.7
+    ],
     "TrainingLevelVehicleCountLimit": 1,
     "TrainingLevelCharacterCountLimit": 6,
     "DefaultTrainingTeamIcon": 510003,
@@ -373,7 +380,6 @@
     "LegionPveScheduleID": 30002,
     "LegionPveIdleHpParamKp": 1,
     "RefundLimit": 8,
-    "LegionPveDefFactor": 300,
     "NormalFightAI": 1,
     "SurviveFightAI": 0,
     "DefyDeathFightAI": 1,