Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

xiyou_yueNanZhengshi
PC-202302260912\Administrator 2024-11-15 17:55:08 +08:00
commit eff3d00e4c
4 changed files with 120 additions and 98 deletions

View File

@ -361,7 +361,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 333.46786, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &4958175624373009216
CanvasRenderer:
@ -441,7 +441,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 614.9608, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &5948588759787930312
CanvasRenderer:
@ -521,7 +521,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 333.46786, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &8462278127401844289
CanvasRenderer:
@ -675,7 +675,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.70001, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3326177538456794049
CanvasRenderer:
@ -755,7 +755,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 333.46786, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &5737339333905785535
CanvasRenderer:
@ -1189,7 +1189,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.70001, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6944910135164790143
CanvasRenderer:
@ -1840,7 +1840,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 538.4679, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &6882548139123069853
CanvasRenderer:
@ -1920,7 +1920,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 333.46786, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &9019888237563219726
CanvasRenderer:
@ -2000,7 +2000,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 538.4679, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &7051011842366580587
CanvasRenderer:
@ -2379,7 +2379,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 333.46786, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &603136522373708055
CanvasRenderer:
@ -2530,7 +2530,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 538.4679, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &4965385863161921876
CanvasRenderer:
@ -2610,7 +2610,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 538.4679, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &3999461053147825026
CanvasRenderer:
@ -2690,7 +2690,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 538.4679, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &3738771688315148005
CanvasRenderer:
@ -3192,7 +3192,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 456.66083, y: -20.943995}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.45984325, y: 0.5645878}
--- !u!222 &4236096635891184336
CanvasRenderer:
@ -3992,7 +3992,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.70001, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2554618590480104562
CanvasRenderer:
@ -4072,7 +4072,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.70001, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &257796214133349227
CanvasRenderer:
@ -4422,7 +4422,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.70001, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3408313820747155971
CanvasRenderer:
@ -4502,7 +4502,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 341.7, y: -23.45}
m_SizeDelta: {x: 250, y: 38.8}
m_SizeDelta: {x: 250, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5878672618892222144
CanvasRenderer:

View File

@ -2619,7 +2619,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 217.2, y: 2}
m_SizeDelta: {x: 95, y: 50}
m_SizeDelta: {x: 98, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4859407655032388677
CanvasRenderer:
@ -2649,7 +2649,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8a9c452009cf8e94faeb2c6304d06e8b, type: 3}
m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -14455,6 +14455,102 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &1113771686451088427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8002843426653339834}
- component: {fileID: 4479186511108352220}
- component: {fileID: 834942821102934616}
- component: {fileID: 7519859942126711776}
m_Layer: 5
m_Name: tip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8002843426653339834
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113771686451088427}
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_Children: []
m_Father: {fileID: 4677430472340796669}
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.005126953, y: 43.199974}
m_SizeDelta: {x: 168.78, y: 66.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4479186511108352220
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113771686451088427}
m_CullTransparentMesh: 0
--- !u!114 &834942821102934616
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113771686451088427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9921569, g: 0.9450981, b: 0.9176471, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5171\u9E23\u8FDB\u5EA6"
LanguageIndex: 0
--- !u!114 &7519859942126711776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113771686451088427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.60784316, g: 0.40000004, b: 0.37254903, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1269858437723924750
GameObject:
m_ObjectHideFlags: 0
@ -53658,80 +53754,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3685100305682060209
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6116845072743436234}
- component: {fileID: 8725376946284319186}
- component: {fileID: 190260667425265678}
m_Layer: 5
m_Name: tip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6116845072743436234
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3685100305682060209}
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_Children: []
m_Father: {fileID: 4677430472340796669}
m_RootOrder: 0
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: 216.77, y: 38.1}
m_SizeDelta: {x: 174, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8725376946284319186
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3685100305682060209}
m_CullTransparentMesh: 0
--- !u!114 &190260667425265678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3685100305682060209}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 346a591cedc635a478e92019a2a01dda, 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
--- !u!1 &3938352066829317727
GameObject:
m_ObjectHideFlags: 0
@ -102435,7 +102457,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: -300}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6116845072743436234}
- {fileID: 8002843426653339834}
- {fileID: 963906791793547604}
- {fileID: 4705860077060654479}
- {fileID: 1132414480878568768}

View File

@ -419,7 +419,7 @@ end
-- 最大上阵人数
function this.MaxArmyNum()
local num = 0
local formatData = GetLanguageStrById(gameSetConfig[1].HeroLocation)
local formatData = gameSetConfig[1].HeroLocation
for i = 1, #formatData do
local judgeType = formatData[i][1]
local value = formatData[i][2]
@ -441,7 +441,7 @@ end
-- 上阵位置解锁条件
function this.UnLockCondition(index)
local tip = Language[11151]
local formatData = GetLanguageStrById(gameSetConfig[1].HeroLocation)
local formatData = gameSetConfig[1].HeroLocation
local judgeType = formatData[index][1]
local value = formatData[index][2]
if judgeType == 1 then -- 关卡判断
@ -459,7 +459,7 @@ function this.NextArmCondition()
if nextIndex >= this.MaxArmyNum() then
nextIndex = this.MaxArmyNum()
end
local formatData = GetLanguageStrById(gameSetConfig[1].HeroLocation)
local formatData = gameSetConfig[1].HeroLocation
local judgeType = formatData[nextIndex][1]
local value = formatData[nextIndex][2]
local nextTip = Language[11153]