diff --git a/Assets/arts/animations/ui/common.meta b/Assets/arts/animations/ui/common.meta new file mode 100644 index 000000000..d34e78efe --- /dev/null +++ b/Assets/arts/animations/ui/common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14fe12151789332489994f9fd5282166 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/animations/ui/common/net_wait.anim b/Assets/arts/animations/ui/common/net_wait.anim new file mode 100644 index 000000000..e801b777f --- /dev/null +++ b/Assets/arts/animations/ui/common/net_wait.anim @@ -0,0 +1,316 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: net_wait + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: -303.6228} + outSlope: {x: 0, y: 0, z: -303.6228} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.1801035} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: -180} + inSlope: {x: 0, y: 0, z: -360} + outSlope: {x: 0, y: 0, z: -360} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0, y: 0, z: -720} + inSlope: {x: 0, y: 0, z: -601.9532} + outSlope: {x: 0, y: 0, z: -601.9532} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.16654646} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: filled + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FillAmount + path: filled + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2659786162 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2659786162 + attribute: 3063383489 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FillAmount + path: filled + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: filled + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: filled + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -303.6228 + outSlope: -303.6228 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.1801035 + - serializedVersion: 3 + time: 1 + value: -180 + inSlope: -360 + outSlope: -360 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -720 + inSlope: -601.9532 + outSlope: -601.9532 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.16654646 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: filled + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: filled + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: filled + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: filled + classID: 224 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/arts/animations/ui/common/net_wait.anim.meta b/Assets/arts/animations/ui/common/net_wait.anim.meta new file mode 100644 index 000000000..b6738f0ef --- /dev/null +++ b/Assets/arts/animations/ui/common/net_wait.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 567abe4a0a4aa4b478fff87fb5c43756 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: arts/animations/ui/common.ab + assetBundleVariant: diff --git a/Assets/arts/animations/ui/common/net_wait.controller b/Assets/arts/animations/ui/common/net_wait.controller new file mode 100644 index 000000000..ca95cdc94 --- /dev/null +++ b/Assets/arts/animations/ui/common/net_wait.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: net_wait + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107371131471912606} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102560177217419028 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: net_wait + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 567abe4a0a4aa4b478fff87fb5c43756, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107371131471912606 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102560177217419028} + m_Position: {x: 290, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102560177217419028} diff --git a/Assets/arts/animations/ui/common/net_wait.controller.meta b/Assets/arts/animations/ui/common/net_wait.controller.meta new file mode 100644 index 000000000..0628d4841 --- /dev/null +++ b/Assets/arts/animations/ui/common/net_wait.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4abfb614b9b4b9e45a8f16b8c1505f87 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: arts/animations/ui/common.ab + assetBundleVariant: diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index c4ddc5503..0bab2f74d 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -82,6 +82,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3} - {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3} - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} + - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} @@ -132,6 +133,7 @@ SpriteAtlas: - common_progress_1 - common_title_5 - common_title_4 + - common_circle - common_dec_2 - common_toast_1 - common_board_5 diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes index 6a6900af1..9eb60995b 100644 Binary files a/Assets/arts/spines/characters/p0001/p0001.skel.bytes and b/Assets/arts/spines/characters/p0001/p0001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes b/Assets/arts/spines/characters/p0002/p0002.skel.bytes index 634644f15..8339eca00 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.skel.bytes and b/Assets/arts/spines/characters/p0002/p0002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0003/p0003.skel.bytes b/Assets/arts/spines/characters/p0003/p0003.skel.bytes index 8a4a87bae..cca511a20 100644 Binary files a/Assets/arts/spines/characters/p0003/p0003.skel.bytes and b/Assets/arts/spines/characters/p0003/p0003.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0004/p0004.skel.bytes b/Assets/arts/spines/characters/p0004/p0004.skel.bytes index 03406cd00..6f44194f4 100644 Binary files a/Assets/arts/spines/characters/p0004/p0004.skel.bytes and b/Assets/arts/spines/characters/p0004/p0004.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0005/p0005.skel.bytes b/Assets/arts/spines/characters/p0005/p0005.skel.bytes index 664899018..83a7111c6 100644 Binary files a/Assets/arts/spines/characters/p0005/p0005.skel.bytes and b/Assets/arts/spines/characters/p0005/p0005.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0007/p0007.skel.bytes b/Assets/arts/spines/characters/p0007/p0007.skel.bytes index 12ce1728b..b298b066b 100644 Binary files a/Assets/arts/spines/characters/p0007/p0007.skel.bytes and b/Assets/arts/spines/characters/p0007/p0007.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0008/p0008.skel.bytes b/Assets/arts/spines/characters/p0008/p0008.skel.bytes index f09f6bc7a..ffe4cb580 100644 Binary files a/Assets/arts/spines/characters/p0008/p0008.skel.bytes and b/Assets/arts/spines/characters/p0008/p0008.skel.bytes differ diff --git a/Assets/arts/textures/ui/common/common_circle.png b/Assets/arts/textures/ui/common/common_circle.png new file mode 100644 index 000000000..0550970dd Binary files /dev/null and b/Assets/arts/textures/ui/common/common_circle.png differ diff --git a/Assets/arts/textures/ui/common/common_circle.png.meta b/Assets/arts/textures/ui/common/common_circle.png.meta new file mode 100644 index 000000000..ff4482858 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_circle.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3a491a78e8f193f428361be7b7a45dfb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/ui_root.prefab b/Assets/prefabs/ui/ui_root.prefab index 2ee84ff03..be0866bba 100644 --- a/Assets/prefabs/ui/ui_root.prefab +++ b/Assets/prefabs/ui/ui_root.prefab @@ -819,7 +819,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d756e912608fbe4e8b4bdb50cd4bf0f, type: 3} + m_Sprite: {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} m_Type: 3 m_PreserveAspect: 1 m_FillCenter: 1 @@ -997,7 +997,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2302107880904418443} - - component: {fileID: 7750639620499849590} + - component: {fileID: 1190546102121389619} m_Layer: 5 m_Name: wait_ani m_TagString: Untagged @@ -1026,7 +1026,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &7750639620499849590 +--- !u!95 &1190546102121389619 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 @@ -1290,7 +1290,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d756e912608fbe4e8b4bdb50cd4bf0f, type: 3} + m_Sprite: {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1