添加了货物隐藏的功能。
优化了射线计算稳定性,避免在低帧率时频繁抖动。 添加了关闭塔机间碰撞的显示。
This commit is contained in:
@@ -6,6 +6,21 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="daf2f20f-cec5-4df6-9f50-2b8f79af7b7d" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.TowerCraneVisualization_HDRP_master/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TowerCraneVisualization_HDRP_master/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Font/思源黑体/SourceHanSansCN-Bold-2 SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Font/思源黑体/SourceHanSansCN-Bold-2 SDF.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Material/RTTexture/cargoView.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Material/RTTexture/cargoView.renderTexture" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Material/RTTexture/mainView.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Material/RTTexture/mainView.renderTexture" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.5.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.5.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerCraneControlManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerCraneControlManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerTraceTarget.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerTraceTarget.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Scripts/UI/basePanle/CollisionIndoRmationManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Scripts/UI/basePanle/CollisionIndoRmationManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/LRC/Scripts/UI/element/CollisionIndoRmation/ColliderInfoItemController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Scripts/UI/element/CollisionIndoRmation/ColliderInfoItemController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/PrefabEditingSceneOld.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/PrefabEditingSceneOld.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Volume/VolumeRayTracingProfile Z.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Volume/VolumeRayTracingProfile Z.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/ZMS/Prefab/PrefabEditingSceneOld_ZMS.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ZMS/Prefab/PrefabEditingSceneOld_ZMS.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/ZMS/Script/2D/TowerItemTog.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ZMS/Script/2D/TowerItemTog.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/ZMS/Script/Massage/HandleMessage.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ZMS/Script/Massage/HandleMessage.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Script/Draw/IndicatorRayTrace.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Script/Draw/IndicatorRayTrace.cs" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -19,6 +34,7 @@
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/Assets/LRC/Scripts/UI/element/SamplePanle/SpPointCarSet.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.high-definition@13.1.9/Runtime/Material/Lit/Lit.shader" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.textmeshpro@3.0.6/Scripts/Runtime/TMP_Settings.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
@@ -118,7 +134,9 @@
|
||||
<workItem from="1701765785570" duration="7235000" />
|
||||
<workItem from="1701774951196" duration="2798000" />
|
||||
<workItem from="1701819189626" duration="2204000" />
|
||||
<workItem from="1701933784153" duration="658000" />
|
||||
<workItem from="1701933784153" duration="1772000" />
|
||||
<workItem from="1701937463287" duration="729000" />
|
||||
<workItem from="1701938735746" duration="10695000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,8 +14,8 @@ RenderTexture:
|
||||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1350
|
||||
m_Height: 614
|
||||
m_Width: 460
|
||||
m_Height: 246
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 94
|
||||
|
||||
@@ -14,8 +14,8 @@ RenderTexture:
|
||||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1350
|
||||
m_Height: 614
|
||||
m_Width: 460
|
||||
m_Height: 246
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 94
|
||||
|
||||
@@ -3734,7 +3734,7 @@ Transform:
|
||||
- {fileID: 1250986892925731329}
|
||||
- {fileID: 5918313468060258596}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: -1
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2656345868790764519
|
||||
MonoBehaviour:
|
||||
@@ -3808,6 +3808,8 @@ MonoBehaviour:
|
||||
CargoMoveDirction: {x: 0, y: 0, z: -1.1}
|
||||
CargoDeclineLength: 0.5
|
||||
CargoArriveOffset: -0.5
|
||||
CargoVisibalNode_Transform: {fileID: 1419398656575889342}
|
||||
CargoUnvisibalOffset: 1
|
||||
Material: {fileID: 2100000, guid: 04c6714997bce044993348aa2d6de2de, type: 2}
|
||||
AreaContorller: {fileID: 1102593511}
|
||||
DiscolorTime: 1
|
||||
|
||||
@@ -66,7 +66,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5854\u673A#01"
|
||||
m_text: "\u5854\u673A#04"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 713219d18e2f8c440b4e4435211afb23, type: 2}
|
||||
m_sharedMaterial: {fileID: -1567122069935691074, guid: 713219d18e2f8c440b4e4435211afb23, type: 2}
|
||||
@@ -896,8 +896,8 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 29899207053490219}
|
||||
m_LocalRotation: {x: -0, y: -0.19080894, z: -0, w: 0.9816273}
|
||||
m_LocalPosition: {x: 0, y: 4.47, z: 0}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 5, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@@ -1046,7 +1046,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7188331832019856070
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1086,7 +1086,7 @@ Camera:
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
far clip plane: 10
|
||||
field of view: 60
|
||||
orthographic: 0
|
||||
orthographic size: 5
|
||||
@@ -1100,7 +1100,7 @@ Camera:
|
||||
m_TargetEye: 3
|
||||
m_HDR: 0
|
||||
m_AllowMSAA: 0
|
||||
m_AllowDynamicResolution: 0
|
||||
m_AllowDynamicResolution: 1
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
@@ -1117,19 +1117,19 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
clearColorMode: 0
|
||||
clearColorMode: 2
|
||||
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
|
||||
clearDepth: 1
|
||||
volumeLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1
|
||||
volumeAnchorOverride: {fileID: 0}
|
||||
antialiasing: 0
|
||||
antialiasing: 2
|
||||
SMAAQuality: 2
|
||||
dithering: 0
|
||||
stopNaNs: 0
|
||||
stopNaNs: 1
|
||||
taaSharpenStrength: 0.5
|
||||
TAAQuality: 1
|
||||
TAAQuality: 2
|
||||
taaHistorySharpening: 0.35
|
||||
taaAntiFlicker: 0.5
|
||||
taaMotionVectorRejection: 0
|
||||
@@ -1148,7 +1148,7 @@ MonoBehaviour:
|
||||
flipYMode: 0
|
||||
xrRendering: 1
|
||||
fullscreenPassthrough: 0
|
||||
allowDynamicResolution: 0
|
||||
allowDynamicResolution: 1
|
||||
customRenderingSettings: 0
|
||||
invertFaceCulling: 0
|
||||
probeLayerMask:
|
||||
@@ -1738,7 +1738,7 @@ Transform:
|
||||
m_GameObject: {fileID: 631243247630560550}
|
||||
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0.00041427568, y: 0.06475021, z: 0.0042106626}
|
||||
m_LocalScale: {x: 0.07, y: 0.07, z: 4.47}
|
||||
m_LocalScale: {x: 0.07, y: 0.07, z: 5}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3520312795539261317}
|
||||
@@ -1876,7 +1876,7 @@ Transform:
|
||||
- {fileID: 5918313468060258596}
|
||||
- {fileID: 4200267653419669009}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2656345868790764519
|
||||
MonoBehaviour:
|
||||
@@ -1890,13 +1890,13 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
towerRealIndex: 1
|
||||
towerRealIndex: 4
|
||||
TowerLableManager: {fileID: 5697742016140361613}
|
||||
TowerGerminate_Transform: {fileID: 6693386181906549140}
|
||||
RockerArmCarry:
|
||||
- {fileID: 367682009985537050}
|
||||
- {fileID: 2678745814512580653}
|
||||
TowerGerminateHeight: 4.47
|
||||
TowerGerminateHeight: 5
|
||||
TowerCabHeight: 0.67
|
||||
EnableRockerArmBlockScaleAdj: 0
|
||||
EnableRockerArmScaleAdj: 1
|
||||
@@ -1944,12 +1944,14 @@ MonoBehaviour:
|
||||
CargoDecline_Transform: {fileID: 5042138510499614936}
|
||||
EnableCargoMoveAdj: 1
|
||||
Cargo_Transform: {fileID: 3237193059491540193}
|
||||
CargoBox_Transform: {fileID: 7529629592902752946}
|
||||
CargoBox_Transform: {fileID: 543450652122756470}
|
||||
CargoDeclineBaseScale: {x: 1, y: 1, z: 0}
|
||||
CargoDeclineScaleUnit: {x: 0, y: 0, z: 1}
|
||||
CargoMoveDirction: {x: 0, y: 0, z: -1.1}
|
||||
CargoDeclineLength: 0.5
|
||||
CargoArriveOffset: -0.5
|
||||
CargoVisibalNode_Transform: {fileID: 1419398656575889342}
|
||||
CargoUnvisibalOffset: 1
|
||||
Material: {fileID: 2100000, guid: 04c6714997bce044993348aa2d6de2de, type: 2}
|
||||
AreaContorller: {fileID: 1102593511}
|
||||
DiscolorTime: 1
|
||||
@@ -4058,7 +4060,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6257259252975653819}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 4.47, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 5, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@@ -4226,7 +4228,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7213800228905257720}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 4.47, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 5, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@@ -4526,7 +4528,7 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7545503800301936213}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.000000042146826, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -5.5}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@@ -4535,7 +4537,7 @@ Transform:
|
||||
- {fileID: 7529629592902752946}
|
||||
- {fileID: 8378655851158139138}
|
||||
m_Father: {fileID: 8672253591761085981}
|
||||
m_RootOrder: -2
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7798758304622186215
|
||||
GameObject:
|
||||
|
||||
@@ -18,6 +18,7 @@ using DDDInducator.Runtime.Draw;
|
||||
using DDDInducator.Runtime.Terminal;
|
||||
|
||||
using Sirenix.OdinInspector;
|
||||
using ZMS.UI;
|
||||
|
||||
namespace LRC
|
||||
{
|
||||
@@ -111,6 +112,11 @@ namespace LRC
|
||||
[ReName("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>")]
|
||||
[SerializeField]
|
||||
private int towerRealIndex = -1;
|
||||
|
||||
/// <summary>
|
||||
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD>
|
||||
/// </summary>
|
||||
public int TowerRealIndex => towerRealIndex;
|
||||
|
||||
/// <summary>
|
||||
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
@@ -660,6 +666,19 @@ namespace LRC
|
||||
[SerializeField]
|
||||
internal float CargoArriveOffset = 0;
|
||||
|
||||
/// <summary>
|
||||
/// <20><><EFBFBD><EFBFBD><EFBFBD>Ӿ<EFBFBD><D3BE>ڵ<EFBFBD>
|
||||
/// </summary>
|
||||
[FoldoutGroup("<22><><EFBFBD><EFBFBD>")]
|
||||
[ReName("<22><><EFBFBD><EFBFBD><EFBFBD>Ӿ<EFBFBD><D3BE>ڵ<EFBFBD>")]
|
||||
[SerializeField]
|
||||
internal Transform CargoVisibalNode_Transform;
|
||||
|
||||
[FoldoutGroup("<22><><EFBFBD><EFBFBD>")]
|
||||
[ReName("<22>Ӿ<EFBFBD>ƫ<EFBFBD><C6AB><EFBFBD><EFBFBD>")]
|
||||
[SerializeField]
|
||||
internal float CargoUnvisibalOffset;
|
||||
|
||||
#endregion
|
||||
|
||||
#region ָʾ
|
||||
@@ -771,6 +790,11 @@ namespace LRC
|
||||
/// </summary>
|
||||
private Material materialInst;
|
||||
|
||||
/// <summary>
|
||||
/// <20>趨<EFBFBD><E8B6A8><EFBFBD><EFBFBD><EFBFBD>Ӿ<EFBFBD><D3BE><EFBFBD>Ч<EFBFBD><D0A7>
|
||||
/// </summary>
|
||||
private bool ShowCargoVisibal;
|
||||
|
||||
/// <summary>
|
||||
/// <20><><EFBFBD><EFBFBD>
|
||||
/// </summary>
|
||||
@@ -877,7 +901,7 @@ namespace LRC
|
||||
if(activeSelect)
|
||||
{
|
||||
DownUI.higValueSet_Action?.Invoke(1, (float)TowerLableManager.LastLevel * 0.667f);
|
||||
DownUI.higColorSet_Action?.Invoke(TowerLableManager.LastLevel.LevelColor(), true);
|
||||
DownUI.higColorSet_Action?.Invoke(TowerLableManager.LastLevel.LevelColor());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1076,16 +1100,22 @@ namespace LRC
|
||||
/// </summary>
|
||||
private void UpdateHookDecline()
|
||||
{
|
||||
HookDeclineProgressLength = MacroInching.LinearTowards(HookDeclineProgressLength, HookDeclineLength, HookMoveSpeed * Time.deltaTime);
|
||||
HookDeclineProgressLength = MacroInching.LinearTowards(HookDeclineProgressLength, HookDeclineLength + (ShowCargoVisibal ? 0 : CargoUnvisibalOffset), HookMoveSpeed * Time.deltaTime);
|
||||
HookDeclineStructureUpdate();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// չʾ<D5B9><CABE><EFBFBD><EFBFBD>
|
||||
/// </summary>
|
||||
public void ShowCargo()
|
||||
public void ShowCargo(bool show)
|
||||
{
|
||||
|
||||
ShowCargoVisibal = show;
|
||||
CargoVisibalNode_Transform.gameObject.SetActive(show);
|
||||
}
|
||||
|
||||
public bool IsCargoVisibalShow()
|
||||
{
|
||||
return CargoVisibalNode_Transform.gameObject.activeSelf;
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -1129,9 +1159,6 @@ namespace LRC
|
||||
return target;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָʾ<D6B8><CABE>
|
||||
/// </summary>
|
||||
private void InitializeCargoIndicator()
|
||||
{
|
||||
var mesh = TargetCargo_GamoObject.GetComponent<MeshFilter>();
|
||||
@@ -1193,7 +1220,8 @@ namespace LRC
|
||||
var look2 = otherTailPoint - projection2;
|
||||
var length1 = look1.magnitude;
|
||||
var length2 = look2.magnitude;
|
||||
if(length1 > length2)
|
||||
var length1LongerThen2 = length1 > length2 + Time.deltaTime;
|
||||
if(length1LongerThen2)
|
||||
{
|
||||
trace.transform.position = projection2;
|
||||
trace.TraceDirection = look2 / length2;
|
||||
@@ -1203,6 +1231,12 @@ namespace LRC
|
||||
trace.transform.position = projection1;
|
||||
trace.TraceDirection = look1 / length1;
|
||||
}
|
||||
#if UNITY_EDITOR
|
||||
if (length1LongerThen2)
|
||||
Debug.DrawLine(projection2, otherTailPoint);
|
||||
else
|
||||
Debug.DrawLine(projection1, otherFrontPoint);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1246,9 +1280,15 @@ namespace LRC
|
||||
{
|
||||
tower3DPoint.gameObject.SetActive(show);
|
||||
activeSelect = show;
|
||||
|
||||
|
||||
foreach(var item in regulatoryList)
|
||||
item.EnableVisualInformation(show);
|
||||
{
|
||||
var friend = item as FriendIndicatorRayTrace;
|
||||
var isFriend = friend != null;
|
||||
var valid = show
|
||||
&& (!isFriend || (isFriend && !towerTraceList.Contains(friend)));
|
||||
item.EnableVisualInformation(valid);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,9 @@ namespace LRC
|
||||
/// </summary>
|
||||
public TowerCraneControlManager TargetTowerManager;
|
||||
|
||||
[SerializeField]
|
||||
internal bool AutoFocusTowerTarget;
|
||||
|
||||
#endregion
|
||||
|
||||
#region <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
@@ -56,12 +59,20 @@ namespace LRC
|
||||
|
||||
var script = target as TowerTraceTarget;
|
||||
|
||||
if (GUILayout.Button("<22>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"))
|
||||
{
|
||||
script.TargetTowerManager = TowerCraneControlManager.AllTowers[
|
||||
index = ++index % TowerCraneControlManager.AllTowers.Count()];
|
||||
|
||||
if (script.AutoFocusTowerTarget)
|
||||
TowerCraneControlManager.AttentionTower(script.TargetTowerManager);
|
||||
}
|
||||
|
||||
if(GUILayout.Button("ʹ<><CAB9>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD>۽<EFBFBD>"))
|
||||
TowerCraneControlManager.AttentionTower(script.TargetTowerManager);
|
||||
|
||||
if(GUILayout.Button("<22>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"))
|
||||
script.TargetTowerManager = TowerCraneControlManager.AllTowers[
|
||||
index = ++index % TowerCraneControlManager.AllTowers.Count()];
|
||||
if (GUILayout.Button("<22>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ"))
|
||||
script.TargetTowerManager.ShowCargo(!script.TargetTowerManager.IsCargoVisibalShow());
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -151,7 +151,7 @@ namespace LRC
|
||||
public void AttentioToTower(TowerCraneControlManager target)
|
||||
{
|
||||
this.target = target;
|
||||
targetValid = target!= null;
|
||||
targetValid = target != null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -125,11 +125,11 @@ namespace LRC
|
||||
Debug.LogError("<22><>Ҫָ<D2AA><D6B8>һ<EFBFBD><D2BB>ͼ<EFBFBD><CDBC>");
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
//var icon = GetIconName(Orient, (int)WarningLevel).LoadFile<Sprite>(out var result);
|
||||
//Debug.Log(GetIconName(Orient, (int)WarningLevel) + (icon?"<22>ҵ<EFBFBD>":"δ<>ҵ<EFBFBD>"));
|
||||
}
|
||||
// private void Start()
|
||||
// {
|
||||
// //var icon = GetIconName(Orient, (int)WarningLevel).LoadFile<Sprite>(out var result);
|
||||
// //Debug.Log(GetIconName(Orient, (int)WarningLevel) + (icon?"<22>ҵ<EFBFBD>":"δ<>ҵ<EFBFBD>"));
|
||||
// }
|
||||
|
||||
private void Update()
|
||||
{
|
||||
|
||||
@@ -424,6 +424,28 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 33800071}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &48173483 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 1426465444}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &65414270 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 613946632}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &81111802
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -680,6 +702,10 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_4
|
||||
@@ -688,6 +714,14 @@ PrefabInstance:
|
||||
propertyPath: TowerRatateAngle
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -696,6 +730,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 380701019}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 380701019}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
@@ -2548,6 +2594,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 179822162}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &180293880 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 578611193}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &189284836
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3266,6 +3323,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 246059122}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &251044584 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 568515074}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &254780866
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4417,6 +4485,7 @@ MonoBehaviour:
|
||||
pauseRoam: {fileID: 369967007}
|
||||
dropdownRoam: {fileID: 1169389981}
|
||||
roamLineParent: {fileID: 1895549319}
|
||||
constructConfs: []
|
||||
--- !u!114 &365060257
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4719,6 +4788,17 @@ MonoBehaviour:
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &380701019 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 93629995}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &385241976
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4735,7 +4815,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &385241977
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5063,14 +5143,34 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#03"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: TowerRatateAngle
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -5079,6 +5179,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 1541186324}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 1541186324}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
@@ -5428,6 +5540,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 463958293}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &475811145 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 2023488159}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &476561232
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5815,10 +5938,30 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#08"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -5827,6 +5970,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 251044584}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 251044584}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
@@ -5882,10 +6037,30 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#06"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -5894,6 +6069,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 180293880}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 180293880}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
@@ -6151,10 +6338,30 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#02"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -6163,6 +6370,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 65414270}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 65414270}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
@@ -7290,6 +7509,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
TargetTowerManager: {fileID: 526863411}
|
||||
AutoFocusTowerTarget: 0
|
||||
--- !u!1 &773970656
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -11437,6 +11657,37 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1 &1307591557 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8776649619334333903, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
m_PrefabInstance: {fileID: 8776649618881751470}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!61 &1307591561
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1307591557}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &1321552250
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -12183,10 +12434,30 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#05"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -12195,6 +12466,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 48173483}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 48173483}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
@@ -13457,6 +13740,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1536900400}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1541186324 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
m_PrefabInstance: {fileID: 422372983}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c128c91948b3ed45bf8a76f911e576c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!224 &1544628457 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6114796348373847425, guid: 298310b0391250e4f9fed0c42753df6a, type: 3}
|
||||
@@ -18115,10 +18409,30 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 38387886, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\u5854\u673A#09"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 367682009985537050, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 814948421222178428, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TowerCrane_8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2656345868790764519, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: towerRealIndex
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2678745814512580653, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3039890928503620097, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9816273
|
||||
@@ -18127,6 +18441,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.19080894
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6202234722741973205, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6550861427577598704, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 475811145}
|
||||
- target: {fileID: 6816300142275353363, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: Manager
|
||||
value:
|
||||
objectReference: {fileID: 475811145}
|
||||
- target: {fileID: 8827706446110604527, guid: 74324b38968694c419491d97a17ba487, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 10
|
||||
@@ -20444,6 +20770,30 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 460
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8776649619334333900, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 246
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_AddedGameObjects: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3b24ed8660d71c94aa2c7b0633e2dedc, type: 3}
|
||||
|
||||
@@ -16,9 +16,6 @@ MonoBehaviour:
|
||||
rayBias:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.001
|
||||
distantRayBias:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.001
|
||||
extendShadowCulling:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
@@ -34,12 +31,6 @@ MonoBehaviour:
|
||||
buildMode:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
cullingMode:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
cullingDistance:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1000
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -92,21 +83,6 @@ MonoBehaviour:
|
||||
maximumIntensity:
|
||||
m_OverrideState: 0
|
||||
m_Value: 10
|
||||
denoising:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
useAOVs:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
temporal:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
asyncDenoising:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
skyImportanceSampling:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
tilingParameters:
|
||||
m_OverrideState: 0
|
||||
m_Value: {x: 1, y: 1, z: 0, w: 0}
|
||||
@@ -155,9 +131,6 @@ MonoBehaviour:
|
||||
m_Value:
|
||||
serializedVersion: 2
|
||||
m_Bits: 819
|
||||
specularOcclusion:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.5
|
||||
occluderMotionRejection:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
@@ -203,7 +176,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 2f1984a7ac01bf84b86559f7595cdc68, type: 3}
|
||||
m_Name: LightCluster
|
||||
m_EditorClassIdentifier:
|
||||
active: 1
|
||||
active: 0
|
||||
cameraClusterRange:
|
||||
m_OverrideState: 1
|
||||
m_Value: 50
|
||||
@@ -253,27 +226,6 @@ MonoBehaviour:
|
||||
accumulationFactor:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.75
|
||||
biasFactor:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.5
|
||||
speedRejectionParam:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.5
|
||||
speedRejectionScalerFactor:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.2
|
||||
speedSmoothReject:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
speedSurfaceOnly:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
speedTargetOnly:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
enableWorldSpeedRejection:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
m_RayMaxIterations:
|
||||
m_OverrideState: 0
|
||||
m_Value: 32
|
||||
|
||||
@@ -19675,6 +19675,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
TargetTowerManager: {fileID: 0}
|
||||
AutoFocusTowerTarget: 0
|
||||
--- !u!65 &711841268
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -69299,6 +69300,8 @@ MonoBehaviour:
|
||||
CargoMoveDirction: {x: 0, y: 0, z: -1.1}
|
||||
CargoDeclineLength: 0.5
|
||||
CargoArriveOffset: -0.5
|
||||
CargoVisibalNode_Transform: {fileID: 0}
|
||||
CargoUnvisibalOffset: 0
|
||||
Material: {fileID: 0}
|
||||
AreaContorller: {fileID: 0}
|
||||
DiscolorTime: 1
|
||||
@@ -96631,6 +96634,8 @@ MonoBehaviour:
|
||||
CargoMoveDirction: {x: 0, y: 0, z: -1.1}
|
||||
CargoDeclineLength: 0.5
|
||||
CargoArriveOffset: -0.5
|
||||
CargoVisibalNode_Transform: {fileID: 0}
|
||||
CargoUnvisibalOffset: 0
|
||||
Material: {fileID: 2100000, guid: 04c6714997bce044993348aa2d6de2de, type: 2}
|
||||
AreaContorller: {fileID: 5247154243045452917}
|
||||
DiscolorTime: 1
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace ZMS.UI
|
||||
|
||||
public void Start()
|
||||
{
|
||||
name.text = "<22><><EFBFBD><EFBFBD>" + towerCraneControlManager.towerRealIndex + "#";
|
||||
name.text = "<22><><EFBFBD><EFBFBD>" + towerCraneControlManager.TowerRealIndex + "#";
|
||||
qtzSelect_Tog.onValueChanged.AddListener((b) =>
|
||||
{
|
||||
if (b)
|
||||
|
||||
@@ -142,7 +142,7 @@ namespace ZMS.TCPMassage
|
||||
Vector3 vector3 = new Vector3();
|
||||
public void SetTimerMove(TimerData timerData)
|
||||
{
|
||||
TowerCraneControlManager towerCraneControlManager = TowerCraneControlManager.AllTowers.Find(x => x.towerRealIndex == timerData.code);
|
||||
TowerCraneControlManager towerCraneControlManager = TowerCraneControlManager.AllTowers.Find(x => x.TowerRealIndex == timerData.code);
|
||||
if (towerCraneControlManager != null)
|
||||
{
|
||||
vector3.y = timerData.arm_angle;
|
||||
@@ -161,7 +161,7 @@ namespace ZMS.TCPMassage
|
||||
|
||||
public void SetSize_QTZ(Configuration_QTZ configuration_QTZ)
|
||||
{
|
||||
TowerCraneControlManager towerCraneControlManager = TowerCraneControlManager.AllTowers.Find(x=>x.towerRealIndex == configuration_QTZ.code);
|
||||
TowerCraneControlManager towerCraneControlManager = TowerCraneControlManager.AllTowers.Find(x=>x.TowerRealIndex == configuration_QTZ.code);
|
||||
if (towerCraneControlManager != null)
|
||||
{
|
||||
towerCraneControlManager.TowerGerminateHeight = UnitConver(configuration_QTZ.height);//<2F><><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
|
||||
|
||||
Reference in New Issue
Block a user