diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset index 26f808d4a..bc7bf61bd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset @@ -15,16 +15,6 @@ MonoBehaviour: m_GroupName: GoogleSheetSprite_Group m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_SerializeEntries: - - m_GUID: 1f850df0adb104f4ba2a6c097152f6fa - m_Address: Sprites - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 6ade463886ca5294685e2c4997a976b7 - m_Address: Assets/_Datas/Addressables/Barrel.prefab - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: e15933f76da90e742866563b5cd9e45f m_Address: Gold m_ReadOnly: 0 diff --git a/Assets/MapSaveData.json b/Assets/MapSaveData.json new file mode 100644 index 000000000..6c5e241e4 --- /dev/null +++ b/Assets/MapSaveData.json @@ -0,0 +1,3 @@ +{ + "Tiles": [] +} \ No newline at end of file diff --git a/Assets/_Datas/Addressables/Items/Barrel 1.prefab.meta b/Assets/MapSaveData.json.meta similarity index 62% rename from Assets/_Datas/Addressables/Items/Barrel 1.prefab.meta rename to Assets/MapSaveData.json.meta index 80378bfea..3e583d29a 100644 --- a/Assets/_Datas/Addressables/Items/Barrel 1.prefab.meta +++ b/Assets/MapSaveData.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 07488571c24a83d43a3ae517e83c4a5d -PrefabImporter: +guid: dc01d71be95ffd04db374af611108db0 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/_Datas/Scripts/BillBoardVisual.cs b/Assets/_Datas/02.Scripts/BillBoardVisual.cs similarity index 100% rename from Assets/_Datas/Scripts/BillBoardVisual.cs rename to Assets/_Datas/02.Scripts/BillBoardVisual.cs diff --git a/Assets/_Datas/Scripts/BillBoardVisual.cs.meta b/Assets/_Datas/02.Scripts/BillBoardVisual.cs.meta similarity index 100% rename from Assets/_Datas/Scripts/BillBoardVisual.cs.meta rename to Assets/_Datas/02.Scripts/BillBoardVisual.cs.meta diff --git a/Assets/_Datas/Scripts/ItemBuild.meta b/Assets/_Datas/02.Scripts/Items.meta similarity index 77% rename from Assets/_Datas/Scripts/ItemBuild.meta rename to Assets/_Datas/02.Scripts/Items.meta index 8fcec191d..5370ac1cc 100644 --- a/Assets/_Datas/Scripts/ItemBuild.meta +++ b/Assets/_Datas/02.Scripts/Items.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a48bb4383d2a5549ae3cb55883e22ad +guid: b182de2101998874fb8ca8e49a63dd98 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/Scripts/ItemBuild/Inventory.cs b/Assets/_Datas/02.Scripts/Items/Inventory.cs similarity index 100% rename from Assets/_Datas/Scripts/ItemBuild/Inventory.cs rename to Assets/_Datas/02.Scripts/Items/Inventory.cs diff --git a/Assets/_Datas/Scripts/ItemBuild/Inventory.cs.meta b/Assets/_Datas/02.Scripts/Items/Inventory.cs.meta similarity index 100% rename from Assets/_Datas/Scripts/ItemBuild/Inventory.cs.meta rename to Assets/_Datas/02.Scripts/Items/Inventory.cs.meta diff --git a/Assets/_Datas/Scripts/ItemBuild/ItemUI.cs b/Assets/_Datas/02.Scripts/Items/ItemUI.cs similarity index 100% rename from Assets/_Datas/Scripts/ItemBuild/ItemUI.cs rename to Assets/_Datas/02.Scripts/Items/ItemUI.cs diff --git a/Assets/_Datas/Scripts/ItemBuild/ItemUI.cs.meta b/Assets/_Datas/02.Scripts/Items/ItemUI.cs.meta similarity index 100% rename from Assets/_Datas/Scripts/ItemBuild/ItemUI.cs.meta rename to Assets/_Datas/02.Scripts/Items/ItemUI.cs.meta diff --git a/Assets/_Datas/Addressables/Barrel 1.prefab.meta b/Assets/_Datas/02.Scripts/Maps.meta similarity index 57% rename from Assets/_Datas/Addressables/Barrel 1.prefab.meta rename to Assets/_Datas/02.Scripts/Maps.meta index 209da6c52..80641a174 100644 --- a/Assets/_Datas/Addressables/Barrel 1.prefab.meta +++ b/Assets/_Datas/02.Scripts/Maps.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: a8dd4451e26e26c4f819795e99901854 -PrefabImporter: +guid: 56a6367a1b78ea54684bad84e2edadd3 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/_Datas/Scripts/CellManager.cs b/Assets/_Datas/02.Scripts/Maps/CellManager.cs similarity index 99% rename from Assets/_Datas/Scripts/CellManager.cs rename to Assets/_Datas/02.Scripts/Maps/CellManager.cs index e23f47cb9..b9f4f5e31 100644 --- a/Assets/_Datas/Scripts/CellManager.cs +++ b/Assets/_Datas/02.Scripts/Maps/CellManager.cs @@ -69,7 +69,7 @@ public static Vector3 GetCellWorldPos(int cellPos) private void Update() { - UpdateCells(); + //UpdateCells(); } public void UpdateCells() diff --git a/Assets/_Datas/Scripts/CellManager.cs.meta b/Assets/_Datas/02.Scripts/Maps/CellManager.cs.meta similarity index 100% rename from Assets/_Datas/Scripts/CellManager.cs.meta rename to Assets/_Datas/02.Scripts/Maps/CellManager.cs.meta diff --git a/Assets/_Datas/Scripts/CellUI.cs b/Assets/_Datas/02.Scripts/Maps/CellUI.cs similarity index 100% rename from Assets/_Datas/Scripts/CellUI.cs rename to Assets/_Datas/02.Scripts/Maps/CellUI.cs diff --git a/Assets/_Datas/Scripts/CellUI.cs.meta b/Assets/_Datas/02.Scripts/Maps/CellUI.cs.meta similarity index 100% rename from Assets/_Datas/Scripts/CellUI.cs.meta rename to Assets/_Datas/02.Scripts/Maps/CellUI.cs.meta diff --git a/Assets/_Datas/Addressables/Barrel 1.prefab b/Assets/_Datas/Addressables/Barrel 1.prefab deleted file mode 100644 index 7a72eca1f..000000000 --- a/Assets/_Datas/Addressables/Barrel 1.prefab +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4620735149564359356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 356509076867885997} - - component: {fileID: 1457369735750806052} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &356509076867885997 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4620735149564359356} - serializedVersion: 2 - m_LocalRotation: {x: 0.34202015, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1063298246775673564} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1457369735750806052 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4620735149564359356} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 189d780f1507008429f2cdd1a2b4c9e8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &5095514477995875136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1063298246775673564} - m_Layer: 0 - m_Name: Barrel 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1063298246775673564 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5095514477995875136} - serializedVersion: 2 - 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: 1 - m_Children: - - {fileID: 356509076867885997} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_Datas/Addressables/Items/Barrel 1.prefab b/Assets/_Datas/Addressables/Items/Barrel 1.prefab deleted file mode 100644 index 839f08081..000000000 --- a/Assets/_Datas/Addressables/Items/Barrel 1.prefab +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &907389136079840969 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3843617733172158159} - - component: {fileID: 8589504416082435264} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3843617733172158159 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 907389136079840969} - serializedVersion: 2 - m_LocalRotation: {x: 0.34202015, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1623368721416787876} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8589504416082435264 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 907389136079840969} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 189d780f1507008429f2cdd1a2b4c9e8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &8076915867083930261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1623368721416787876} - m_Layer: 0 - m_Name: Barrel 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1623368721416787876 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8076915867083930261} - serializedVersion: 2 - 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: 1 - m_Children: - - {fileID: 3843617733172158159} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_Datas/Addressables/Barrel.prefab b/Assets/_Datas/Addressables/Items/Barrel.prefab similarity index 80% rename from Assets/_Datas/Addressables/Barrel.prefab rename to Assets/_Datas/Addressables/Items/Barrel.prefab index 198c8c6ff..8869fdff4 100644 --- a/Assets/_Datas/Addressables/Barrel.prefab +++ b/Assets/_Datas/Addressables/Items/Barrel.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3754886863768338004 +--- !u!1 &4622801507172734964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,8 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 315319233923627350} - - component: {fileID: 7266645245574815240} + - component: {fileID: 6230804187692278598} + - component: {fileID: 8925380869765574244} m_Layer: 0 m_Name: VisualLook m_TagString: Untagged @@ -17,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &315319233923627350 +--- !u!4 &6230804187692278598 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3754886863768338004} + m_GameObject: {fileID: 4622801507172734964} serializedVersion: 2 m_LocalRotation: {x: 0.34202015, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7157955544335172971} + m_Father: {fileID: 6987901275491970770} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7266645245574815240 +--- !u!212 &8925380869765574244 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3754886863768338004} + m_GameObject: {fileID: 4622801507172734964} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -76,7 +76,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: eb70d7085c7b27d4a939289414a09cef, type: 3} + m_Sprite: {fileID: 21300000, guid: 189d780f1507008429f2cdd1a2b4c9e8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -87,7 +87,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &5416599354410470924 +--- !u!1 &6177467075970897922 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -95,7 +95,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7157955544335172971} + - component: {fileID: 6987901275491970770} m_Layer: 0 m_Name: Barrel m_TagString: Untagged @@ -103,19 +103,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7157955544335172971 +--- !u!4 &6987901275491970770 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5416599354410470924} + m_GameObject: {fileID: 6177467075970897922} serializedVersion: 2 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_ConstrainProportionsScale: 1 m_Children: - - {fileID: 315319233923627350} + - {fileID: 6230804187692278598} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_Datas/Addressables/Barrel.prefab.meta b/Assets/_Datas/Addressables/Items/Barrel.prefab.meta similarity index 74% rename from Assets/_Datas/Addressables/Barrel.prefab.meta rename to Assets/_Datas/Addressables/Items/Barrel.prefab.meta index 9b6e3c8c1..fcb477bcd 100644 --- a/Assets/_Datas/Addressables/Barrel.prefab.meta +++ b/Assets/_Datas/Addressables/Items/Barrel.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ade463886ca5294685e2c4997a976b7 +guid: 492dada85383b554aaf3526ca343f061 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_Datas/Addressables/Sprites.spriteatlasv2 b/Assets/_Datas/Addressables/Sprites.spriteatlasv2 deleted file mode 100644 index 038cec99d..000000000 --- a/Assets/_Datas/Addressables/Sprites.spriteatlasv2 +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!612988286 &1 -SpriteAtlasAsset: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 2 - m_MasterAtlas: {fileID: 0} - m_ImporterData: - packables: - - {fileID: 21300000, guid: eb70d7085c7b27d4a939289414a09cef, type: 3} - m_IsVariant: 0 - m_ScriptablePacker: {fileID: 0} diff --git a/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta b/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta deleted file mode 100644 index fc399db44..000000000 --- a/Assets/_Datas/Addressables/Sprites.spriteatlasv2.meta +++ /dev/null @@ -1,30 +0,0 @@ -fileFormatVersion: 2 -guid: 1f850df0adb104f4ba2a6c097152f6fa -SpriteAtlasImporter: - externalObjects: {} - textureSettings: - serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: [] - packingSettings: - serializedVersion: 2 - padding: 4 - blockOffset: 0 - allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 - enableAlphaDilation: 0 - secondaryTextureSettings: {} - variantMultiplier: 1 - bindAsDefault: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta b/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta index 01ba4302a..b9e4aff5a 100644 --- a/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta +++ b/Assets/_Datas/Addressables/Sprites/Items.spriteatlasv2.meta @@ -4,9 +4,9 @@ SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_Datas/Raw/Sprites/Barrel.png.meta b/Assets/_Datas/Raw/Sprites/Barrel.png.meta deleted file mode 100644 index f6df7ffb8..000000000 --- a/Assets/_Datas/Raw/Sprites/Barrel.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: eb70d7085c7b27d4a939289414a09cef -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 2 - spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 512 - 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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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: 4 - buildTarget: WindowsStoreApps - 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: 4 - buildTarget: iOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Datas/Raw/Sprites/Items/Barrel 1.png b/Assets/_Datas/Raw/Sprites/Items/Barrel 1.png deleted file mode 100644 index 188956ba5..000000000 Binary files a/Assets/_Datas/Raw/Sprites/Items/Barrel 1.png and /dev/null differ diff --git a/Assets/_Datas/Raw/Sprites/Barrel.png b/Assets/_Datas/Raw/Sprites/Items/Barrel.png similarity index 100% rename from Assets/_Datas/Raw/Sprites/Barrel.png rename to Assets/_Datas/Raw/Sprites/Items/Barrel.png diff --git a/Assets/_Datas/Raw/Sprites/Items/Barrel 1.png.meta b/Assets/_Datas/Raw/Sprites/Items/Barrel.png.meta similarity index 100% rename from Assets/_Datas/Raw/Sprites/Items/Barrel 1.png.meta rename to Assets/_Datas/Raw/Sprites/Items/Barrel.png.meta diff --git a/Assets/_Datas/Scripts/DDDMain.cs b/Assets/_Datas/Scripts/DDDMain.cs deleted file mode 100644 index fba937c20..000000000 --- a/Assets/_Datas/Scripts/DDDMain.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; - -public class DDDMain : SLGameComponent -{ - public override void Begin() - { - SLGame.ActiveComponent(true); - SLGame.Session["CurrentMode"] = "Title"; - } - - public override void End() - { - } - - public override void Update() - { - } -} diff --git a/Assets/_Datas/Scripts/DDDMain.cs.meta b/Assets/_Datas/Scripts/DDDMain.cs.meta deleted file mode 100644 index e856b968b..000000000 --- a/Assets/_Datas/Scripts/DDDMain.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8f35ea449573afc498bb9da070fa9431 \ No newline at end of file diff --git a/Assets/_Datas/Scripts/ModeManager.cs b/Assets/_Datas/Scripts/ModeManager.cs deleted file mode 100644 index 24123d415..000000000 --- a/Assets/_Datas/Scripts/ModeManager.cs +++ /dev/null @@ -1,36 +0,0 @@ -using UnityEngine; -using UnityEngine.Polybrush; - -public class ModeManager : SLGameComponent -{ - public override void Begin() - { - SLGame.AddNotify("CurrentMode", OnChangeMode); - } - - private void OnChangeMode() - { - var currentMode = SLGame.Session["CurrentMode"]; - - if (currentMode == "Title") - { - SLGame.ActiveComponent("Title", true); - } - - if (currentMode == "Restaurant") - { - // TODO: 현재 모드 기억해놨다가 지우기 - SLGame.ActiveComponent("Title", false); - SLGame.ActiveComponent("Restaurant", true); - // TODO: 씬을 바꿔준다 - } - } - - public override void End() - { - } - - public override void Update() - { - } -} \ No newline at end of file diff --git a/Assets/_Datas/Scripts/ModeManager.cs.meta b/Assets/_Datas/Scripts/ModeManager.cs.meta deleted file mode 100644 index d6b0b4361..000000000 --- a/Assets/_Datas/Scripts/ModeManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1b059a9cf476ed345a02926176bb9b34 diff --git a/Assets/_Datas/Scripts/Restaurant.cs b/Assets/_Datas/Scripts/Restaurant.cs deleted file mode 100644 index 130603056..000000000 --- a/Assets/_Datas/Scripts/Restaurant.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Superlazy; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class Restaurant : SLGameComponent -{ - public override void Begin() - { - SceneManager.LoadScene("Scenes/Restaurant", LoadSceneMode.Additive); - - // Load - } - - public override void Update() - { - - } - - public override void End() - { - - } -} \ No newline at end of file diff --git a/Assets/_Datas/Scripts/Restaurant.cs.meta b/Assets/_Datas/Scripts/Restaurant.cs.meta deleted file mode 100644 index da4dab5b2..000000000 --- a/Assets/_Datas/Scripts/Restaurant.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: fd988bb8d403fac4fbec4ab1586764a3 diff --git a/Assets/_Datas/Scripts/Title.cs b/Assets/_Datas/Scripts/Title.cs deleted file mode 100644 index e60eb1c4a..000000000 --- a/Assets/_Datas/Scripts/Title.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Superlazy; -using UnityEngine; - -public class Title : SLGameComponent -{ - public override void Begin() - { - } - - public override void Update() - { - } - - public override void End() - { - } - - - public void GameStart(SLEntity context) - { - SLGame.Session["CurrentMode"] = "Restaurant"; - } - -} diff --git a/Assets/_Datas/Scripts/Title.cs.meta b/Assets/_Datas/Scripts/Title.cs.meta deleted file mode 100644 index 59bc7f7b9..000000000 --- a/Assets/_Datas/Scripts/Title.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 5d25972d902b96743b1e8a503258efea