diff --git a/Assets/KJM/KJM_Test/Save/TestScript.cs b/Assets/KJM/KJM_Test/Save/TestScript.cs deleted file mode 100644 index 0f52da73..00000000 --- a/Assets/KJM/KJM_Test/Save/TestScript.cs +++ /dev/null @@ -1,122 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; -using Random = UnityEngine.Random; - -/// -/// 테스트용 임시 클래스 -/// -public class TestScript : MonoBehaviour,ISaveable -{ - //던전 - // private int attackPowerLevel; - // private int attackSpeedLevel; - // private int heartLevel; - // private int moveSpeedLevel; - // private int dashCoolDownLevel; - private int stageLevel; - - //일상 - private float time; - private int currentDay; - private float health; - private float reputation; - private int mealCount; - private int houseworkCount; - - /// - /// 스탯값 랜덤 변화 - /// - public void ChangeValue() - { - float floatValue = Random.Range(0f, 2f); - int intValue = Random.Range(0, 10); - - // attackPowerLevel = intValue; - // attackSpeedLevel = intValue; - // heartLevel = intValue; - // moveSpeedLevel = intValue; - //stageLevel = intValue; - - - // time = floatValue; - // currentDay = intValue; - // health = floatValue; - // reputation = floatValue; - mealCount = intValue; - houseworkCount = intValue; - - Debug.Log("ChangeValue : " + floatValue); - } - - /// - /// 인터페이스 함수1, 데이터 불러오기 - /// - /// - public void ApplySaveData(Save save) - { - if (save?.dungeonSave != null) - { - // attackPowerLevel = save.dungeonSave.attackPowerLevel; - // attackSpeedLevel = save.dungeonSave.attackSpeedLevel; - // heartLevel = save.dungeonSave.heartLevel; - // moveSpeedLevel = save.dungeonSave.moveSpeedLevel; - // dashCoolDownLevel = save.dungeonSave.dashCoolDownLevel; - //stageLevel = save.dungeonSave.stageLevel; - } - - if (save?.homeSave != null) - { - // time = save.homeSave.time; - // currentDay = save.homeSave.currentDay; - // health = save.homeSave.health; - // reputation = save.homeSave.reputation; - //mealCount = save.homeSave.mealCount; - //houseworkCount = save.homeSave.houseworkCount; - - Debug.Log("ApplySaveData : " + reputation); - } - } - - /// - /// 인터페이스 함수2, 데이터 전달 - /// - /// - public Save ExtractSaveData() - { - return new Save - { - dungeonSave = new DungeonSave() - { - // attackPowerLevel = this.attackPowerLevel, - // attackSpeedLevel = this.attackSpeedLevel, - // heartLevel = this.heartLevel, - // moveSpeedLevel = this.moveSpeedLevel, - // dashCoolDownLevel = this.dashCoolDownLevel, - //stageLevel = this.stageLevel, - - }, - - homeSave = new HomeSave - { - // time = this.time, - // currentDay = this.currentDay, - // health = this.health, - // reputation = this.reputation, - //mealCount = this.mealCount, - //houseworkCount = this.houseworkCount - } - }; - } - - /// - /// 씬 전환 테스트용 함수 - /// - public void SceneChange() - { - SceneManager.LoadScene("Main"); - } - -} diff --git a/Assets/KJM/KJM_Test/Save/TestScript.cs.meta b/Assets/KJM/KJM_Test/Save/TestScript.cs.meta deleted file mode 100644 index a6714c1f..00000000 --- a/Assets/KJM/KJM_Test/Save/TestScript.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: afa35303e7c5e6141b05a11a7b5233ce -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs.meta b/Assets/KJM/Prefabs.meta similarity index 77% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs.meta rename to Assets/KJM/Prefabs.meta index 8d3a34df..1d69d7c3 100644 --- a/Assets/KJM/KJM_Test/Upgrade/Prefabs.meta +++ b/Assets/KJM/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cadea41f445905f4b8d9c11723338f7c +guid: d0f5ca708f4cf5b498b576210645d179 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/SaveManager.prefab b/Assets/KJM/Prefabs/SaveManager.prefab similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/SaveManager.prefab rename to Assets/KJM/Prefabs/SaveManager.prefab diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/SaveManager.prefab.meta b/Assets/KJM/Prefabs/SaveManager.prefab.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/SaveManager.prefab.meta rename to Assets/KJM/Prefabs/SaveManager.prefab.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeCard.prefab b/Assets/KJM/Prefabs/UpgradeCard.prefab similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeCard.prefab rename to Assets/KJM/Prefabs/UpgradeCard.prefab diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeCard.prefab.meta b/Assets/KJM/Prefabs/UpgradeCard.prefab.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeCard.prefab.meta rename to Assets/KJM/Prefabs/UpgradeCard.prefab.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeManager.prefab b/Assets/KJM/Prefabs/UpgradeManager.prefab similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeManager.prefab rename to Assets/KJM/Prefabs/UpgradeManager.prefab diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeManager.prefab.meta b/Assets/KJM/Prefabs/UpgradeManager.prefab.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeManager.prefab.meta rename to Assets/KJM/Prefabs/UpgradeManager.prefab.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradePanel.prefab b/Assets/KJM/Prefabs/UpgradePanel.prefab similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradePanel.prefab rename to Assets/KJM/Prefabs/UpgradePanel.prefab diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradePanel.prefab.meta b/Assets/KJM/Prefabs/UpgradePanel.prefab.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradePanel.prefab.meta rename to Assets/KJM/Prefabs/UpgradePanel.prefab.meta diff --git a/Assets/KJM/KJM_Test.meta b/Assets/KJM/Resources.meta similarity index 77% rename from Assets/KJM/KJM_Test.meta rename to Assets/KJM/Resources.meta index f8f4c871..cd1713bc 100644 --- a/Assets/KJM/KJM_Test.meta +++ b/Assets/KJM/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf313a0298660aa4db16ced680557810 +guid: 288947ebfc86ae1428beafbd2ddeebda folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/KJM/KJM_Test/Upgrade/Galmuri9 KJM.asset b/Assets/KJM/Resources/Galmuri9 KJM.asset similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Galmuri9 KJM.asset rename to Assets/KJM/Resources/Galmuri9 KJM.asset diff --git a/Assets/KJM/KJM_Test/Upgrade/Galmuri9 KJM.asset.meta b/Assets/KJM/Resources/Galmuri9 KJM.asset.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Galmuri9 KJM.asset.meta rename to Assets/KJM/Resources/Galmuri9 KJM.asset.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite.meta b/Assets/KJM/Resources/Sprite.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite.meta rename to Assets/KJM/Resources/Sprite.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/AttackPower.png b/Assets/KJM/Resources/Sprite/AttackPower.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/AttackPower.png rename to Assets/KJM/Resources/Sprite/AttackPower.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/AttackPower.png.meta b/Assets/KJM/Resources/Sprite/AttackPower.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/AttackPower.png.meta rename to Assets/KJM/Resources/Sprite/AttackPower.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/AttackSpeed.png b/Assets/KJM/Resources/Sprite/AttackSpeed.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/AttackSpeed.png rename to Assets/KJM/Resources/Sprite/AttackSpeed.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/AttackSpeed.png.meta b/Assets/KJM/Resources/Sprite/AttackSpeed.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/AttackSpeed.png.meta rename to Assets/KJM/Resources/Sprite/AttackSpeed.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Card.png b/Assets/KJM/Resources/Sprite/Card.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Card.png rename to Assets/KJM/Resources/Sprite/Card.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Card.png.meta b/Assets/KJM/Resources/Sprite/Card.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Card.png.meta rename to Assets/KJM/Resources/Sprite/Card.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Cooldown.png b/Assets/KJM/Resources/Sprite/Cooldown.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Cooldown.png rename to Assets/KJM/Resources/Sprite/Cooldown.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Cooldown.png.meta b/Assets/KJM/Resources/Sprite/Cooldown.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Cooldown.png.meta rename to Assets/KJM/Resources/Sprite/Cooldown.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Heart.png b/Assets/KJM/Resources/Sprite/Heart.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Heart.png rename to Assets/KJM/Resources/Sprite/Heart.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Heart.png.meta b/Assets/KJM/Resources/Sprite/Heart.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Heart.png.meta rename to Assets/KJM/Resources/Sprite/Heart.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Max!.png b/Assets/KJM/Resources/Sprite/Max!.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Max!.png rename to Assets/KJM/Resources/Sprite/Max!.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/Max!.png.meta b/Assets/KJM/Resources/Sprite/Max!.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/Max!.png.meta rename to Assets/KJM/Resources/Sprite/Max!.png.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/MoveSpeed.png b/Assets/KJM/Resources/Sprite/MoveSpeed.png similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/MoveSpeed.png rename to Assets/KJM/Resources/Sprite/MoveSpeed.png diff --git a/Assets/KJM/KJM_Test/Upgrade/Sprite/MoveSpeed.png.meta b/Assets/KJM/Resources/Sprite/MoveSpeed.png.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/Sprite/MoveSpeed.png.meta rename to Assets/KJM/Resources/Sprite/MoveSpeed.png.meta diff --git a/Assets/KJM/Scripts.meta b/Assets/KJM/Scripts.meta new file mode 100644 index 00000000..3c3600d2 --- /dev/null +++ b/Assets/KJM/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0aceb58a275c574469f81a7b917674ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KJM/KJM_Test/Save.meta b/Assets/KJM/Scripts/Save.meta similarity index 77% rename from Assets/KJM/KJM_Test/Save.meta rename to Assets/KJM/Scripts/Save.meta index 7030a571..772d6ab7 100644 --- a/Assets/KJM/KJM_Test/Save.meta +++ b/Assets/KJM/Scripts/Save.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a49c3aa3df10e094882d67e836247adb +guid: 6511ccc376e1bf44cbbd8e500ab1d98a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/KJM/KJM_Test/Save/ISaveable.cs b/Assets/KJM/Scripts/Save/ISaveable.cs similarity index 100% rename from Assets/KJM/KJM_Test/Save/ISaveable.cs rename to Assets/KJM/Scripts/Save/ISaveable.cs diff --git a/Assets/KJM/KJM_Test/Save/ISaveable.cs.meta b/Assets/KJM/Scripts/Save/ISaveable.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Save/ISaveable.cs.meta rename to Assets/KJM/Scripts/Save/ISaveable.cs.meta diff --git a/Assets/KJM/KJM_Test/Save/Save.cs b/Assets/KJM/Scripts/Save/Save.cs similarity index 100% rename from Assets/KJM/KJM_Test/Save/Save.cs rename to Assets/KJM/Scripts/Save/Save.cs diff --git a/Assets/KJM/KJM_Test/Save/Save.cs.meta b/Assets/KJM/Scripts/Save/Save.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Save/Save.cs.meta rename to Assets/KJM/Scripts/Save/Save.cs.meta diff --git a/Assets/KJM/KJM_Test/Save/SaveDataController.cs b/Assets/KJM/Scripts/Save/SaveDataController.cs similarity index 100% rename from Assets/KJM/KJM_Test/Save/SaveDataController.cs rename to Assets/KJM/Scripts/Save/SaveDataController.cs diff --git a/Assets/KJM/KJM_Test/Save/SaveDataController.cs.meta b/Assets/KJM/Scripts/Save/SaveDataController.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Save/SaveDataController.cs.meta rename to Assets/KJM/Scripts/Save/SaveDataController.cs.meta diff --git a/Assets/KJM/KJM_Test/Save/SaveManager.cs b/Assets/KJM/Scripts/Save/SaveManager.cs similarity index 100% rename from Assets/KJM/KJM_Test/Save/SaveManager.cs rename to Assets/KJM/Scripts/Save/SaveManager.cs diff --git a/Assets/KJM/KJM_Test/Save/SaveManager.cs.meta b/Assets/KJM/Scripts/Save/SaveManager.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Save/SaveManager.cs.meta rename to Assets/KJM/Scripts/Save/SaveManager.cs.meta diff --git a/Assets/KJM/KJM_Test/Upgrade.meta b/Assets/KJM/Scripts/Upgrade.meta similarity index 77% rename from Assets/KJM/KJM_Test/Upgrade.meta rename to Assets/KJM/Scripts/Upgrade.meta index 0c502ed5..d848f7c1 100644 --- a/Assets/KJM/KJM_Test/Upgrade.meta +++ b/Assets/KJM/Scripts/Upgrade.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b98513ea028982479bf6eae61121fe5 +guid: 1d10d41e50b0779498b982d1f8e02b28 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeCard.cs b/Assets/KJM/Scripts/Upgrade/UpgradeCard.cs similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeCard.cs rename to Assets/KJM/Scripts/Upgrade/UpgradeCard.cs diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeCard.cs.meta b/Assets/KJM/Scripts/Upgrade/UpgradeCard.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeCard.cs.meta rename to Assets/KJM/Scripts/Upgrade/UpgradeCard.cs.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs b/Assets/KJM/Scripts/Upgrade/UpgradeManager.cs similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs rename to Assets/KJM/Scripts/Upgrade/UpgradeManager.cs diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs.meta b/Assets/KJM/Scripts/Upgrade/UpgradeManager.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs.meta rename to Assets/KJM/Scripts/Upgrade/UpgradeManager.cs.meta diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeStat.cs b/Assets/KJM/Scripts/Upgrade/UpgradeStat.cs similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeStat.cs rename to Assets/KJM/Scripts/Upgrade/UpgradeStat.cs diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeStat.cs.meta b/Assets/KJM/Scripts/Upgrade/UpgradeStat.cs.meta similarity index 100% rename from Assets/KJM/KJM_Test/Upgrade/UpgradeStat.cs.meta rename to Assets/KJM/Scripts/Upgrade/UpgradeStat.cs.meta