diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index cec733c8..64d71e8a 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 42d77707..1b3c8c5e 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/GZN4_toufa_AlbedoTransparency.mat b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/GZN4_toufa_AlbedoTransparency.mat index 78db219c..882a5f34 100644 --- a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/GZN4_toufa_AlbedoTransparency.mat +++ b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/GZN4_toufa_AlbedoTransparency.mat @@ -70,7 +70,7 @@ Material: - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - - _CutoffMainTexA: 0.35 + - _CutoffMainTexA: 0.1 - _DetailNormalMapScale: 1 - _DstBlend: 10 - _Emiss: 0.3 diff --git a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa1_N.mat b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa1_N.mat index e8bf1aef..1642989f 100644 --- a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa1_N.mat +++ b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa1_N.mat @@ -71,7 +71,7 @@ Material: - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - - _CutoffMainTexA: 0.35 + - _CutoffMainTexA: 0.1 - _DetailNormalMapScale: 1 - _DstBlend: 10 - _Emiss: 0.3 diff --git a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa2_N.mat b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa2_N.mat index 8b68602b..bd0aa052 100644 --- a/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa2_N.mat +++ b/Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/TouFa2_N.mat @@ -75,7 +75,7 @@ Material: - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - - _CutoffMainTexA: 0.97 + - _CutoffMainTexA: 0.1 - _DetailNormalMapScale: 1 - _DstBlend: 10 - _Emiss: 0.3 diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset index 63928f81..6fc69890 100644 --- a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset @@ -16,7 +16,7 @@ MonoBehaviour: deleteDllAfterBuilds: 1 AutomateForAllAOTPlatforms: 1 automateForPlatforms: 0900000014000000 - lastScan: 638324005100560832 + lastScan: 638325477075088507 supportSerializedTypes: - TypeName: UnityEngine.Animator, UnityEngine.AnimationModule IsCustom: 0 diff --git a/Assets/UnityTest/ZXL/Scene/Main.unity b/Assets/UnityTest/ZXL/Scene/Main.unity index a3950364..bdaaa996 100644 --- a/Assets/UnityTest/ZXL/Scene/Main.unity +++ b/Assets/UnityTest/ZXL/Scene/Main.unity @@ -5123,7 +5123,6 @@ GameObject: - component: {fileID: 63966360} - component: {fileID: 63966359} - component: {fileID: 63966358} - - component: {fileID: 63966361} m_Layer: 0 m_Name: btnFirst m_TagString: Untagged @@ -5209,7 +5208,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5234,27 +5233,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 63966356} m_CullTransparentMesh: 1 ---- !u!95 &63966361 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 63966356} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: a0549ff8566be4342a2b225eb0f386f2, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &65697596 GameObject: m_ObjectHideFlags: 0 @@ -6615,6 +6593,130 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 87782773} m_CullTransparentMesh: 1 +--- !u!1001 &93056642 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 876251035} + m_Modifications: + - target: {fileID: 2657602411704145122, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: roleLabelType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145132, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_Name + value: RoleLabel + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_SizeDelta.x + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_SizeDelta.y + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.985 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.102 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.004 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2657602411704145133, guid: 5e54fe8237c73384d8d83698b89bbebc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e54fe8237c73384d8d83698b89bbebc, type: 3} --- !u!1 &94533632 GameObject: m_ObjectHideFlags: 0 @@ -63010,6 +63112,7 @@ RectTransform: m_Children: - {fileID: 977099416} - {fileID: 782506035} + - {fileID: 1116591617} - {fileID: 1210434791} m_Father: {fileID: 1090974246} m_RootOrder: 1 @@ -64417,6 +64520,8 @@ MonoBehaviour: uiType: 6 btnFirst: {fileID: 63966358} btnSecond: {fileID: 782506036} + imgFirstAni: {fileID: 958286899} + imgSecondAni: {fileID: 1116591618} imgFirst: {fileID: 1284254521} imgSecond: {fileID: 1210434792} yes_Garden: {fileID: 21300000, guid: 6d698f3aab24b734d9f1c239933e0591, type: 3} @@ -68987,7 +69092,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -77097,6 +77202,12 @@ MonoBehaviour: m_StringArgument: Timeline2_1_Over m_BoolArgument: 0 m_CallState: 2 +--- !u!4 &876251035 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1840860959507767077, guid: 94d23ca31c1409c46b6a3e643ec6f2f7, + type: 3} + m_PrefabInstance: {fileID: 876251030} + m_PrefabAsset: {fileID: 0} --- !u!1 &880204675 GameObject: m_ObjectHideFlags: 0 @@ -82596,6 +82707,82 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &958286897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 958286898} + - component: {fileID: 958286900} + - component: {fileID: 958286899} + m_Layer: 0 + m_Name: btnFirstAni + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &958286898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958286897} + 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: 1114099485} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 410, y: 89} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &958286899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958286897} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6d698f3aab24b734d9f1c239933e0591, 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 &958286900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958286897} + m_CullTransparentMesh: 1 --- !u!4 &958984725 stripped Transform: m_CorrespondingSourceObject: {fileID: 5481551269930119836, guid: d1b78823b7211bb42b065da49e74d879, @@ -88960,7 +89147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037799741} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.000000008830318, y: 1.0699999, z: -2.699074} + m_LocalPosition: {x: 0.000000008830318, y: 1.0699999, z: -4.062} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -99006,6 +99193,7 @@ RectTransform: m_Children: - {fileID: 1181255829} - {fileID: 63966357} + - {fileID: 958286898} - {fileID: 1284254520} m_Father: {fileID: 1090974246} m_RootOrder: 0 @@ -99123,6 +99311,82 @@ Transform: m_Father: {fileID: 1313866111} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1116591616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1116591617} + - component: {fileID: 1116591619} + - component: {fileID: 1116591618} + m_Layer: 0 + m_Name: btnSecondAni + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1116591617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116591616} + 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: 719902841} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 412.9, y: -156.2} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1116591618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116591616} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6d698f3aab24b734d9f1c239933e0591, 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 &1116591619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116591616} + m_CullTransparentMesh: 1 --- !u!1 &1116707637 GameObject: m_ObjectHideFlags: 0 @@ -104826,7 +105090,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.000061030285, y: 64.99993} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 2547.6792, y: 1433.0693} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1176915448 MonoBehaviour: @@ -104884,9 +105148,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -106787,7 +107051,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 719902841} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -106808,9 +107072,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -111669,7 +111933,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1114099485} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -111690,9 +111954,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -143179,7 +143443,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638192196} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: diff --git a/Assets/UnityTest/ZXL/Scripts/UI/ChoiceQuestionUI.cs b/Assets/UnityTest/ZXL/Scripts/UI/ChoiceQuestionUI.cs index 8297421c..6fda29b1 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/ChoiceQuestionUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/ChoiceQuestionUI.cs @@ -1,4 +1,6 @@ using System; +using Cysharp.Threading.Tasks; +using DragonSoul.Shared; using Mono.Event; using TMPro; using UnityEngine; @@ -11,6 +13,9 @@ namespace UnityTest.ZXL public Button btnFirst; public Button btnSecond; + public Image imgFirstAni; + public Image imgSecondAni; + public Image imgFirst; public Image imgSecond; @@ -20,6 +25,8 @@ namespace UnityTest.ZXL public Sprite yes_Text; public Sprite no_Text; + private ETTask task; + public override void OnInit() { base.OnInit(); @@ -34,36 +41,52 @@ namespace UnityTest.ZXL btnFirst.enabled = true; btnSecond.enabled = false; - btnFirst.GetComponent().enabled = true; - btnSecond.GetComponent().enabled = false; - - btnFirst.image.sprite = yes_Garden; + imgFirstAni.sprite = yes_Garden; imgFirst.sprite = yes_Text; - btnSecond.image.sprite = no_Garden; + imgSecondAni.sprite = no_Garden; imgSecond.sprite = no_Text; + + ImageRotateAsync(imgFirstAni).Coroutine(); } else if (index == 1) { btnFirst.enabled = false; btnSecond.enabled = true; - btnFirst.GetComponent().enabled = false; - btnSecond.GetComponent().enabled = true; - - btnFirst.image.sprite = no_Garden; + imgFirstAni.sprite = no_Garden; imgFirst.sprite = no_Text; - btnSecond.image.sprite = yes_Garden; + imgSecondAni.sprite = yes_Garden; imgSecond.sprite = yes_Text; + + ImageRotateAsync(imgSecondAni).Coroutine(); } } + async ETTask ImageRotateAsync(Image image) + { + task = ETTask.Create(); + + while (true) + { + if (task.IsCompleted) + break; + + await UniTask.Yield(); + image.transform.localEulerAngles += new Vector3(0, 0, -1); + } + + image.transform.localEulerAngles = Vector3.zero; + } + private void ClickFirst() { + task.SetResult(); EventManager.Instance.FireNow(this, new ChoiceQuestionEventArgs(true)); } private void ClickSecond() { + task.SetResult(); EventManager.Instance.FireNow(this, new ChoiceQuestionEventArgs(false)); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index af134e4b..56594362 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -149,6 +149,7 @@ PlayerSettings: preloadedAssets: - {fileID: 0} - {fileID: 0} + - {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1