iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/lmg' into HEAD

Browse Source 
# Conflicts:
#	Assets/01.Scenes/99.Tycoon_LMG.unity
#	Assets/StreamingAssets/google-services-desktop.json.meta
This commit is contained in:
SweetJJuya 2024-12-27 05:19:37 +09:00
commit 53546c572c
41 changed files with 157301 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/01.Scenes/01.Tycoon.unity
View File

@ -10135,7 +10135,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.z
@ -15521,11 +15521,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -120
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.z
@ -16385,11 +16385,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 120
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.z
@ -28405,11 +28405,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -60
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.z
@ -32061,11 +32061,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 60
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -30
objectReference: {fileID: 0}
- target: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3}
propertyPath: m_LocalPosition.z

76831
Assets/01.Scenes/99.T47.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/01.Scenes/99.T47.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: eb9a8ee373c285045ab43bce1e6f7350
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

79722
Assets/01.Scenes/99.T48.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/01.Scenes/99.T48.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8a25b5aa40c3d1541a4149de5db259b6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/01.Scenes/99.T46.unity → Assets/01.Scenes/Old/99.T46.unity
View File

0
Assets/01.Scenes/99.T46.unity.meta → Assets/01.Scenes/Old/99.T46.unity.meta
View File

52
Assets/02.Scripts/FirebaseDatabaseManager.cs Normal file
View File

@ -0,0 +1,52 @@
using System.Collections.Generic;
using Sirenix.OdinInspector;
namespace BlueWater
{
public class FirebaseUserData
{
static FirebaseUserData Create(string userName)
{
FirebaseUserData userData = new FirebaseUserData();
return userData;
}
public string _nickname { get; private set;}
public int _round { get; private set;}
public int _gold { get; private set;}
public int _time { get; private set;}
public int _tries { get; private set;}
}
public class FirebaseDatabaseManager : Singleton<FirebaseDatabaseManager>
{
private List<FirebaseUserData> _userDatas;
public void WriteData(FirebaseUserData userData)
{
}
public void ReadData()
{
_userDatas.Clear();
}
protected override void OnAwake()
{
InitializeComponents();
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
}
}
}

2
Assets/02.Scripts/FirebaseDatabaseManager.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e511025671c43384fbcde655ce9d1214

84
Assets/02.Scripts/Tycoon/GameClear.cs Normal file
View File

@ -0,0 +1,84 @@
using System.Collections;
using BlueWater;
using BlueWater.Uis;
using UnityEngine;
using UnityEngine.UI;
public class GameClear: PopupUi
{
[SerializeField]
private GameObject _panel;
[SerializeField]
private Image _stempImage;
[SerializeField]
private Image _backgroundImage;
private void Start()
{
EventManager.OnLevelUp += StartClearPopup;
}
private void OnDestroy()
{
EventManager.OnLevelUp -= StartClearPopup;
}
public override void Open()
{
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
PopupUiController.RegisterPopup(this);
_panel.SetActive(true);
IsOpened = true;
StartCoroutine(StartClearPopupCoroutine());
}
public override void Close()
{
_panel.SetActive(false);
PopupUiController.UnregisterPopup(this);
PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon);
IsOpened = false;
VisualFeedbackManager.Instance.ResetTimeScale();
EventManager.InvokeShowResult();
}
private void StartClearPopup(LevelData currentLevelData)
{
Debug.Log("Clear!!" + currentLevelData.Idx);
if (currentLevelData.Idx != 100.ToString()) return;
Open();
}
private IEnumerator StartClearPopupCoroutine()
{
float timer = 0f;
while (timer < 0.5)
{
timer += Time.unscaledDeltaTime;
float t = timer / 0.5f;
float easedT = EaseEffect.BounceOut(t);
_stempImage.transform.localScale =
Vector3.Lerp(new Vector3(5.0f, 5.0f, 1.0f), new Vector3(1.0f, 1.0f, 1.0f), easedT);
yield return null;
}
timer = 0f;
while (timer < 3.0) //단순 딜레이
{
timer += Time.unscaledDeltaTime;
yield return null;
}
Close();
}
}

2
Assets/02.Scripts/Tycoon/GameClear.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: aa42998c0e2cf554a9ecb3fe52f0ec1d

121
Assets/02.Scripts/Ui/Tycoon/RankRow.cs
View File

@ -1,19 +1,130 @@
using System.Collections.Generic;
using System.Collections;
using System.Globalization;
using System.Threading.Tasks;
using UnityEngine.Networking;
using Firebase.Database;
using Firebase.Extensions;
using TMPro;
using UnityEngine;
public class RankRow : MonoBehaviour
{
private DatabaseReference m_Reference;
[SerializeField]
private TextMeshPro rankText;
[SerializeField]
private TextMeshPro nameText;
[SerializeField]
private TextMeshPro goldText;
[SerializeField]
private TextMeshPro timeText;
[SerializeField]
private TextMeshPro triesText;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
m_Reference = FirebaseDatabase.DefaultInstance.RootReference;
}
// Update is called once per frame
void Update()
public void WriteUserData(string nickname)
{
string currentLanguage = CultureInfo.CurrentCulture.Name; // 예: "en-US"
string ipAddress = GetPublicIP(); //공인 IP 주소
if (string.IsNullOrEmpty(nickname) || string.IsNullOrEmpty(ipAddress)) //비어있는 필수 객체 확인하기.
{
Debug.LogError("User ID or Username cannot be null or empty.");
return;
}
var userData = new Dictionary<string, object>
{
{ "Nickname", nickname },
{ "Language", currentLanguage },
{ "IP", ipAddress }
};
m_Reference.Child("users").Child(nickname).SetValueAsync(userData).ContinueWithOnMainThread(task =>
{
if (task.IsFaulted)
{
//Debug.LogError("Error writing data: " + task.Exception);
}
else if (task.IsCompleted)
{
//Debug.Log($"Successfully wrote data for User ID: {userId}, Username: {username}");
}
});
}
public string GetPublicIP()
{
using (UnityWebRequest webRequest = UnityWebRequest.Get("https://api.ipify.org?format=text"))
{
var operation = webRequest.SendWebRequest();
while (!operation.isDone)
{
// Wait until the operation is done
}
if (webRequest.result == UnityWebRequest.Result.ConnectionError || webRequest.result == UnityWebRequest.Result.ProtocolError)
{
Debug.LogError("Error getting public IP: " + webRequest.error);
return null;
}
else
{
return webRequest.downloadHandler.text;
}
}
}
public void GetAllUsersData()
{
// "users" 노드에 있는 전체 데이터를 가져옴
m_Reference.Child("users").GetValueAsync().ContinueWithOnMainThread(task =>
{
if (task.IsFaulted)
{
// 에러 처리
Debug.LogError("Failed to get data: " + task.Exception);
}
else if (task.IsCompleted)
{
DataSnapshot snapshot = task.Result;
if (snapshot.Exists)
{
Debug.Log("All Users Data:");
// users 하위 노드의 데이터를 순회
foreach (DataSnapshot userSnapshot in snapshot.Children)
{
string userId = userSnapshot.Key; // 예: 유저의 고유 키
string nickname = userSnapshot.Child("Nickname").Value?.ToString();
//string round = userSnapshot.Child("Round").Value?.ToString();
//string gold = userSnapshot.Child("Gold").Value?.ToString();
//string time = userSnapshot.Child("Time").Value?.ToString();
//string tries = userSnapshot.Child("Tries").Value?.ToString();
string language = userSnapshot.Child("Language").Value?.ToString();
string ipAddress = userSnapshot.Child("IP").Value?.ToString();
Debug.Log($"User ID: {userId}, Nickname: {nickname}, Language: {language}, IP: {ipAddress}");
}
}
else
{
Debug.Log("No users data found.");
}
}
});
}
}

BIN
Assets/03.Images/Maps/test/A2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 355 KiB

BIN
Assets/03.Images/Maps/test/Barrel01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 KiB

2
Assets/03.Images/Maps/test/wall5.png.meta → Assets/03.Images/Maps/test/Barrel01.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ae0929cedaa16de4691cfc6de33ecfc4
guid: ea1eb29c2fa2dfb468521cc72c556c6a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

BIN
Assets/03.Images/Maps/test/PlayerBalloon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
Assets/03.Images/Maps/test/WallBar2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 KiB

6
Assets/03.Images/Maps/test/PlayerBalloon.png.meta → Assets/03.Images/Maps/test/WallBar2.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e52358c77c5bc9f45a388ab468618ba1
guid: 08391b26217ebb344a7bf2d72847e9ee
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -46,9 +46,9 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

BIN
Assets/03.Images/Maps/test/Web01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

4
Assets/03.Images/Maps/test/test.png.meta → Assets/03.Images/Maps/test/Web01.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: caf21c5f0e2ad5644ae37eff779381e4
guid: 9e6d665713d2c874abeba5ac3c5da830
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

BIN
Assets/03.Images/Maps/test/Web02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 65 KiB

4
Assets/03.Images/Maps/test/A2.png.meta → Assets/03.Images/Maps/test/Web02.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f62b43001c46a87439e93f884ab5e191
guid: 23b5a795c216c9745bce7fea1aa0c59a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

BIN
Assets/03.Images/Maps/test/Web03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

4
Assets/03.Images/Maps/test/test8.png.meta → Assets/03.Images/Maps/test/Web03.png.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 99c1c60e13bb86143aa4eb6083eb9a94
guid: 257f146cb79ef9544a80bff5e9dec562
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

BIN
Assets/03.Images/Maps/test/test.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
Assets/03.Images/Maps/test/test8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
Assets/03.Images/Maps/test/wall1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

143
Assets/03.Images/Maps/test/wall1.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 667821a4c87008e46b8cb2c28f0ffce6
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1024
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: 1
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
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:

BIN
Assets/03.Images/Maps/test/wall5 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

143
Assets/03.Images/Maps/test/wall5 1.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 0858cb2d56f738e4f876e153f4ef4b06
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1024
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: 1
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
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:

BIN
Assets/03.Images/Maps/test/wall5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
Assets/03.Images/Ui/Tycoon/ClearStemp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 118 KiB

143
Assets/03.Images/Ui/Tycoon/ClearStemp.png.meta Normal file
View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 3f99828f3b98ef441a7ea3d87faec372
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: 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: 4
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: 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: iOS
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: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

5
Assets/04.Materials/Ink.mat
View File

@ -99,15 +99,16 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _Edge: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Opacity: 0.9
- _Opacity: 0.86
- _Parallax: 0.005
- _Position: 0.4
- _Position: 0.41
- _QueueOffset: 0
- _ReceiveShadows: 1
- _ShadeContrast: 0

8
Assets/05.Prefabs/Uis/Tycoons/Bill.prefab
View File

@ -51,7 +51,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
@ -594,7 +594,9 @@ MonoBehaviour:
_tableNumberImageObject: {fileID: 2596367034953283962}
_tableNumberText: {fileID: 882719813517343284}
_startColor: {r: 0, g: 1, b: 0, a: 1}
_middleColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_endColor: {r: 1, g: 0, b: 0, a: 1}
resultSfxName: BillResult
--- !u!114 &5491020201375474307
MonoBehaviour:
m_ObjectHideFlags: 0
@ -750,8 +752,8 @@ MonoBehaviour:
m_Calls: []
m_text: 1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []

BIN
Assets/06.Sounds/Bgm/Halloween (short 1).mp3
View File

Binary file not shown.

BIN
Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

4
Assets/09.Shaders/Ink.shader
View File

@ -124,6 +124,10 @@ Shader "Unlit/Ink"
float mappedFloat = lerp(-4.0, 1.5, _Position);
uv.x = uv.x * 3.5 + mappedFloat;
// float uvx = uv.x;
// uv.x = uv.y;
// uv.y = uvx;
float timeValue = _CustomTime * _Speed; // 시간 값

14
Assets/StreamingAssets/GoogleService-Info.plist
View File

@ -3,17 +3,17 @@
<plist version="1.0">
<dict>
<key>API_KEY</key>
<string>AIzaSyBWnBVlWIKZkrqbT9qylXsgSXcAKuyLnUM</string>
<string>AIzaSyDetshpPepjuBLNC-KRUycsvxBpsdd1bmo</string>
<key>GCM_SENDER_ID</key>
<string>104010899787</string>
<string>1011798272954</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.capers.bluewater</string>
<string>com.capers.ghostpub</string>
<key>PROJECT_ID</key>
<string>test001-4ee71</string>
<string>ghostpub-3d8ef</string>
<key>STORAGE_BUCKET</key>
<string>test001-4ee71.firebasestorage.app</string>
<string>ghostpub-3d8ef.firebasestorage.app</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
@ -25,8 +25,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:104010899787:ios:a6481a7a319b2bbdf188ce</string>
<key>DATABASE_URL</key>
<string>https://test001-4ee71-default-rtdb.firebaseio.com</string>
<string>1:1011798272954:ios:e78a98d97d5c61f6ed0b83</string>
</dict>
</plist>

13
Assets/StreamingAssets/google-services-desktop.json
View File

@ -1,22 +1,21 @@
{
"project_info": {
"project_number": "104010899787",
"firebase_url": "https://test001-4ee71-default-rtdb.firebaseio.com",
"project_id": "test001-4ee71",
"storage_bucket": "test001-4ee71.firebasestorage.app"
"project_number": "1011798272954",
"project_id": "ghostpub-3d8ef",
"storage_bucket": "ghostpub-3d8ef.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:104010899787:android:e10db6217437bb9ff188ce",
"mobilesdk_app_id": "1:1011798272954:android:13468400c1a97543ed0b83",
"android_client_info": {
"package_name": "com.capers.bluewater"
"package_name": "com.capers.ghostpub"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyDPlwgwGpKVRRbqZIUnlfizofXSdS_EW2I"
"current_key": "AIzaSyD6DDYU08Y8HFCL_5FzgWknNA4ZXYojswo"
}
],
"services": {

13
Assets/StreamingAssets/google-services.json
View File

@ -1,22 +1,21 @@
{
"project_info": {
"project_number": "104010899787",
"firebase_url": "https://test001-4ee71-default-rtdb.firebaseio.com",
"project_id": "test001-4ee71",
"storage_bucket": "test001-4ee71.firebasestorage.app"
"project_number": "1011798272954",
"project_id": "ghostpub-3d8ef",
"storage_bucket": "ghostpub-3d8ef.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:104010899787:android:e10db6217437bb9ff188ce",
"mobilesdk_app_id": "1:1011798272954:android:13468400c1a97543ed0b83",
"android_client_info": {
"package_name": "com.capers.bluewater"
"package_name": "com.capers.ghostpub"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyDPlwgwGpKVRRbqZIUnlfizofXSdS_EW2I"
"current_key": "AIzaSyD6DDYU08Y8HFCL_5FzgWknNA4ZXYojswo"
}
],
"services": {