From 74c85c4296397bc8a1e140683af94225672d639f Mon Sep 17 00:00:00 2001 From: Koha9 Date: Mon, 5 Dec 2022 14:56:18 +0900 Subject: [PATCH] V2.1 Easier game! Build-ParallelEnv-Target-OffPolicy-SingleStack-SideChannel-EndReward-Easy-V2.1 move remain time position after target state easier game reward get, while watching or shoot at target area u get reward(attack mode), watching enemy u also get reward(Freemode) --- Assets/ML-Agents/Timers/InGame_timers.json | 2 +- Assets/Scenes/InGame.unity | 24 ++ Assets/Script/InGame/AgentWithGun.cs | 60 ++++- Assets/Script/InGame/ParameterContainer.cs | 5 + Assets/Script/InGame/TargetController.cs | 5 +- ProjectSettings/ProjectSettings.asset | 29 +- UserSettings/Layouts/default-2021.dwlt | 296 +++++---------------- 7 files changed, 179 insertions(+), 242 deletions(-) diff --git a/Assets/ML-Agents/Timers/InGame_timers.json b/Assets/ML-Agents/Timers/InGame_timers.json index 3b9c092..00d8091 100644 --- a/Assets/ML-Agents/Timers/InGame_timers.json +++ b/Assets/ML-Agents/Timers/InGame_timers.json @@ -1 +1 @@ -{"count":1,"self":10.5192528,"total":10.849220899999999,"children":{"InitializeActuators":{"count":16,"self":0.0015046,"total":0.0015046,"children":null},"InitializeSensors":{"count":16,"self":0.0015007,"total":0.0015007,"children":null},"AgentSendState":{"count":286,"self":0.0080161,"total":0.2672959,"children":{"CollectObservations":{"count":2288,"self":0.2547756,"total":0.2547756,"children":null},"WriteActionMask":{"count":2288,"self":0.0010035,"total":0.0010035,"children":null},"RequestDecision":{"count":2288,"self":0.0035007,"total":0.0035007,"children":null}}},"DecideAction":{"count":286,"self":0.0080269,"total":0.0080269,"children":null},"AgentAct":{"count":286,"self":0.0511388,"total":0.0511388,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1670110662","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 e96bd570-7311-11ed-acd6-8dc2264f2f57 -accessToken MoIZzq15aBLxocQuZONQNXLroHJT33mJvl_8kIgeC9I00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"InGame","end_time_seconds":"1670110673"}} \ No newline at end of file +{"count":1,"self":88.4663168,"total":93.048173699999992,"children":{"InitializeActuators":{"count":16,"self":0.0015,"total":0.0015,"children":null},"InitializeSensors":{"count":16,"self":0.0005015,"total":0.0005015,"children":null},"AgentSendState":{"count":4400,"self":0.078127,"total":3.6409806999999996,"children":{"CollectObservations":{"count":35200,"self":3.5124752,"total":3.5124754,"children":null},"WriteActionMask":{"count":35200,"self":0.015002399999999999,"total":0.015002399999999999,"children":null},"RequestDecision":{"count":35200,"self":0.0353759,"total":0.0353759,"children":null}}},"DecideAction":{"count":4400,"self":0.078818199999999991,"total":0.078818199999999991,"children":null},"AgentAct":{"count":4400,"self":0.86005639999999994,"total":0.86005639999999994,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":17,"max":1351.60059,"min":-5950.65674,"runningAverage":-3077.54785,"value":-1979.05139,"weightedAverage":-1586.92932}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1670219582","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 17fd75c0-73f2-11ed-ae93-8b2766ae699b -accessToken xyv47LyYfxjrKoKJF2JxRySrgVkeGaEV5onFZkcJqLE00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"InGame","end_time_seconds":"1670219675"}} \ No newline at end of file diff --git a/Assets/Scenes/InGame.unity b/Assets/Scenes/InGame.unity index 27a9368..4d2f5f5 100644 --- a/Assets/Scenes/InGame.unity +++ b/Assets/Scenes/InGame.unity @@ -587,6 +587,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &14770079 GameObject: m_ObjectHideFlags: 0 @@ -6159,6 +6160,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &202817962 GameObject: m_ObjectHideFlags: 0 @@ -8249,6 +8251,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -9573,6 +9577,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -13439,6 +13445,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &482717377 GameObject: m_ObjectHideFlags: 0 @@ -16520,6 +16527,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &588745181 GameObject: m_ObjectHideFlags: 0 @@ -19617,6 +19625,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -28488,6 +28498,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &1033213894 GameObject: m_ObjectHideFlags: 0 @@ -30893,6 +30904,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -38483,6 +38496,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -42968,6 +42983,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -43227,6 +43244,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &1692325237 GameObject: m_ObjectHideFlags: 0 @@ -43296,6 +43314,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &1692888382 GameObject: m_ObjectHideFlags: 0 @@ -51369,6 +51388,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -53633,6 +53654,8 @@ MonoBehaviour: killReward: 5 shootWithoutReadyReward: -0.15 killBonusReward: 0 + facingReward: 2 + shootTargetAreaReward: 5 speedPenalty: 0 spinPenalty: 0.04 hitTargetReward: 60 @@ -56197,6 +56220,7 @@ MonoBehaviour: - 0 - 0 - 0 + targetPosition: {x: 0, y: 0, z: 0} --- !u!1 &2071905738 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/InGame/AgentWithGun.cs b/Assets/Script/InGame/AgentWithGun.cs index ef329cf..3cfb4bf 100644 --- a/Assets/Script/InGame/AgentWithGun.cs +++ b/Assets/Script/InGame/AgentWithGun.cs @@ -10,6 +10,8 @@ using Unity.MLAgents.Sensors; using Unity.MLAgents.Actuators; using System.Linq; +using System.Drawing; +using Color = UnityEngine.Color; /*TODO: √tag 攻击排他 @@ -235,7 +237,7 @@ float ballistic() Vector3 point = new Vector3(thisCam.pixelWidth / 2, thisCam.pixelHeight / 2, 0);//发射位置 Ray ray = thisCam.ScreenPointToRay(point); RaycastHit hit; - Debug.DrawRay(ray.origin, ray.direction * 100, Color.blue); + // Debug.DrawRay(ray.origin, ray.direction * 100, Color.blue); //按下鼠标左键 if (shoot != 0 && gunReadyToggle == true) { @@ -245,27 +247,78 @@ float ballistic() { if (hit.collider.tag != myTag && hit.collider.tag != "Wall") { + // kill enemy GameObject gotHitObj = hit.transform.gameObject;//获取受到Ray撞击的对象 gotHitObj.GetComponent().ReactToHit(Damage, gameObject); shoot = 0; return targetCon.hitEnemyReward(gotHitObj.transform.position); } } + if (targetCon.targetTypeInt == (int)TargetController.Targets.Attack) + { + // while if attack mode + float targetDis = Vector3.Distance(blockContainer.thisBlock.transform.position, transform.position); + if (targetDis <= rayScript.viewDistance) + { + // Debug.DrawRay(new Vector3(0,0,0), viewPoint, Color.red); + if (Vector3.Distance(ray.origin + (ray.direction * targetDis), blockContainer.thisBlock.transform.position) <= blockContainer.thisBlock.firebasesAreaDiameter / 2) + { + // im shooting at target but didn't hit enemy + // Debug.DrawRay(ray.origin, viewPoint-ray.origin, Color.blue); + return paramContainer.shootTargetAreaReward; + } + } + } shoot = 0; return paramContainer.shootReward; } else if (shoot != 0 && gunReadyToggle == false) { + // shoot without ready shoot = 0; return paramContainer.shootWithoutReadyReward; } else { + // do not shoot shoot = 0; return paramContainer.nonReward; } } + float facingReward() + { + float thisReward = 0; + Ray ray = thisCam.ScreenPointToRay(new Vector3(thisCam.pixelWidth / 2, thisCam.pixelHeight / 2, 0)); + if (targetCon.targetTypeInt == (int)TargetController.Targets.Free) + { + //free mode + RaycastHit hit; + if (Physics.Raycast(ray, out hit, 100)) + { + if (hit.collider.tag != myTag && hit.collider.tag != "Wall") + { + thisReward = paramContainer.facingReward; + } + } + } + else if(targetCon.targetTypeInt == (int)TargetController.Targets.Attack) + { + float targetDis = Vector3.Distance(blockContainer.thisBlock.transform.position, transform.position); + if(targetDis <= rayScript.viewDistance) + { + // Debug.DrawRay(new Vector3(0,0,0), viewPoint, Color.red); + if (Vector3.Distance(ray.origin + (ray.direction * targetDis), blockContainer.thisBlock.transform.position) <= blockContainer.thisBlock.firebasesAreaDiameter / 2) + { + // im watching target + // Debug.DrawRay(ray.origin, viewPoint-ray.origin, Color.blue); + thisReward = paramContainer.facingReward; + } + } + } + return thisReward; + } + // getEnemyNum 获取现场除了自己以外的敌人数量 int getEnemyNum() { @@ -322,6 +375,9 @@ public float rewardCalculate(float sceneReward,float mouseX) } // 射击动作reward判断 epreward += ballistic() + sceneReward; + // facing reward + epreward += facingReward(); + // spin penalty spinRecord.Add(mouseX); if (spinRecord.Count >= paramContainer.spinRecordMax) { @@ -372,8 +428,8 @@ public override void CollectObservations(VectorSensor sensor) //sensor.AddObservation(allEnemyNum); // 敌人数量 int sensor.AddObservation(targetStates);// targettype, target x,y,z, firebasesAreaDiameter - sensor.AddObservation(remainTime); sensor.AddObservation(targetCon.getInAreaState()); + sensor.AddObservation(remainTime); sensor.AddObservation(myObserve); // 自机位置xyz+朝向 float[](4,1) sensor.AddObservation(rayTagResult); // 探测用RayTag结果 float[](raySensorNum,1) sensor.AddObservation(rayDisResult); // 探测用RayDis结果 float[](raySensorNum,1) diff --git a/Assets/Script/InGame/ParameterContainer.cs b/Assets/Script/InGame/ParameterContainer.cs index 7b41cfd..efe463c 100644 --- a/Assets/Script/InGame/ParameterContainer.cs +++ b/Assets/Script/InGame/ParameterContainer.cs @@ -70,6 +70,11 @@ public class ParameterContainer : MonoBehaviour public float shootWithoutReadyReward = -0.15f; [Tooltip("Kill bonus reward stack to nothing happend reward")] public float killBonusReward = 0.0f; + [Tooltip("Facing to enemy's reward")] + public float facingReward = 2.0f; + [Tooltip("Shoot at target area but didn't hit enemy")] + public float shootTargetAreaReward = 5.0f; + [Header("Penalty Rewards")] [Tooltip("Speed Penalty Reward")] public float speedPenalty = 0f; diff --git a/Assets/Script/InGame/TargetController.cs b/Assets/Script/InGame/TargetController.cs index fc30f03..57ecf98 100644 --- a/Assets/Script/InGame/TargetController.cs +++ b/Assets/Script/InGame/TargetController.cs @@ -51,7 +51,7 @@ public enum EndType { Win, Lose, Running, Num }; private float freeProb; private float sceneSize; private float lastDistance; - private Vector3 targetPosition; + public Vector3 targetPosition; private Vector3 targetLocalPosition; private bool firstRewardFlag = true; private bool targetEnemySpawnFinish = false; @@ -248,7 +248,8 @@ public void moveAgentTo(Vector3 thisPosition) (nowDistance, inArea) = blockCont.getAgentTargetDistanceAndInside(AgentObj.transform.position); envUICon.updateTargetGauge(blockCont.thisBlock.firebasesBelong, blockCont.thisBlock.belongMaxPoint); float areaTargetReward = getDistanceReward(nowDistance, inArea); - if (blockCont.thisBlock.firebasesBelong >= blockCont.thisBlock.belongMaxPoint) + // if (blockCont.thisBlock.firebasesBelong >= blockCont.thisBlock.belongMaxPoint) + if(inArea != 0) { // win // let the area belongs to me diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 738aca7..8063479 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: 6d8e5b7bfe71b01418058e48276cf380 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -88,7 +88,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 @@ -97,7 +97,7 @@ PlayerSettings: xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 - visibleInBackground: 1 + visibleInBackground: 0 allowFullscreenSwitch: 1 fullscreenMode: 3 xboxSpeechDB: 0 @@ -138,6 +138,8 @@ PlayerSettings: preloadedAssets: - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -147,11 +149,13 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: {} @@ -161,7 +165,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -217,6 +221,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -285,6 +290,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -320,7 +326,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -336,6 +342,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -347,6 +355,7 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -365,6 +374,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -495,7 +505,9 @@ PlayerSettings: switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -591,6 +603,7 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -601,8 +614,8 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -637,6 +650,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -680,6 +694,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -687,4 +702,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d618a5b..cab7b31 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,90 +15,16 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 70 - y: 37 + y: 53 width: 1840 height: 1019 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 12} + m_Title: Project + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 542} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: -1113 - y: -679 - width: 1117 - height: 630 - m_ShowMode: 0 - m_Title: Game - m_RootView: {fileID: 4} - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1117 - height: 630 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1117 - height: 630 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 146 ---- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -119,13 +45,13 @@ MonoBehaviour: height: 384 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} - - {fileID: 17} + - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -138,8 +64,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 5} + - {fileID: 12} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 @@ -149,8 +75,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 17 ---- !u!114 &7 + controlID: 65 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,14 +95,14 @@ MonoBehaviour: y: 375 width: 229 height: 594 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -189,8 +115,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 7} + - {fileID: 6} + - {fileID: 4} m_Position: serializedVersion: 2 x: 1094 @@ -200,8 +126,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 114 ---- !u!114 &9 + controlID: 119 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -222,12 +148,12 @@ MonoBehaviour: height: 375 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -240,9 +166,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} + - {fileID: 3} + - {fileID: 5} - {fileID: 8} - - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -252,8 +178,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 26 ---- !u!114 &11 + controlID: 28 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -272,14 +198,14 @@ MonoBehaviour: y: 0 width: 517 height: 969 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,9 +218,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - {fileID: 10} - - {fileID: 14} + - {fileID: 7} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -307,7 +233,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -329,7 +255,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -350,7 +276,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -371,104 +297,12 @@ MonoBehaviour: height: 585 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: -1113 - y: -679 - width: 1117 - height: 609 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1117, y: 588} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 1 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -558.5 - m_HBaseRangeMax: 558.5 - m_VBaseRangeMin: -294 - m_VBaseRangeMax: 294 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1117 - height: 588 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 558.5, y: 294} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -558.5 - y: -294 - width: 1117 - height: 588 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1117, y: 609} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -496,7 +330,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -517,7 +351,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 70 - y: 652 + y: 668 width: 1093 height: 363 m_ViewDataDictionary: {fileID: 0} @@ -537,22 +371,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Script/InGame m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Script/InGame m_LastFoldersGridSize: 16 m_LastProjectPath: C:\Users\UCUNI\OneDrive\Unity\ML-Agents\Aimbot-ParallelEnv m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 22} - m_SelectedIDs: 34780000 - m_LastClickedID: 30772 - m_ExpandedIDs: 000000003478000036780000387800003a7800003c78000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 6a780000 + m_LastClickedID: 30826 + m_ExpandedIDs: 00000000287800002a7800002c7800002e780000307800006478000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -568,7 +402,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 2} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -580,7 +414,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003478000036780000387800003a7800003c780000 + m_ExpandedIDs: 00000000287800002a7800002c7800002e78000030780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -607,7 +441,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -624,7 +458,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 2} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -636,7 +470,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 355 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -657,7 +491,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1393 - y: 67 + y: 83 width: 516 height: 948 m_ViewDataDictionary: {fileID: 0} @@ -671,13 +505,13 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 257 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -698,7 +532,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1164 - y: 67 + y: 83 width: 227 height: 354 m_ViewDataDictionary: {fileID: 0} @@ -708,9 +542,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a8c40400aacb040018c10400aac00400bcd00400e6cf0400cec804005ecd0400 - m_LastClickedID: 314718 - m_ExpandedIDs: 26bcf7ff84bcf7ff06bef7ff7cfaf7ffd8faf7ff5afcf7ff2cfbffff02680000fa6a00000e6b0000 + m_SelectedIDs: 180e0000 + m_LastClickedID: 0 + m_ExpandedIDs: 32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,7 +560,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 6} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -734,7 +568,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -755,7 +589,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 70 - y: 67 + y: 83 width: 1093 height: 564 m_ViewDataDictionary: {fileID: 0} @@ -1072,7 +906,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1093,7 +927,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1164 - y: 442 + y: 458 width: 227 height: 573 m_ViewDataDictionary: {fileID: 0}