diff --git a/Assets/Prefabs/System/DialogueSystem.prefab b/Assets/Prefabs/System/DialogueSystem.prefab index c60aa14c..92dc2911 100644 --- a/Assets/Prefabs/System/DialogueSystem.prefab +++ b/Assets/Prefabs/System/DialogueSystem.prefab @@ -275,7 +275,6 @@ GameObject: - component: {fileID: 9209193912961166755} - component: {fileID: 5768147177176310894} - component: {fileID: 7031190173570394065} - - component: {fileID: 8593750091250438143} - component: {fileID: 6515317787496031345} - component: {fileID: 8989253410039029577} - component: {fileID: 8055073858314940635} @@ -343,62 +342,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8593750091250438143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4275146950738462450} - 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: 7031190173570394065} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 5709054019036521375} - m_TargetAssemblyTypeName: Yarn.Unity.LineView, Assembly-CSharp - m_MethodName: OnContinueClicked - 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!114 &6515317787496031345 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/CH2.unity b/Assets/Scenes/CH2.unity index ef03cc59..8b24565f 100644 --- a/Assets/Scenes/CH2.unity +++ b/Assets/Scenes/CH2.unity @@ -504,6 +504,7 @@ MonoBehaviour: _turnController: {fileID: 1755298184} _locationSelectionUI: {fileID: 444606903} _lineViewCanvas: {fileID: 1100803384} + _lineView: {fileID: 1100803380} _nameTag: {fileID: 789604149} _lineTxt: {fileID: 1441580442} _characters: @@ -1324,6 +1325,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 659401537} m_CullTransparentMesh: 1 +--- !u!1 &696121908 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4848254361678375663, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} + m_PrefabInstance: {fileID: 832304771} + m_PrefabAsset: {fileID: 0} --- !u!1 &696216668 GameObject: m_ObjectHideFlags: 0 @@ -1662,6 +1668,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: b64f6b2d324457f4190ca23aee698d3a, type: 3} + - target: {fileID: 4848254361678375663, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} + propertyPath: m_Name + value: SettingBtnImg + objectReference: {fileID: 0} - target: {fileID: 5025059340301348446, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} propertyPath: m_Name value: SettingSystem @@ -1682,6 +1692,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7607472912886499478, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} + propertyPath: m_AnchoredPosition.x + value: -46.799988 + objectReference: {fileID: 0} + - target: {fileID: 7607472912886499478, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} + propertyPath: m_AnchoredPosition.y + value: -43.899994 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 6347440992739952066, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} @@ -2395,10 +2413,6 @@ PrefabInstance: propertyPath: holdTime value: 2 objectReference: {fileID: 0} - - target: {fileID: 5709054019036521375, guid: 8791e0e7477d6684f830b32feb216504, type: 3} - propertyPath: autoAdvance - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5709054019036521375, guid: 8791e0e7477d6684f830b32feb216504, type: 3} propertyPath: onCharacterTyped.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -3215,6 +3229,7 @@ GameObject: - component: {fileID: 1749894940} - component: {fileID: 1749894939} - component: {fileID: 1749894941} + - component: {fileID: 1749894942} m_Layer: 5 m_Name: AutoBtn m_TagString: Untagged @@ -3286,7 +3301,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1749894937} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: @@ -3335,6 +3350,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &1749894942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1749894937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4caf6a91ac77a6747aa1c3320b2c444f, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 304034740} --- !u!1 &1755298181 GameObject: m_ObjectHideFlags: 0 @@ -4227,6 +4255,8 @@ MonoBehaviour: _uis: - {fileID: 1484800585} - {fileID: 1962123606} + - {fileID: 1749894937} + - {fileID: 696121908} _lineView: {fileID: 1100803380} _lineTxt: {fileID: 1441580442} _skipPanel: {fileID: 421610020} diff --git a/Assets/Scripts/Runtime/CH2/AutoBtnController.cs b/Assets/Scripts/Runtime/CH2/AutoBtnController.cs new file mode 100644 index 00000000..5d25755c --- /dev/null +++ b/Assets/Scripts/Runtime/CH2/AutoBtnController.cs @@ -0,0 +1,16 @@ +using Runtime.CH2.Dialogue; +using UnityEngine; + +namespace Runtime.CH2 +{ + public class AutoBtnController : MonoBehaviour + { + [SerializeField] private CH2Dialogue _dialogue; + + void OnEnable() + { + Debug.Log("일어남"); + _dialogue.StartAutoDialogue(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Runtime/CH2/AutoBtnController.cs.meta b/Assets/Scripts/Runtime/CH2/AutoBtnController.cs.meta new file mode 100644 index 00000000..2768a3d9 --- /dev/null +++ b/Assets/Scripts/Runtime/CH2/AutoBtnController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4caf6a91ac77a6747aa1c3320b2c444f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Runtime/CH2/Dialogue/CH2Dialogue.cs b/Assets/Scripts/Runtime/CH2/Dialogue/CH2Dialogue.cs index ce42b4c2..e0d58859 100644 --- a/Assets/Scripts/Runtime/CH2/Dialogue/CH2Dialogue.cs +++ b/Assets/Scripts/Runtime/CH2/Dialogue/CH2Dialogue.cs @@ -27,6 +27,7 @@ public class CH2Dialogue : DialogueViewBase [SerializeField] private LocationTransitionUI _locationSelectionUI; [Header("=Else=")] [SerializeField] private CanvasGroup _lineViewCanvas; + [SerializeField] private LineView _lineView; [SerializeField] private GameObject _nameTag; [SerializeField] private TextMeshProUGUI _lineTxt; [SerializeField] private Image[] _characters = new Image[2]; @@ -35,8 +36,8 @@ public class CH2Dialogue : DialogueViewBase [SerializeField] private GameObject _toBeContinued; [SerializeField] private bool _isAutoAdvanced = false; private string _speaker; - private string _dialogueText; - private int currentMaxVisibleCharacters; + // private string _dialogueText; + // private int currentMaxVisibleCharacters; private void Awake() { @@ -66,7 +67,6 @@ private void ClearLineText() public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished) { - // SetAuto(onDialogueLineFinished); _speaker = dialogueLine.CharacterName; SetNameTag(_speaker != ""); @@ -164,28 +164,22 @@ private void SetNameTag(bool hasName) _nameTag.SetActive(hasName); } + #region Auto Dialgue public void AutoDialogueToggle() { _isAutoAdvanced = !_isAutoAdvanced; + Debug.Log("_isAutoAdvanced: " + _isAutoAdvanced); } - /* - private void SetAuto(Action onDialogueLineFinished) + public void StartAutoDialogue() { + Debug.Log("어"); if (_isAutoAdvanced) { - onDialogueLineFinished += () => StartAutoDialogue(); - } - else - { - onDialogueLineFinished -= () => StartAutoDialogue(); - StopCoroutine(nameof(AutoDialogue)); + StartCoroutine(nameof(AutoDialogue)); + Debug.Log("기다료"); } - } - - private void StartAutoDialogue() - { - StartCoroutine(nameof(AutoDialogue)); + } IEnumerator AutoDialogue() @@ -193,8 +187,9 @@ IEnumerator AutoDialogue() Debug.Log("기달"); yield return new WaitForSeconds(1f); Debug.Log("끗"); - _runner.Dialogue.Continue(); - }*/ + _lineView.OnContinueClicked(); + } + #endregion /* public void SkipDialogue() diff --git a/Assets/Scripts/Runtime/CH2/Main/KeySetting.cs b/Assets/Scripts/Runtime/CH2/Main/KeySetting.cs index 54e7816b..02c16cb3 100644 --- a/Assets/Scripts/Runtime/CH2/Main/KeySetting.cs +++ b/Assets/Scripts/Runtime/CH2/Main/KeySetting.cs @@ -10,7 +10,6 @@ public class KeySetting : MonoBehaviour [SerializeField] private DialogueRunner _runner; [SerializeField] private CH2Dialogue _dialogue; [SerializeField] private GameObject[] _uis; - // [SerializeField] private CanvasGroup _lineViewCanvas; [SerializeField] private LineView _lineView; [SerializeField] private TextMeshProUGUI _lineTxt; [SerializeField] private GameObject _skipPanel; @@ -43,6 +42,15 @@ public void HideUI() foreach (GameObject ui in _uis) ui.SetActive(!_isHidingUI); } + + public void AutoDialogue() + { + if (!_runner.IsDialogueRunning) + return; + + _dialogue.AutoDialogueToggle(); + // 대사를 치고 1초 뒤에 다음 대사로 넘김 + } /* //TODO: _runner.IsDialogueRunning 말고 직접 다이얼로그 시작과 끝 설정 public void Skip() @@ -52,18 +60,6 @@ public void Skip() _skipPanel.SetActive(true); } - - public void AutoDialogue() - { - //if (!_runner.IsDialogueRunning) - // return; - - //_dialogue.AutoDialogueToggle(); - // 대화 자동 진행 활성화 - // 직접 넘길 수 없음 - // 2초 뒤에 다음 대사로 넘김 - // 현재 Auto - } */ } } \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Input/InGameKeyBinder.cs b/Assets/Scripts/Runtime/Input/InGameKeyBinder.cs index 8e02dcdf..306778fa 100644 --- a/Assets/Scripts/Runtime/Input/InGameKeyBinder.cs +++ b/Assets/Scripts/Runtime/Input/InGameKeyBinder.cs @@ -83,8 +83,8 @@ public void CH2KeyBinding(SettingsUIView settingsUIView, KeySetting keySetting) _gameOverControls.UI.GameSetting.performed += _ => settingsUIView.GameSettingToggle(); _gameOverControls.UI.DialogueInput.performed += _ => keySetting.DialogueInput(); _gameOverControls.UI.Hide.performed += _ => keySetting.HideUI(); + _gameOverControls.UI.Auto.performed += _ => keySetting.AutoDialogue(); //_gameOverControls.UI.Skip.performed += _ => keySetting.Skip(); - //_gameOverControls.UI.Auto.performed += _ => keySetting.AutoDialogue(); } // ETC diff --git a/Assets/Scripts/Runtime/Manager/DataManager.cs b/Assets/Scripts/Runtime/Manager/DataManager.cs index 138565e6..79df6fdc 100644 --- a/Assets/Scripts/Runtime/Manager/DataManager.cs +++ b/Assets/Scripts/Runtime/Manager/DataManager.cs @@ -109,6 +109,7 @@ public void NewGame() { _gameData = new GameData { Version = Application.version }; SaveGame(); + Managers.Sound.ResetPlayTime(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Manager/SoundManager.cs b/Assets/Scripts/Runtime/Manager/SoundManager.cs index 37f0da06..0dccf809 100644 --- a/Assets/Scripts/Runtime/Manager/SoundManager.cs +++ b/Assets/Scripts/Runtime/Manager/SoundManager.cs @@ -172,6 +172,11 @@ private AudioClip GetAudioClip(string path) return audioClip; } + public void ResetPlayTime() + { + _bgmPlayTime = 0f; + } + public void StopAllSound() { StopBGM(); diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index dce070c8..5422445e 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from WOOS_COM at 2024-11-17 오후 11:26:16 \ No newline at end of file +Build from WOOS_COM at 2024-11-18 오전 1:32:02 \ No newline at end of file diff --git a/Assets/_CH2/Arts/UI/Bottom_auto.png b/Assets/_CH2/Arts/UI/Bottom_auto.png deleted file mode 100644 index 302a3852..00000000 Binary files a/Assets/_CH2/Arts/UI/Bottom_auto.png and /dev/null differ diff --git a/Assets/_CH2/Arts/UI/Bottom_auto.png.meta b/Assets/_CH2/Arts/UI/Bottom_auto.png.meta deleted file mode 100644 index aa3dba95..00000000 --- a/Assets/_CH2/Arts/UI/Bottom_auto.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 25f42528eb608b146912a0fd580ab462 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_CH2/Arts/UI/Bottom_menu.png b/Assets/_CH2/Arts/UI/Bottom_menu.png deleted file mode 100644 index 8729b93c..00000000 Binary files a/Assets/_CH2/Arts/UI/Bottom_menu.png and /dev/null differ diff --git a/Assets/_CH2/Arts/UI/Bottom_menu.png.meta b/Assets/_CH2/Arts/UI/Bottom_menu.png.meta deleted file mode 100644 index 854d49fa..00000000 --- a/Assets/_CH2/Arts/UI/Bottom_menu.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 11f6f9c8401b04a4db3a8671c4e5c756 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_CH2/Arts/UI/Bottom_nonUI.png b/Assets/_CH2/Arts/UI/Bottom_nonUI.png deleted file mode 100644 index 15a4b880..00000000 Binary files a/Assets/_CH2/Arts/UI/Bottom_nonUI.png and /dev/null differ diff --git a/Assets/_CH2/Arts/UI/Bottom_skip.png b/Assets/_CH2/Arts/UI/Bottom_skip.png deleted file mode 100644 index 8adf2170..00000000 Binary files a/Assets/_CH2/Arts/UI/Bottom_skip.png and /dev/null differ diff --git a/Assets/_CH2/Arts/UI/Bottom_skip.png.meta b/Assets/_CH2/Arts/UI/Bottom_skip.png.meta deleted file mode 100644 index fd8ac891..00000000 --- a/Assets/_CH2/Arts/UI/Bottom_skip.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 2c89200877147994f9a8b676278e0374 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_CH2/Arts/UI/auto.png b/Assets/_CH2/Arts/UI/auto_icon.png similarity index 100% rename from Assets/_CH2/Arts/UI/auto.png rename to Assets/_CH2/Arts/UI/auto_icon.png diff --git a/Assets/_CH2/Arts/UI/auto.png.meta b/Assets/_CH2/Arts/UI/auto_icon.png.meta similarity index 100% rename from Assets/_CH2/Arts/UI/auto.png.meta rename to Assets/_CH2/Arts/UI/auto_icon.png.meta diff --git a/Assets/_CH2/Arts/UI/hide.png b/Assets/_CH2/Arts/UI/hide_icon.png similarity index 100% rename from Assets/_CH2/Arts/UI/hide.png rename to Assets/_CH2/Arts/UI/hide_icon.png diff --git a/Assets/_CH2/Arts/UI/hide.png.meta b/Assets/_CH2/Arts/UI/hide_icon.png.meta similarity index 100% rename from Assets/_CH2/Arts/UI/hide.png.meta rename to Assets/_CH2/Arts/UI/hide_icon.png.meta diff --git a/Assets/_Common/Sprites/SettingUI/Old.meta b/Assets/_Common/Sprites/SettingUI/Old.meta deleted file mode 100644 index 8dce72df..00000000 --- a/Assets/_Common/Sprites/SettingUI/Old.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0f397d98450c5540b489f0630d4807f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/Old/bar.png b/Assets/_Common/Sprites/SettingUI/Old/bar.png deleted file mode 100644 index c32f2c68..00000000 Binary files a/Assets/_Common/Sprites/SettingUI/Old/bar.png and /dev/null differ diff --git a/Assets/_Common/Sprites/SettingUI/Old/bar.png.meta b/Assets/_Common/Sprites/SettingUI/Old/bar.png.meta deleted file mode 100644 index 37b826a1..00000000 --- a/Assets/_Common/Sprites/SettingUI/Old/bar.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: d6054b9d720ef414cbed59eec56245e2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/Old/barbackground.png b/Assets/_Common/Sprites/SettingUI/Old/barbackground.png deleted file mode 100644 index 883db9e1..00000000 Binary files a/Assets/_Common/Sprites/SettingUI/Old/barbackground.png and /dev/null differ diff --git a/Assets/_Common/Sprites/SettingUI/Old/barbackground.png.meta b/Assets/_Common/Sprites/SettingUI/Old/barbackground.png.meta deleted file mode 100644 index 2de54e77..00000000 --- a/Assets/_Common/Sprites/SettingUI/Old/barbackground.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: bd333a4ba41f0f249b56fcab16847af2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/Old/settingX.png b/Assets/_Common/Sprites/SettingUI/Old/settingX.png deleted file mode 100644 index ef3c46cc..00000000 Binary files a/Assets/_Common/Sprites/SettingUI/Old/settingX.png and /dev/null differ diff --git a/Assets/_Common/Sprites/SettingUI/Old/settingX.png.meta b/Assets/_Common/Sprites/SettingUI/Old/settingX.png.meta deleted file mode 100644 index caceb03c..00000000 --- a/Assets/_Common/Sprites/SettingUI/Old/settingX.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: b020e62cb1f50284e9cc398e3a71e192 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png b/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png deleted file mode 100644 index fd1667e5..00000000 Binary files a/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png and /dev/null differ diff --git a/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png.meta b/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png.meta deleted file mode 100644 index 445d5177..00000000 --- a/Assets/_Common/Sprites/SettingUI/Old/settingbackground.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 0f159f807d4c2b54ca415bb1d782dde5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/SettingNew.png b/Assets/_Common/Sprites/SettingUI/SettingNew.png deleted file mode 100644 index 1ff61d1d..00000000 Binary files a/Assets/_Common/Sprites/SettingUI/SettingNew.png and /dev/null differ diff --git a/Assets/_Common/Sprites/SettingUI/SettingNew.png.meta b/Assets/_Common/Sprites/SettingUI/SettingNew.png.meta deleted file mode 100644 index aa821a27..00000000 --- a/Assets/_Common/Sprites/SettingUI/SettingNew.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: c0c6a8e305aa92542aa27f19710d2231 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Common/Sprites/SettingUI/Setting.png b/Assets/_Common/Sprites/SettingUI/setting_icon.png similarity index 100% rename from Assets/_Common/Sprites/SettingUI/Setting.png rename to Assets/_Common/Sprites/SettingUI/setting_icon.png diff --git a/Assets/_Common/Sprites/SettingUI/Setting.png.meta b/Assets/_Common/Sprites/SettingUI/setting_icon.png.meta similarity index 100% rename from Assets/_Common/Sprites/SettingUI/Setting.png.meta rename to Assets/_Common/Sprites/SettingUI/setting_icon.png.meta diff --git a/Assets/_Common/Sprites/SettingUI/setting_new.png b/Assets/_Common/Sprites/SettingUI/setting_new.png new file mode 100644 index 00000000..088ae60d Binary files /dev/null and b/Assets/_Common/Sprites/SettingUI/setting_new.png differ diff --git a/Assets/_CH2/Arts/UI/Bottom_nonUI.png.meta b/Assets/_Common/Sprites/SettingUI/setting_new.png.meta similarity index 98% rename from Assets/_CH2/Arts/UI/Bottom_nonUI.png.meta rename to Assets/_Common/Sprites/SettingUI/setting_new.png.meta index 7b44c3b9..60ff90ad 100644 --- a/Assets/_CH2/Arts/UI/Bottom_nonUI.png.meta +++ b/Assets/_Common/Sprites/SettingUI/setting_new.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a38a24ca56d87f5489cfc00bf232406e +guid: 592941c5531091e4abebcc088dc84143 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/_Common/Sprites/location.png b/Assets/_Common/Sprites/location.png deleted file mode 100644 index 438e49eb..00000000 Binary files a/Assets/_Common/Sprites/location.png and /dev/null differ diff --git a/Assets/_Common/Sprites/location.png.meta b/Assets/_Common/Sprites/location.png.meta deleted file mode 100644 index 288631fa..00000000 --- a/Assets/_Common/Sprites/location.png.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: f3872a0682840ba44b151dd5273ccccb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: