libraryUI更新
This commit is contained in:
parent
f705a086f1
commit
938ed3f310
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6c577e5cca4b3214e9d41bf2c7631c27
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -188,8 +188,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 26
|
||||
m_fontSizeBase: 26
|
||||
m_fontSize: 20
|
||||
m_fontSizeBase: 20
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -224,7 +224,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_margin: {x: 0, y: 0, z: 52.808083, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@ -319,7 +319,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.6431373}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -328,7 +328,7 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: fea2c14699ab54046906b5f3d80a310c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
@ -347,7 +347,7 @@ GameObject:
|
||||
- component: {fileID: 7050827278854225409}
|
||||
- component: {fileID: 3305404964179958120}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_Name: Tag
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -371,8 +371,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: 50.6, y: -88.2}
|
||||
m_SizeDelta: {x: 60, y: 35}
|
||||
m_AnchoredPosition: {x: 34.3, y: -80.9}
|
||||
m_SizeDelta: {x: 50, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3305404964179958120
|
||||
MonoBehaviour:
|
||||
@ -523,8 +523,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 18
|
||||
m_fontSizeBase: 18
|
||||
m_fontSize: 16
|
||||
m_fontSizeBase: 16
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -559,7 +559,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: -64.02937, w: 0}
|
||||
m_margin: {x: 0, y: 0, z: 51.80732, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@ -592,14 +592,14 @@ RectTransform:
|
||||
m_GameObject: {fileID: 6653222862606430650}
|
||||
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6302860782076051243}
|
||||
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_AnchoredPosition: {x: -9.2, y: -15.4}
|
||||
m_SizeDelta: {x: 1134, y: 1984}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2171881395091576000
|
||||
@ -669,7 +669,7 @@ RectTransform:
|
||||
m_GameObject: {fileID: 7147624849371676696}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 1825275905383914423}
|
||||
@ -677,8 +677,8 @@ RectTransform:
|
||||
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.000061035156, y: 0}
|
||||
m_SizeDelta: {x: 500, y: 500}
|
||||
m_AnchoredPosition: {x: -16, y: 0}
|
||||
m_SizeDelta: {x: 86, y: 86}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2921894767906865094
|
||||
CanvasRenderer:
|
||||
@ -949,8 +949,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 22
|
||||
m_fontSizeBase: 22
|
||||
m_fontSize: 16
|
||||
m_fontSizeBase: 16
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -1044,10 +1044,10 @@ MonoBehaviour:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 15
|
||||
m_Top: 20
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: -10
|
||||
m_Spacing: -15
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -435,11 +435,16 @@ namespace Logic
|
||||
if (playerDataA == playerDataB)
|
||||
return MoveAttackType.None;
|
||||
//如果目标位置上面有敌军单位,那不可移动,但是有可能可以攻击
|
||||
else
|
||||
if (mapData.GridMap.CalcDistance(gridDataA,gridDataB) <= unitDataA.GetAttackRange() &&
|
||||
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(unitDataA.UnitType,unitDataA.GiantType,out var info)
|
||||
&& info.Attack > 0) //判断距离在攻击距离范围内,且攻击大于0,就可以攻击
|
||||
else if (mapData.GridMap.CalcDistance(gridDataA, gridDataB) <= unitDataA.GetAttackRange() &&
|
||||
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(unitDataA.UnitType, unitDataA.GiantType,
|
||||
out var info)
|
||||
&& info.Attack > 0) //判断距离在攻击距离范围内,且攻击大于0,就可以攻击
|
||||
{
|
||||
if(mapData.GridMap.CalcDistance(gridDataA, gridDataB) > 3)
|
||||
Debug.Log("异常的攻击距离");
|
||||
return MoveAttackType.Attack; //返回可以攻击
|
||||
}
|
||||
|
||||
else //不在攻击范围内,不可以攻击
|
||||
return MoveAttackType.None;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user