From 5ccaeefa5c4d2761c26ac2a027b2d7acdf63b157 Mon Sep 17 00:00:00 2001 From: Koha9 Date: Mon, 16 Oct 2023 19:41:25 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCanvas=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=97=B6UI=E4=B8=8D=E9=9A=8F=E4=B9=8B?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=94=99=E8=AF=AF=E3=80=82=E4=BD=BF=E7=94=A8?= =?UTF-8?q?UIColorContainer=E6=9D=A5=E5=82=A8=E5=AD=98Color=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ML-Agents/Timers/StartScene_timers.json | 2 +- Assets/ML-Agents/Timers/Train_timers.json | 2 +- Assets/Prefeb/UIColors.asset | 42 +++++++++ Assets/Prefeb/UIColors.asset.meta | 8 ++ Assets/Scenes/StartScene.unity | 93 ++----------------- Assets/Scenes/Train.unity | 30 +++--- .../Script/UI/ButtonActivateColorChanger.cs | 55 ++++++----- .../{Start => UI}/StartMenuAnimations.cs | 49 ++++++---- .../{Start => UI}/StartMenuAnimations.cs.meta | 0 Assets/Script/{Start => UI}/StartUIManager.cs | 0 .../{Start => UI}/StartUIManager.cs.meta | 0 Assets/Script/UI/UIColorContainer.cs | 38 ++++++-- UserSettings/EditorUserSettings.asset | 6 +- 13 files changed, 171 insertions(+), 154 deletions(-) create mode 100644 Assets/Prefeb/UIColors.asset create mode 100644 Assets/Prefeb/UIColors.asset.meta rename Assets/Script/{Start => UI}/StartMenuAnimations.cs (53%) rename Assets/Script/{Start => UI}/StartMenuAnimations.cs.meta (100%) rename Assets/Script/{Start => UI}/StartUIManager.cs (100%) rename Assets/Script/{Start => UI}/StartUIManager.cs.meta (100%) diff --git a/Assets/ML-Agents/Timers/StartScene_timers.json b/Assets/ML-Agents/Timers/StartScene_timers.json index 2f90808..9347eaa 100644 --- a/Assets/ML-Agents/Timers/StartScene_timers.json +++ b/Assets/ML-Agents/Timers/StartScene_timers.json @@ -1 +1 @@ -{"count":1,"self":10.2447512,"total":10.2987626,"children":{"InitializeActuators":{"count":2,"self":0.0009994,"total":0.0009994,"children":null},"InitializeSensors":{"count":2,"self":0.00099859999999999988,"total":0.00099859999999999988,"children":null},"AgentSendState":{"count":169,"self":0.0025004,"total":0.009501299999999999,"children":{"CollectObservations":{"count":169,"self":0.0050025999999999994,"total":0.0050025999999999994,"children":null},"WriteActionMask":{"count":169,"self":0.0004994,"total":0.0004994,"children":null},"RequestDecision":{"count":169,"self":0.0014988999999999998,"total":0.0014988999999999998,"children":null}}},"DecideAction":{"count":169,"self":0.0025041,"total":0.0025041,"children":null},"AgentAct":{"count":169,"self":0.0400077,"total":0.0400077,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1696963654","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 7c3dcd5a-daae-43b1-a2e8-4bb346bbb4e5 -accessToken G6W4ifPeN-JJvIEsustzRofGrXpwOepV108yPK_cjPA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1696963665"}} \ No newline at end of file +{"count":1,"self":96.1897728,"total":96.582275299999992,"children":{"InitializeActuators":{"count":16,"self":0.00099899999999999989,"total":0.00099899999999999989,"children":null},"InitializeSensors":{"count":16,"self":0.0009993,"total":0.0009993,"children":null},"AgentSendState":{"count":867,"self":0.019012499999999998,"total":0.1588117,"children":{"CollectObservations":{"count":6936,"self":0.1277917,"total":0.1277917,"children":null},"WriteActionMask":{"count":6936,"self":0.0040009,"total":0.0040009,"children":null},"RequestDecision":{"count":6936,"self":0.0080066,"total":0.0080066,"children":null}}},"DecideAction":{"count":867,"self":0.0100142,"total":0.0100142,"children":null},"AgentAct":{"count":867,"self":0.2216761,"total":0.2216761,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1697442592","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 e4e811a4-b1b9-40c9-bb87-1f58481c4f0b -accessToken CFEM6A4XwpAEfTmhoY1tJ77LSedBMNIqUlXBOmvKzJY00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"StartScene","end_time_seconds":"1697442688"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Train_timers.json b/Assets/ML-Agents/Timers/Train_timers.json index 9bec457..1e8a92a 100644 --- a/Assets/ML-Agents/Timers/Train_timers.json +++ b/Assets/ML-Agents/Timers/Train_timers.json @@ -1 +1 @@ -{"count":1,"self":66.9065984,"total":71.9882009,"children":{"InitializeActuators":{"count":16,"self":0.0009969,"total":0.0009969,"children":null},"InitializeSensors":{"count":16,"self":0.0009994,"total":0.0009994,"children":null},"AgentSendState":{"count":3334,"self":0.044007,"total":0.43848919999999997,"children":{"CollectObservations":{"count":26672,"self":0.3689863,"total":0.3689863,"children":null},"WriteActionMask":{"count":26672,"self":0.0044905,"total":0.0044905,"children":null},"RequestDecision":{"count":26672,"self":0.0210054,"total":0.0210054,"children":null}}},"DecideAction":{"count":3334,"self":0.0480142,"total":0.0480142,"children":null},"AgentAct":{"count":3334,"self":4.5931028,"total":4.5931029,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":18,"max":4761.187,"min":-3316.413,"runningAverage":119.63308,"value":4761.187,"weightedAverage":2609.449}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1697400022","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 e4e811a4-b1b9-40c9-bb87-1f58481c4f0b -accessToken gZraEFpga1zyWWe2F_cgXvA55kRNGoKgEeraCZAmspA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1697400094"}} \ No newline at end of file +{"count":1,"self":28.5910528,"total":28.601550099999997,"children":{"InitializeActuators":{"count":16,"self":0.0010008,"total":0.0010008,"children":null},"InitializeSensors":{"count":16,"self":0.001,"total":0.001,"children":null},"AgentSendState":{"count":1,"self":0.0009989,"total":0.0034985,"children":{"CollectObservations":{"count":8,"self":0.0014998,"total":0.0014998,"children":null},"WriteActionMask":{"count":8,"self":0,"total":0,"children":null},"RequestDecision":{"count":8,"self":0.0009998,"total":0.0009998,"children":null}}},"DecideAction":{"count":1,"self":0.0005,"total":0.0005,"children":null},"AgentAct":{"count":1,"self":0.0044989,"total":0.0044989,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1697452285","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 e4e811a4-b1b9-40c9-bb87-1f58481c4f0b -accessToken CFEM6A4XwpAEfTmhoY1tJ77LSedBMNIqUlXBOmvKzJY00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1697452314"}} \ No newline at end of file diff --git a/Assets/Prefeb/UIColors.asset b/Assets/Prefeb/UIColors.asset new file mode 100644 index 0000000..55a4ed0 --- /dev/null +++ b/Assets/Prefeb/UIColors.asset @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 11500000, guid: 3fef23608d0a5d242a781d8ca28ed23b, type: 3} + m_Name: UIColors + m_EditorClassIdentifier: + normal: + text: + serializedVersion: 2 + rgba: 4293717228 + bg: + serializedVersion: 2 + rgba: 16777215 + highLight: + text: + serializedVersion: 2 + rgba: 3861457193 + bg: + serializedVersion: 2 + rgba: 1744830463 + pressed: + text: + serializedVersion: 2 + rgba: 4026531840 + bg: + serializedVersion: 2 + rgba: 2701131775 + disabled: + text: + serializedVersion: 2 + rgba: 1354020020 + bg: + serializedVersion: 2 + rgba: 16777215 diff --git a/Assets/Prefeb/UIColors.asset.meta b/Assets/Prefeb/UIColors.asset.meta new file mode 100644 index 0000000..6de2bb5 --- /dev/null +++ b/Assets/Prefeb/UIColors.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c75edf08eba25eb40896936387c07e89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/StartScene.unity b/Assets/Scenes/StartScene.unity index 9b29371..3539b63 100644 --- a/Assets/Scenes/StartScene.unity +++ b/Assets/Scenes/StartScene.unity @@ -942,7 +942,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -61, y: 215} + m_AnchoredPosition: {x: 411.6, y: -24.599976} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &431112176 @@ -2096,55 +2096,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1129476375 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1129476376} - - component: {fileID: 1129476377} - m_Layer: 5 - m_Name: UIColorContainer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1129476376 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129476375} - 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: 1144208399} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1129476377 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129476375} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3fef23608d0a5d242a781d8ca28ed23b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1144208395 GameObject: m_ObjectHideFlags: 0 @@ -2247,7 +2198,6 @@ RectTransform: - {fileID: 1614969824} - {fileID: 1899537997} - {fileID: 237721382} - - {fileID: 1129476376} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2645,10 +2595,10 @@ MonoBehaviour: gotoButton: {fileID: 1614969818} freeButton: {fileID: 1899537996} animeDuration: 0.2 - mixDestination: {x: -85, y: 29, z: 0} - attackDestination: {x: -100, y: 0, z: 0} - gotoDestination: {x: -115, y: -29, z: 0} - freeDestination: {x: -130, y: -58, z: 0} + animeMoveXDistance: 5 + animeMoveYDistance: 10 + animeScaleX: 3 + animeScaleY: 3 maskScaleX: 1 maskScaleY: 0.4 --- !u!114 &1432557595 @@ -2670,32 +2620,9 @@ MonoBehaviour: unclickableButton: - {fileID: 850190065} - {fileID: 546575679} - normalTextColor: - serializedVersion: 2 - rgba: 4293717228 - normalBGColor: - serializedVersion: 2 - rgba: 16777215 - highLightTextColor: - serializedVersion: 2 - rgba: 3861457193 - highLightBGColor: - serializedVersion: 2 - rgba: 1744830463 - pressedTextColor: - serializedVersion: 2 - rgba: 4026531840 - pressedBGColor: - serializedVersion: 2 - rgba: 2701131775 - disableTextColor: - serializedVersion: 2 - rgba: 1354020020 - disableBGColor: - serializedVersion: 2 - rgba: 16777215 colorChangeSpeed: 0.1 clickable: 1 + uiColor: {fileID: 11400000, guid: c75edf08eba25eb40896936387c07e89, type: 2} --- !u!1 &1575146385 GameObject: m_ObjectHideFlags: 0 @@ -2729,9 +2656,9 @@ RectTransform: m_Father: {fileID: 1144208399} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1614969818 @@ -3403,7 +3330,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -372, y: 211} + m_AnchoredPosition: {x: 100.6, y: -28.6} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2145851918 diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index bc2f118..99880f7 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -10008,7 +10008,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30798 + m_Name: pb_Mesh30802 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -12884,7 +12884,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh27090 + m_Name: pb_Mesh27092 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15870,7 +15870,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh27172 + m_Name: pb_Mesh27174 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25621,7 +25621,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh26962 + m_Name: pb_Mesh26964 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -39264,14 +39264,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: f6d46f1e916b3486c90a448a441fac6a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.8867924, g: 0.8867924, b: 0.8867924, 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_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -39307,8 +39307,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -94.1, y: -35.076} - m_SizeDelta: {x: 171.8483, y: 52.1512} + m_AnchoredPosition: {x: -98.800446, y: -35.076004} + m_SizeDelta: {x: 181.2491, y: 52.1512} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1403501266 GameObject: @@ -40705,7 +40705,7 @@ RectTransform: 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.20192} + m_AnchoredPosition: {x: 0.000030517578, y: -246.20204} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1442113294 @@ -43031,15 +43031,15 @@ MonoBehaviour: In Next Episode' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 07e34e9000492a2468743178b0960f4e, type: 2} + m_sharedMaterial: {fileID: -5512001432465614552, guid: 07e34e9000492a2468743178b0960f4e, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -43056,10 +43056,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 21.45 m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 diff --git a/Assets/Script/UI/ButtonActivateColorChanger.cs b/Assets/Script/UI/ButtonActivateColorChanger.cs index dde9e9e..9eda8b2 100644 --- a/Assets/Script/UI/ButtonActivateColorChanger.cs +++ b/Assets/Script/UI/ButtonActivateColorChanger.cs @@ -10,29 +10,25 @@ public class ButtonActivateColorChanger : MonoBehaviour public List