diff --git a/Assets/Image/UIIcons/New Folder/New Folder/image 5.png b/Assets/Image/UIIcons/New Folder/New Folder/image 5.png new file mode 100644 index 00000000..c85067b7 Binary files /dev/null and b/Assets/Image/UIIcons/New Folder/New Folder/image 5.png differ diff --git a/Assets/Image/UIIcons/New Folder/New Folder/image 5.png.meta b/Assets/Image/UIIcons/New Folder/New Folder/image 5.png.meta new file mode 100644 index 00000000..0e284363 --- /dev/null +++ b/Assets/Image/UIIcons/New Folder/New Folder/image 5.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 5fc27854b9f9d0340aa9ed974a17e1ac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UIBottomItems/Pallet.prefab b/Assets/Prefabs/UIBottomItems/Pallet.prefab index 1b6e9cec..7a877dd5 100644 --- a/Assets/Prefabs/UIBottomItems/Pallet.prefab +++ b/Assets/Prefabs/UIBottomItems/Pallet.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ffd8dea1dcf67c74598857a477c9cea1, type: 3} + m_Sprite: {fileID: 21300000, guid: 5fc27854b9f9d0340aa9ed974a17e1ac, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Prefabs/UITopItem/Panel_Top.prefab b/Assets/Prefabs/UITopItem/Panel_Top.prefab index 5868780a..a9866b43 100644 --- a/Assets/Prefabs/UITopItem/Panel_Top.prefab +++ b/Assets/Prefabs/UITopItem/Panel_Top.prefab @@ -36,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 5, y: -11.099976} + m_AnchoredPosition: {x: 0, y: -11.099976} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3479663202930124294 @@ -120,7 +120,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7268607606997911002} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SaveLoadmanager, Assembly-CSharp + m_MethodName: Onclick_Load + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &934614740091455935 GameObject: m_ObjectHideFlags: 0 @@ -173,6 +185,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ea6a631f762ef04192456d9b727b870, type: 3} m_Name: m_EditorClassIdentifier: + playing: {fileID: 21300000, guid: b4fb129380c3cd6449e0fd9f4e984b88, type: 3} + pause: {fileID: 21300000, guid: f8465c3df32cf1941889a4455097d8c7, type: 3} --- !u!1 &1484343671791922000 GameObject: m_ObjectHideFlags: 0 @@ -209,7 +223,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 5, y: 18.9} + m_AnchoredPosition: {x: 0, y: 18.9} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &761312154808162422 @@ -293,7 +307,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6963521550414918420} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SaveLoadmanager, Assembly-CSharp + m_MethodName: Onclick_Save + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1845158155271454765 GameObject: m_ObjectHideFlags: 0 @@ -450,7 +476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 100, y: 0} + m_AnchoredPosition: {x: 140, y: 0} m_SizeDelta: {x: 32, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7720192575072914581 @@ -722,7 +748,7 @@ MonoBehaviour: m_Calls: [] m_text: "\uD604\uC7AC \uD504\uB85C\uC81D\uD2B8 \uC800\uC7A5" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} m_sharedMaterial: {fileID: -6753151026297191121, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -788,7 +814,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7358382285419412982 @@ -882,12 +908,12 @@ GameObject: - component: {fileID: 8511915320376168177} - component: {fileID: 9068589371420247055} m_Layer: 5 - m_Name: Image + m_Name: Menu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2387822035400023919 RectTransform: m_ObjectHideFlags: 0 @@ -906,8 +932,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 40.6, y: -52} - m_SizeDelta: {x: 200, y: 70} + m_AnchoredPosition: {x: 55, y: -52} + m_SizeDelta: {x: 180, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8511915320376168177 CanvasRenderer: @@ -1014,8 +1040,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} - m_sharedMaterial: {fileID: -6753151026297191121, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} + m_fontAsset: {fileID: 11400000, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} + m_sharedMaterial: {fileID: -46050840830891302, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1045,7 +1071,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1272,7 +1298,7 @@ MonoBehaviour: m_Calls: [] m_text: "\uD604\uC7AC \uD504\uB85C\uC81D\uD2B8 \uC774\uB825\uBCF4\uAE30" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} m_sharedMaterial: {fileID: -6753151026297191121, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1338,7 +1364,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8873280493472229647 @@ -1526,10 +1552,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: x1 + m_text: x10 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} - m_sharedMaterial: {fileID: -6753151026297191121, guid: cc066fadc8e7f2c4b9a30b407a23f25f, type: 2} + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1605,6 +1631,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3942339534585702714} m_Modifications: + - target: {fileID: 5992737367196071414, guid: 7464b97708f2f314cba63d60288faa90, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3dada34195b658d4fab866194ed2bd18, type: 3} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1631,11 +1661,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_SizeDelta.x - value: 50 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 27 objectReference: {fileID: 0} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_LocalPosition.x @@ -1667,7 +1697,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 93.2 objectReference: {fileID: 0} - target: {fileID: 6156005559543558400, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_AnchoredPosition.y @@ -1687,9 +1717,10 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7878898471663763363, guid: 7464b97708f2f314cba63d60288faa90, type: 3} propertyPath: m_Name - value: Button_ObjectLibrary + value: Button_Complete objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6024736500805904301, guid: 7464b97708f2f314cba63d60288faa90, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index f7b37bcf..8336b3f0 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -3710,11 +3710,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a9d8c08cbd13f3419d22b5bafd16c28, type: 3} ---- !u!1 &364292883 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7848505445185673185, guid: 70235dca951c3f6439ad2255cb99a967, type: 3} - m_PrefabInstance: {fileID: 7082281200638192786} - m_PrefabAsset: {fileID: 0} --- !u!224 &384003842 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 225909343286015538, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} @@ -6033,122 +6028,10 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2104988513} - - target: {fileID: 935230306765955306, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1510331333423334356, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - - target: {fileID: 1510331333423334356, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_hasFontAssetChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1662530873374178191, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1662530873374178191, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1881100005057064159, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 2098207759045039967, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: pause - value: - objectReference: {fileID: 21300000, guid: f8465c3df32cf1941889a4455097d8c7, type: 3} - - target: {fileID: 2098207759045039967, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: playing - value: - objectReference: {fileID: 21300000, guid: b4fb129380c3cd6449e0fd9f4e984b88, type: 3} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1251266450} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Onclick_Save - objectReference: {fileID: 0} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: SaveLoadmanager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_SizeDelta.x - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 55 - objectReference: {fileID: 0} - - target: {fileID: 2625976704833552149, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_text - value: x10 - objectReference: {fileID: 0} - - target: {fileID: 2625976704833552149, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - - target: {fileID: 2625976704833552149, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - - target: {fileID: 2625976704833552149, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2808401242743568216, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} - - target: {fileID: 2808401242743568216, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_fontStyle - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2808401242743568216, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -46050840830891302, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} - - target: {fileID: 2808401242743568216, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3240717536119192961, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3725032065274074423, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_text - value: "\uD604\uC7AC \uD504\uB85C\uC81D\uD2B8 \uBD88\uB7EC\uC624\uAE30" - objectReference: {fileID: 0} - - target: {fileID: 3725032065274074423, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - - target: {fileID: 3725032065274074423, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_hasFontAssetChanged - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3913561980990034504, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -6233,30 +6116,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5292512457043580520, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_SizeDelta.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 5292512457043580520, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_SizeDelta.y - value: 27 - objectReference: {fileID: 0} - - target: {fileID: 5292512457043580520, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 93.2 - objectReference: {fileID: 0} - - target: {fileID: 5707807419597034142, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 3dada34195b658d4fab866194ed2bd18, type: 3} - - target: {fileID: 5728692613437472965, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: onPressed.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 364292883} - - target: {fileID: 5728692613437472965, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: onReleased.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 364292883} - target: {fileID: 5777075134164555596, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -6269,52 +6128,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2104988513} - - target: {fileID: 7723225891300246667, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_Name - value: Menu - objectReference: {fileID: 0} - - target: {fileID: 7723225891300246667, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8125092819254148577, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8163678206254586059, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_Name - value: Button_Complete - objectReference: {fileID: 0} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1251266450} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Onclick_Load - objectReference: {fileID: 0} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: SaveLoadmanager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5728692613437472965, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/WorkSpace/LH/Panel_SimulationUI.cs b/Assets/WorkSpace/LH/Panel_SimulationUI.cs index 99d78a5d..c2260529 100644 --- a/Assets/WorkSpace/LH/Panel_SimulationUI.cs +++ b/Assets/WorkSpace/LH/Panel_SimulationUI.cs @@ -140,7 +140,9 @@ namespace Octopus.Simulator void OnClickCompleteBTN() { - string requestAPI = $"{webmanager.apiConfig.history}/{WebParameters.id}/complete"; + string requestAPI = $"{webmanager.apiConfig.history}"; + Request_SimulationPause(null, $"{requestAPI}/{WebParameters.id}/pause"); + requestAPI = $"{webmanager.apiConfig.history}/{WebParameters.id}/complete"; Request_SimulationComplete(null, requestAPI); }