diff --git a/AndroidData/nightward_One.keystore b/AndroidData/nightward_One.keystore new file mode 100644 index 0000000..cb73f01 Binary files /dev/null and b/AndroidData/nightward_One.keystore differ diff --git a/Assets/ResWork/ShowVideo.meta b/Assets/ResWork/ShowVideo.meta new file mode 100644 index 0000000..e290671 --- /dev/null +++ b/Assets/ResWork/ShowVideo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb77d0aed3c66e54aa816ef93b62f31e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/ShowVideo/Canvas_Video.prefab b/Assets/ResWork/ShowVideo/Canvas_Video.prefab new file mode 100644 index 0000000..fb11cc4 --- /dev/null +++ b/Assets/ResWork/ShowVideo/Canvas_Video.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3422903026182582810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6212946523527258320} + - component: {fileID: 2647457804366001783} + - component: {fileID: 3690089281374790576} + - component: {fileID: 5503575469648484047} + - component: {fileID: 1552550356001035904} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6212946523527258320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422903026182582810} + 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: 483806476754885217} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2647457804366001783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422903026182582810} + m_CullTransparentMesh: 1 +--- !u!114 &3690089281374790576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422903026182582810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!328 &5503575469648484047 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422903026182582810} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: 539d60ff460912744a19f55123c2f7dc, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 1 + m_DataSource: 0 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] +--- !u!114 &1552550356001035904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3422903026182582810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3690089281374790576} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2082290617758677897} + m_TargetAssemblyTypeName: VideoMgr, Assembly-CSharp + m_MethodName: OnClick_Screen + 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 &4244186309149100293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 483806476754885217} + - component: {fileID: 7667984366343797710} + - component: {fileID: 2082290617758677897} + - component: {fileID: 4266664207913904232} + - component: {fileID: 8321734305413827880} + m_Layer: 5 + m_Name: Canvas_Video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &483806476754885217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244186309149100293} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6212946523527258320} + - {fileID: 7494319965654815115} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &7667984366343797710 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244186309149100293} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2082290617758677897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244186309149100293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 138a50dc729f3f04ab15ff13f9c5c605, type: 3} + m_Name: + m_EditorClassIdentifier: + vp: {fileID: 5503575469648484047} + go_skip: {fileID: 8697174538894529552} +--- !u!114 &4266664207913904232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244186309149100293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1080, y: 1920} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &8321734305413827880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4244186309149100293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 32 +--- !u!1 &8697174538894529552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7494319965654815115} + - component: {fileID: 3870530827672743989} + - component: {fileID: 190219119701256158} + m_Layer: 5 + m_Name: skip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7494319965654815115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697174538894529552} + 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: 483806476754885217} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -125, y: -70} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3870530827672743989 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697174538894529552} + m_CullTransparentMesh: 1 +--- !u!114 &190219119701256158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697174538894529552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Tab to Skip + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 25 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta b/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta new file mode 100644 index 0000000..7e2be01 --- /dev/null +++ b/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a598abe3865cb34aaf6c61dffd6e86e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/ShowVideo/VideoMgr.cs b/Assets/ResWork/ShowVideo/VideoMgr.cs new file mode 100644 index 0000000..f279483 --- /dev/null +++ b/Assets/ResWork/ShowVideo/VideoMgr.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections; +using UnityEngine; +using UnityEngine.Video; + +public class VideoMgr : MonoBehaviourSingletonTemplate +{ + public VideoPlayer vp; + public GameObject go_skip; + + Action act_end; + + void Start() + { + vp.loopPointReached += OnVideoEnd; + } + + public void PlayVideo(float skiptime, Action _end) + { + act_end = _end; + vp.gameObject.SetActive(true); + vp.Play(); + + StartCoroutine(Co_Run(skiptime)); + } + + IEnumerator Co_Run(float skiptime) + { + go_skip.SetActive(false); + yield return new WaitForSeconds(skiptime); + go_skip.SetActive(true); + } + + public void OnClick_Screen() + { + if (go_skip.activeInHierarchy) + OnVideoEnd(vp); + } + + private void OnVideoEnd(VideoPlayer source) + { + go_skip.SetActive(false); + vp.gameObject.SetActive(false); + act_end?.Invoke(); + } +} \ No newline at end of file diff --git a/Assets/ResWork/ShowVideo/VideoMgr.cs.meta b/Assets/ResWork/ShowVideo/VideoMgr.cs.meta new file mode 100644 index 0000000..cb6c24a --- /dev/null +++ b/Assets/ResWork/ShowVideo/VideoMgr.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 138a50dc729f3f04ab15ff13f9c5c605 \ No newline at end of file diff --git a/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture b/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture new file mode 100644 index 0000000..a7c764c --- /dev/null +++ b/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: gacha_RenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 1080 + m_Height: 1920 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture.meta b/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture.meta new file mode 100644 index 0000000..0c1f10b --- /dev/null +++ b/Assets/ResWork/ShowVideo/gacha_RenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 649f1a652408da7469bf980308c0811c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/ShowVideo/gacha_video.mp4 b/Assets/ResWork/ShowVideo/gacha_video.mp4 new file mode 100644 index 0000000..206f60b Binary files /dev/null and b/Assets/ResWork/ShowVideo/gacha_video.mp4 differ diff --git a/Assets/ResWork/ShowVideo/gacha_video.mp4.meta b/Assets/ResWork/ShowVideo/gacha_video.mp4.meta new file mode 100644 index 0000000..7a773f5 --- /dev/null +++ b/Assets/ResWork/ShowVideo/gacha_video.mp4.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 539d60ff460912744a19f55123c2f7dc +VideoClipImporter: + externalObjects: {} + serializedVersion: 3 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 3a7ccbe..88d6d80 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -4,26 +4,6 @@ using DG.Tweening; using UnityEngine; using UnityEngine.UI; -public enum SFXTpye -{ - ClickButtonShort, - ClickButtonLong, - Gacha, - GachaResult, - SelectAlbum, - OpenAlbum, - NormalTouch1, - NormalTouch2, - NormalTouch3, - NormalTouch4, - NormalTouch5, - ImpactTouch1, - ImpactTouch2, - ImpactTouch3, - ImpactTouch4, - ImpactTouch5, -} - public class HorseRushPanel : MonoBehaviour { [SerializeField] HorseRushManager _horseRushManager; diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 4f81174..4010ab3 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38088,7 +38088,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: 134.6, y: -183} + m_AnchoredPosition: {x: 134.59998, y: -183} m_SizeDelta: {x: 230, y: 59} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &999322682 @@ -86666,6 +86666,103 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35b33271aa1bd5e479b44d19341bd5b4, type: 3} +--- !u!1001 &3738572521341130834 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 483806476754885217, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4244186309149100293, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} + propertyPath: m_Name + value: Canvas_Video + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9a598abe3865cb34aaf6c61dffd6e86e, type: 3} --- !u!1001 &7617528676548254869 PrefabInstance: m_ObjectHideFlags: 0 @@ -86838,6 +86935,7 @@ SceneRoots: m_Roots: - {fileID: 519420032} - {fileID: 456601672} + - {fileID: 3738572521341130834} - {fileID: 37909579} - {fileID: 500962023} - {fileID: 201009777} diff --git a/Assets/Scripts/Editor/AutoBuild.cs b/Assets/Scripts/Editor/AutoBuild.cs index 9f5603a..47a381d 100644 --- a/Assets/Scripts/Editor/AutoBuild.cs +++ b/Assets/Scripts/Editor/AutoBuild.cs @@ -13,7 +13,7 @@ public static class AutoBuild { static void Common(BuildTargetGroup _btg, BuildTarget _bt) { - PlayerSettings.applicationIdentifier = "com.toneworker.shegotwet"; + PlayerSettings.applicationIdentifier = "com.toneworker.nightward"; EditorUserBuildSettings.SwitchActiveBuildTarget(_btg, _bt); if (_bt == BuildTarget.Android) @@ -54,7 +54,7 @@ public static class AutoBuild static void Set_AndroidKeyStore() { PlayerSettings.Android.useCustomKeystore = true; - PlayerSettings.Android.keystoreName = "AndroidData/shegotwet.keystore"; + PlayerSettings.Android.keystoreName = "AndroidData/nightward.keystore"; PlayerSettings.Android.keyaliasName = "fgb"; PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "fgb123!!"; } @@ -62,7 +62,7 @@ public static class AutoBuild static void Set_OneStoreKeyStore() { PlayerSettings.Android.useCustomKeystore = true; - PlayerSettings.Android.keystoreName = "AndroidData/shegotwet_One.keystore"; + PlayerSettings.Android.keystoreName = "AndroidData/nightward_One.keystore"; PlayerSettings.Android.keyaliasName = "fgb"; PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "fgb123!!"; } diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 5326b3a..935f3a1 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -181,7 +181,12 @@ public class GachaUI : uScrollViewMgr public void OnClick_Gacha() { if (!isGacha && SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"), true, ToastY)) - StartCoroutine(Co_Gacha()); + { + isGacha = true; + Init_GachaAnim(); + VideoMgr.Ins.PlayVideo(1f, () => { StartCoroutine(GachaReward()); }); + //StartCoroutine(Co_Gacha()); + } } public GameObject[] gos_effect; @@ -190,6 +195,7 @@ public class GachaUI : uScrollViewMgr void Init_GachaAnim() { DSUtil.InActivateGameObjects(gos_effect); + DSUtil.InActivateGameObjects(gos_grade); i_Chest.gameObject.SetActive(false); i_GachaReward.transform.parent.parent.gameObject.SetActive(false); } @@ -201,7 +207,6 @@ public class GachaUI : uScrollViewMgr i_Chest.sprite = UIAtlasMgr.Ins.Get_Sprite($"GameBox-{Random.Range(0, 20)}"); gos_effect[5].SetActive(true); // 바닥 컬라이더 - DSUtil.InActivateGameObjects(gos_grade); SoundInfo.Ins.Play_OneShot((eSound)Random.Range(12, 14)); i_Chest.gameObject.SetActive(true); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 05c83e7..7d7aa7f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -267,7 +267,7 @@ PlayerSettings: AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: AndroidData/shegotwet_One.keystore' + AndroidKeystoreName: '{inproject}: AndroidData/nightward_One.keystore' AndroidKeyaliasName: fgb AndroidEnableArmv9SecurityFeatures: 0 AndroidEnableArm64MTE: 0