Koha9/Aimbot-ParallelEnv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V3.2.0 添加InGameMessageBox 修改Playmode中小错误

Browse Source 
添加InGameMessageBox，可以在游戏中显示某些消息
修正可以在Enemy或者Agent身上生成Target或者Enemy的错误
This commit is contained in:
Koha9
2023-08-09 01:11:25 +09:00
parent 4318803f85
commit 709f7cf9d3
13 changed files with 1094 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ML-Agents/Timers/Play_timers.json
+1 -1
View File
@@ -1 +1 @@
{"count":1,"self":126.74634239999999,"total":128.0847739,"children":{"InitializeActuators":{"count":2,"self":0.0009999,"total":0.0009999,"children":null},"InitializeSensors":{"count":2,"self":0.0010008,"total":0.0010008,"children":null},"AgentSendState":{"count":6178,"self":0.026903399999999997,"total":0.223186,"children":{"CollectObservations":{"count":6178,"self":0.1734102,"total":0.1734102,"children":null},"WriteActionMask":{"count":6178,"self":0.0093753,"total":0.0093753,"children":null},"RequestDecision":{"count":6178,"self":0.0134971,"total":0.0134971,"children":null}}},"DecideAction":{"count":6178,"self":0.0307529,"total":0.0307529,"children":null},"AgentAct":{"count":6178,"self":1.0819883,"total":1.0819883,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":7,"max":5501.69238,"min":-2529.91821,"runningAverage":1871.90051,"value":5501.69238,"weightedAverage":2216.80957}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1690539320","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 4b63fb8e-9776-4262-b4cb-28aa0e369085 -accessToken Pb-uYo6-TCqI_VYWW4hD7qruW991NK-uVlSKxlTMxiM00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1690539448"}}
{"count":1,"self":17.432375999999998,"total":17.601931399999998,"children":{"InitializeActuators":{"count":2,"self":0.0014985999999999999,"total":0.0014985999999999999,"children":null},"InitializeSensors":{"count":2,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":649,"self":0.0039967,"total":0.027996999999999998,"children":{"CollectObservations":{"count":649,"self":0.0195028,"total":0.0195028,"children":null},"WriteActionMask":{"count":649,"self":0.0010004999999999999,"total":0.0010004999999999999,"children":null},"RequestDecision":{"count":649,"self":0.0034969999999999997,"total":0.0034969999999999997,"children":null}}},"DecideAction":{"count":649,"self":0.0049997999999999996,"total":0.0049997999999999996,"children":null},"AgentAct":{"count":649,"self":0.1315598,"total":0.1315598,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691511445","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken VfIHxMjB35w5fMmo90NJJ3FYRsNmtt785aeyJrUBNSY00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1691511463"}}
Assets/ML-Agents/Timers/Train_timers.json
+1 -1
View File
@@ -1 +1 @@
{"count":1,"self":46.7315648,"total":50.4141415,"children":{"InitializeActuators":{"count":16,"self":0.0015007,"total":0.0015007,"children":null},"InitializeSensors":{"count":16,"self":0.0010012,"total":0.0010012,"children":null},"AgentSendState":{"count":2264,"self":0.027499899999999997,"total":0.3287168,"children":{"CollectObservations":{"count":18112,"self":0.27471819999999997,"total":0.27471819999999997,"children":null},"WriteActionMask":{"count":18112,"self":0.006502,"total":0.006502,"children":null},"RequestDecision":{"count":18112,"self":0.0199967,"total":0.0199967,"children":null}}},"DecideAction":{"count":2264,"self":0.031005099999999997,"total":0.031005099999999997,"children":null},"AgentAct":{"count":2264,"self":3.3168523999999997,"total":3.3168523,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":9,"max":4165.668,"min":-8465.8,"runningAverage":-6057.36963,"value":4165.668,"weightedAverage":-4592.56}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691479498","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken E3xJ9L_3Ig0NQueh48ufPYRNPf4J2JoRlbnS3gUcFR000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1691479548"}}
{"count":1,"self":136.7215872,"total":147.4695117,"children":{"InitializeActuators":{"count":16,"self":0.0015004999999999999,"total":0.0015004999999999999,"children":null},"InitializeSensors":{"count":16,"self":0.0009987,"total":0.0009987,"children":null},"AgentSendState":{"count":7124,"self":0.096052,"total":1.0324202,"children":{"CollectObservations":{"count":56992,"self":0.86090769999999994,"total":0.86090769999999994,"children":null},"WriteActionMask":{"count":56992,"self":0.0154582,"total":0.0154582,"children":null},"RequestDecision":{"count":56992,"self":0.060002299999999995,"total":0.060002299999999995,"children":null}}},"DecideAction":{"count":7124,"self":0.11469789999999999,"total":0.11469789999999999,"children":null},"AgentAct":{"count":7124,"self":9.5978096,"total":9.5978094,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":32,"max":-814.3231,"min":-11971.2393,"runningAverage":-4576.09863,"value":-814.3231,"weightedAverage":-2660.61621}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691480553","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken E3xJ9L_3Ig0NQueh48ufPYRNPf4J2JoRlbnS3gUcFR000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1691480701"}}
Assets/MessageBoxController.cs
+31
View File
@@ -0,0 +1,31 @@
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class MessageBoxController : MonoBehaviour
{
public GameObject messagePanelObj;
public GameObject messageTextPrefab;
[SerializeField]
private List<Message> messages = new List<Message>();
public void PushMessage(string text)
{
Message newMessage = new Message();
newMessage.text = text;
GameObject newText = Instantiate(messageTextPrefab, messagePanelObj.transform);
newMessage.textObject = newText.GetComponent<TextMeshProUGUI>();
newMessage.textObject.text = newMessage.text;
messages.Add(newMessage);
}
[System.Serializable]
public class Message
{
public string text;
public TMPro.TextMeshProUGUI textObject;
}
}
Assets/MessageBoxController.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0d0b754dfadef484bbd36745abf1d796
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefeb/Message.prefab
+137
View File
@@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7800828413105135976
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7890471635030294927}
- component: {fileID: 8689853706318896445}
- component: {fileID: 6514250983489383611}
m_Layer: 5
m_Name: Message
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7890471635030294927
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800828413105135976}
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: 0}
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: -117.64585}
m_SizeDelta: {x: 614.9666, y: 10.9149}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8689853706318896445
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800828413105135976}
m_CullTransparentMesh: 1
--- !u!114 &6514250983489383611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7800828413105135976}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Text
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2}
m_sharedMaterial: {fileID: -4662725986004701985, guid: f653ac5b85a721e4c9383008e6a565a7, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, 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: 13
m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
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}
Assets/Prefeb/Message.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bdd79ceda95d4bd44a402c80049df6e8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Play.unity
+627 -4
View File
@@ -2856,6 +2856,84 @@ MonoBehaviour:
m_SelectedFaces:
m_SelectedEdges: []
m_SelectedVertices:
--- !u!1 &324069806
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 324069807}
- component: {fileID: 324069809}
- component: {fileID: 324069808}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &324069807
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324069806}
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: 1978965772}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: -246.20216}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &324069808
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324069806}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &324069809
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324069806}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &351933738
GameObject:
m_ObjectHideFlags: 0
@@ -4851,7 +4929,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh22996
m_Name: pb_Mesh60692
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -5330,6 +5408,82 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 532615954}
m_Mesh: {fileID: 287060331232230867, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3}
--- !u!1 &538300381
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 538300382}
- component: {fileID: 538300384}
- component: {fileID: 538300383}
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &538300382
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538300381}
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: 1918489415}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &538300383
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538300381}
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: 10905, 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!222 &538300384
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538300381}
m_CullTransparentMesh: 1
--- !u!1 &539817912
GameObject:
m_ObjectHideFlags: 1
@@ -5438,7 +5592,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh24008
m_Name: pb_Mesh61716
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -8159,6 +8313,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 794639596}
m_CullTransparentMesh: 1
--- !u!1 &808242909
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 808242910}
m_Layer: 5
m_Name: MessageBox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &808242910
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808242909}
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:
- {fileID: 933183368}
m_Father: {fileID: 2082200189}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &822320913
GameObject:
m_ObjectHideFlags: 0
@@ -8522,7 +8713,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh22958
m_Name: pb_Mesh60654
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -9090,6 +9281,115 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 928036774}
m_Mesh: {fileID: 1964926367440911766, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3}
--- !u!1 &933183367
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 933183368}
- component: {fileID: 933183371}
- component: {fileID: 933183370}
- component: {fileID: 933183369}
m_Layer: 5
m_Name: Scroll View
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &933183368
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933183367}
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:
- {fileID: 1978965772}
- {fileID: 1314966132}
m_Father: {fileID: 808242910}
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: -314.48853, y: 123.10107}
m_SizeDelta: {x: 628.9771, y: 246.2022}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &933183369
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933183367}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 324069807}
m_Horizontal: 1
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 1978965772}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 1314966133}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!114 &933183370
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933183367}
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: 0.21960786, g: 0.21960786, b: 0.21960786, 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: 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!222 &933183371
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933183367}
m_CullTransparentMesh: 1
--- !u!1 &942746279
GameObject:
m_ObjectHideFlags: 0
@@ -9772,6 +10072,54 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1026481343}
m_Mesh: {fileID: -1479511118752177815, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3}
--- !u!1 &1044511425
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1044511427}
- component: {fileID: 1044511426}
m_Layer: 0
m_Name: StartSceneDataTransferDummy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1044511426
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044511425}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3}
m_Name:
m_EditorClassIdentifier:
gameMode: 1
attackProb: 0
gotoProb: 0
defenceProb: 0
--- !u!4 &1044511427
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044511425}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1046425531
GameObject:
m_ObjectHideFlags: 0
@@ -11257,6 +11605,133 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1307400466}
m_CullTransparentMesh: 1
--- !u!1 &1314966131
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1314966132}
- component: {fileID: 1314966135}
- component: {fileID: 1314966134}
- component: {fileID: 1314966133}
m_Layer: 5
m_Name: Scrollbar Vertical
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1314966132
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314966131}
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:
- {fileID: 1918489415}
m_Father: {fileID: 933183368}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 14.8297, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1314966133
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314966131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 538300383}
m_HandleRect: {fileID: 538300382}
m_Direction: 2
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1314966134
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314966131}
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: 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!222 &1314966135
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314966131}
m_CullTransparentMesh: 1
--- !u!1 &1352953080
GameObject:
m_ObjectHideFlags: 0
@@ -17300,6 +17775,43 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1918489414
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1918489415}
m_Layer: 5
m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1918489415
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1918489414}
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:
- {fileID: 538300382}
m_Father: {fileID: 1314966132}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1928735334
GameObject:
m_ObjectHideFlags: 0
@@ -17772,7 +18284,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 586cc33424b6eb941a724f7235d76abe, type: 3}
m_Name:
m_EditorClassIdentifier:
targetDistanceThreshold: 6
enemyDistanceThreshold: 1
playCamera: {fileID: 1586670226}
AgentObj: {fileID: 629870337}
environmentObj: {fileID: 749443372}
mousePreviewObj: {fileID: 1178079198}
enemyContainerObj: {fileID: 891195334}
@@ -18108,6 +18623,97 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 500, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1978965771
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1978965772}
- component: {fileID: 1978965775}
- component: {fileID: 1978965774}
- component: {fileID: 1978965773}
m_Layer: 5
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1978965772
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978965771}
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:
- {fileID: 324069807}
m_Father: {fileID: 933183368}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1978965773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978965771}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!114 &1978965774
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978965771}
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: d29a01ced066fbe4f8366788af0ecb1a, 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!222 &1978965775
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978965771}
m_CullTransparentMesh: 1
--- !u!1 &1984237745
GameObject:
m_ObjectHideFlags: 0
@@ -19101,6 +19707,7 @@ GameObject:
- component: {fileID: 2082200186}
- component: {fileID: 2082200185}
- component: {fileID: 2082200190}
- component: {fileID: 2082200191}
m_Layer: 5
m_Name: HUD
m_TagString: Untagged
@@ -19204,6 +19811,7 @@ RectTransform:
- {fileID: 149218410}
- {fileID: 427803070}
- {fileID: 1185607142}
- {fileID: 808242910}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19231,6 +19839,21 @@ MonoBehaviour:
setGotoButton: {fileID: 371362500}
setFreeButton: {fileID: 1411671494}
setStayButton: {fileID: 1413466580}
--- !u!114 &2082200191
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2082200184}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d0b754dfadef484bbd36745abf1d796, type: 3}
m_Name:
m_EditorClassIdentifier:
messagePanelObj: {fileID: 324069806}
messageTextPrefab: {fileID: 7800828413105135976, guid: bdd79ceda95d4bd44a402c80049df6e8, type: 3}
messages: []
--- !u!1 &2099230616
GameObject:
m_ObjectHideFlags: 0
@@ -19455,7 +20078,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh23034
m_Name: pb_Mesh60730
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
Assets/Scenes/Train.unity
+48
View File
@@ -60867,6 +60867,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2139943208}
m_CullTransparentMesh: 1
--- !u!1 &2141008728
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2141008730}
- component: {fileID: 2141008729}
m_Layer: 0
m_Name: StartSceneDataTransferDummy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2141008729
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141008728}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52ba7faaa6129cf418f26c5933d4ea0e, type: 3}
m_Name:
m_EditorClassIdentifier:
gameMode: 0
attackProb: 0.3333333
gotoProb: 0.33333334
defenceProb: 0.33333334
--- !u!4 &2141008730
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141008728}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.954848, y: -124.757774, z: -32.582333}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2142017478
GameObject:
m_ObjectHideFlags: 0
Assets/Script/InGame/ParameterContainer.cs
+6 -9
View File
@@ -149,19 +149,16 @@ public class ParameterContainer : MonoBehaviour
{
// try get start scene data
startSceneData = GameObject.Find("StartSceneDataTransfer").GetComponent<StartSeneData>();
gameMode = startSceneData.gameMode;
attackProb = startSceneData.attackProb;
gotoProb = startSceneData.gotoProb;
defenceProb = startSceneData.defenceProb;
}
catch
{
Debug.LogError("PrameterContainer:Run WithOut StartScreen!");
gameMode = 0;
attackProb = 0.3333f;
gotoProb = 0.3333f;
defenceProb = 0.0f;
// if not found, find dummy StartSeneData
startSceneData = GameObject.Find("StartSceneDataTransferDummy").GetComponent<StartSeneData>();
}
gameMode = startSceneData.gameMode;
attackProb = startSceneData.attackProb;
gotoProb = startSceneData.gotoProb;
defenceProb = startSceneData.defenceProb;
}
private void Update()
Assets/Script/Play/MouseInMap.cs
+69 -10
View File
@@ -2,7 +2,11 @@ using UnityEngine;
public class MouseInMap : MonoBehaviour
{
public float targetDistanceThreshold = 6f;
public float enemyDistanceThreshold = 1f;
public Camera playCamera;
public GameObject AgentObj;
public GameObject environmentObj;
public GameObject mousePreviewObj;
public GameObject enemyContainerObj;
@@ -19,6 +23,7 @@ public class MouseInMap : MonoBehaviour
private MousePreview mousePreviewCon;
private EnemyContainer enemyCon;
private SceneBlockContainer sceneBlockCon;
private MessageBoxController messageCon;
private TargetUIController targetUICon;
public enum MouseMode
@@ -39,6 +44,7 @@ public class MouseInMap : MonoBehaviour
enemyCon = enemyContainerObj.GetComponent<EnemyContainer>();
sceneBlockCon = sceneBlockContainerObj.GetComponent<SceneBlockContainer>();
targetUICon = HUDObj.GetComponent<TargetUIController>();
messageCon = HUDObj.GetComponent<MessageBoxController>();
}
private void Update()
@@ -55,21 +61,46 @@ public class MouseInMap : MonoBehaviour
switch (mouseMode)
{
case MouseMode.AttackSet:
sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Attack, randBlockNum, nowHitPositionRelative);
sceneBlockCon.InitializeBlock(environmentObj);
targetCon.AttackModeChange(nowHitPositionRelative);
ChangeMouseModeTo(MouseMode.Default);
if (IsAgentorEnemyWithinDistance(targetDistanceThreshold))
{
// if agent or enemy is nearby, do not create new block
messageCon.PushMessage("Agent or Enemy is too close!");
}
else
{
// if agent or enemy is not nearby, create new block
sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Attack, randBlockNum, nowHitPositionRelative);
sceneBlockCon.InitializeBlock(environmentObj);
targetCon.AttackModeChange(nowHitPositionRelative);
ChangeMouseModeTo(MouseMode.Default);
}
break;
case MouseMode.GotoSet:
sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Go, randBlockNum, nowHitPositionRelative);
sceneBlockCon.InitializeBlock(environmentObj);
targetCon.GotoModeChange(nowHitPositionRelative);
ChangeMouseModeTo(MouseMode.Default);
if (IsAgentorEnemyWithinDistance(targetDistanceThreshold))
{
// if agent or enemy is nearby, do not create new block
messageCon.PushMessage("Agent or Enemy is too close!");
}
else
{
// if agent or enemy is not nearby, create new block
sceneBlockCon.CreateNewBlock(SceneBlockContainer.Targets.Go, randBlockNum, nowHitPositionRelative);
sceneBlockCon.InitializeBlock(environmentObj);
targetCon.GotoModeChange(nowHitPositionRelative);
ChangeMouseModeTo(MouseMode.Default);
}
break;
case MouseMode.EnemySet:
enemyCon.InitEnemyAtHere(new Vector3(nowHitPositionRelative.x, 1, nowHitPositionRelative.z));
if (IsAgentorEnemyWithinDistance(enemyDistanceThreshold))
{
messageCon.PushMessage("Agent or Enemy is too close!");
}
else
{
enemyCon.InitEnemyAtHere(new Vector3(nowHitPositionRelative.x, 1, nowHitPositionRelative.z));
}
break;
default:
@@ -100,7 +131,7 @@ public class MouseInMap : MonoBehaviour
case MouseMode.EnemySet:
preSet = enemyCon.enemyPrefab;
mousePreviewCon.ChangePreviewTo(preSet);
mousePreviewCon.ChangePreviewTo(preSet,true);
break;
default:
@@ -127,4 +158,32 @@ public class MouseInMap : MonoBehaviour
return Vector3.zero;
}
}
private bool IsAgentorEnemyWithinDistance(float distance)
{
// check all child object in enemyContainerObj
// if any child object is near by nowHitPosition in 10, return true
Vector3 playerPosition = Vector3.zero;
for (int i = 0; i < enemyContainerObj.transform.childCount; i++)
{
//set enemy Position's y as 0
playerPosition = enemyContainerObj.transform.GetChild(i).position;
playerPosition.y = 0;
// check if enemy near by nowHitPositionRelative in distance, return true
if (Vector3.Distance(playerPosition, nowHitPosition) < distance)
{
return true;
}
}
// set agentObj position's y as 0
playerPosition = AgentObj.transform.position;
playerPosition.y = 0;
// check if agentObj near by nowHitPositionRelative in distance, return true
if (Vector3.Distance(playerPosition, nowHitPosition) < distance)
{
return true;
}
// if no enemy or agent near by, return false
return false;
}
}
Assets/Script/Play/MousePreview.cs
+11 -2
View File
@@ -2,11 +2,20 @@ using UnityEngine;
public class MousePreview : MonoBehaviour
{
private GameObject nowMousePreviewObj;
// show mousePreviewObj in mouse position
public void ChangePreviewTo(GameObject mousePreviewObj)
public void ChangePreviewTo(GameObject mousePreviewObj, bool disableCollider = false)
{
// change mouse preview object to mousePreviewObj
// delete all child object
DeleteAllPreviewModele();
Instantiate(mousePreviewObj, transform.position, Quaternion.identity, this.transform);
// create new mouse preview object
nowMousePreviewObj = Instantiate(mousePreviewObj, transform.position, Quaternion.identity, this.transform);
if (disableCollider)
{
// disable mousePreviewObj collider
nowMousePreviewObj.GetComponent<Collider>().enabled = false;
}
}
public void UpdatePreviewPosition(Vector3 previewPos)