diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index 1072022..4094783 100644 --- a/Assets/ResWork/Table/Export/GlobalValue.json +++ b/Assets/ResWork/Table/Export/GlobalValue.json @@ -1 +1 @@ -[{"s_ID": "LuckyPoint", "n_Value": "50", "exception": "럭키 포인트 100% 필요량"}, {"s_ID": "LuckyAlbumOpenRate", "n_Value": "0.4", "exception": "앨범 오픈 코인 비율"}, {"s_ID": "LuckyChatCoinRate", "n_Value": "0.1", "exception": "채팅 코인 비율"}, {"s_ID": "LuckyGachaCoinRate", "n_Value": "0.5", "exception": "가챠 코인 비율"}, {"s_ID": "LuckyBlockWithdMin", "n_Value": "280", "exception": "럭키 블록 최소 크기 (가로)"}, {"s_ID": "LuckyBlockWithdMax", "n_Value": "420", "exception": "럭키 블록 최대 크기 (가로)"}, {"s_ID": "LuckyBlockHeightMin", "n_Value": "120", "exception": "럭키 블록 최소 크기 (세로)"}, {"s_ID": "LuckyBlockHeightMax", "n_Value": "120", "exception": "럭키 블록 최대 크기 (세로)"}, {"s_ID": "LuckyBlockSpeedMin", "n_Value": "600", "exception": "럭키 블록 최소 스피드"}, {"s_ID": "LuckyBlockSpeedMax", "n_Value": "800", "exception": "럭키 블록 최대 스피드"}, {"s_ID": "LuckyGame_RefillAmount", "n_Value": "10", "exception": "리필 시 추가 오브젝트 개수"}, {"s_ID": "GachaAmount", "n_Value": "10", "exception": "가챠에 필요한 가챠 코인 개수"}, {"s_ID": "GachaAD_Reward", "n_Value": "50", "exception": "가챠 광고 가챠 코인 보상 개수"}, {"s_ID": "GachaAutoRefill_DelayTime", "n_Value": "30", "exception": "가챠 광고 딜레이 시간 (초)"}, {"s_ID": "GachaAutoRefill_Amount", "n_Value": "5", "exception": "가챠 자동 획득 가챠 코인 보상 개수"}, {"s_ID": "ADSec_Gacha", "n_Value": "600", "exception": "가챠 광고 시간 (초)"}, {"s_ID": "ADSec_Shop", "n_Value": "600", "exception": "상점 광고 시간 (초)"}, {"s_ID": "MiniGameHP", "n_Value": "5", "exception": "미니 게임 HP"}, {"s_ID": "MiniGameSpeedMin", "n_Value": "0.25", "exception": "미니 게임 방해물 최소 속도"}, {"s_ID": "MiniGameSpeedMax", "n_Value": "1", "exception": "미니 게임 방해물 최대 속도"}, {"s_ID": "MiniGameWeight_White", "n_Value": "6500", "exception": "미니 게임 흰 액체 등장 확률"}, {"s_ID": "MiniGameWeight_Red", "n_Value": "800", "exception": "미니 게임 빨간 액체 등장 확률"}, {"s_ID": "MiniGameWeight_HpHeal", "n_Value": "90", "exception": "미니 게임 체력 회복 등장 확률"}, {"s_ID": "MiniGameWeight_AlbumOpen", "n_Value": "160", "exception": "미니 게임 앨범 오픈 재화 등장 확률"}, {"s_ID": "MiniGameWeight_ChatCoin", "n_Value": "50", "exception": "미니 게임 채팅 코인 등장 확률"}, {"s_ID": "MiniGameWeight_GachaCoin", "n_Value": "2250", "exception": "미니 게임 가챠 코인 등장 확률"}, {"s_ID": "MiniGameWeight_ItemBomb", "n_Value": "50", "exception": "미니 게임 폭탄 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemUmbrella", "n_Value": "50", "exception": "미니 게임 우산 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemDildo", "n_Value": "50", "exception": "미니 게임 딜도 아이템 등장 확률"}, {"s_ID": "MiniGamePCSpeed", "n_Value": "550", "exception": "미니 게임 PC 스피드"}, {"s_ID": "MiniGame_White_DMG", "n_Value": "2", "exception": "미니 게임 흰 액체 데미지"}, {"s_ID": "MiniGame_Red_DMG", "n_Value": "5", "exception": "미니 게임 빨간 액체 데미지"}, {"s_ID": "MiniGame_Heal", "n_Value": "3", "exception": "미니 게임 체력 회복량"}, {"s_ID": "MiniGame_Heart_Amount", "n_Value": "1", "exception": "미니 게임 앨범 오픈 재화 획득량"}, {"s_ID": "MiniGame_ChatCoin_Amount", "n_Value": "1", "exception": "미니 게임 채팅 코인 획득량"}, {"s_ID": "MiniGame_GachaCoin_Amount", "n_Value": "1", "exception": "미니 게임 가챠 코인 획득량"}, {"s_ID": "MiniGame_Obtacle_Create_Gap", "n_Value": "0.9", "exception": "1. 최초 생성 시간 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Reduce", "n_Value": "0.01", "exception": "2. 생성시간 감소 값 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Time", "n_Value": "1", "exception": "3. 생성 시간 감소 주기 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_LimitTime", "n_Value": "0.085", "exception": "4. 최대 생성 제한 시간 (초)"}, {"s_ID": "MiniGame_TotalEnterMoney", "n_Value": "3", "exception": "미니게임 체력 총 개수"}, {"s_ID": "MiniGame_EnterMoney_Time", "n_Value": "30", "exception": "미니게임 체력 재충전 시간 (초)"}, {"s_ID": "ShieldTime", "n_Value": "5", "exception": "미니게임 우산 보호막 시간 (초)"}, {"s_ID": "PreviewADTime", "n_Value": "180", "exception": "훔쳐보기 광고 쿨타임 (초)"}, {"s_ID": "SelectGirlHeartPrice", "n_Value": "10", "exception": "캐릭터 변경 하트 코인"}, {"s_ID": "LuckyGachaMaxHeart_Amount", "n_Value": "50", "exception": "모든 캐릭터 앨범이 열린 상태일 경우 럭키 보너스"}, {"s_ID": "FEVER_CONDITION_MIN_COUNT", "n_Value": "50", "exception": ""}, {"s_ID": "GoodType_GoldConRate", "n_Value": "0.97", "exception": "뽑기 재화 등장 확률"}, {"s_ID": "GoodType_ChatConRate", "n_Value": "0", "exception": "채팅 코인 등장 확률"}, {"s_ID": "GoodType_HeartConRate", "n_Value": "0.03", "exception": "하트 코인 등장 확률"}, {"s_ID": "BadType_Timer", "n_Value": "0.97", "exception": ""}, {"s_ID": "BadType_Bomb", "n_Value": "0.03", "exception": ""}] \ No newline at end of file +[{"s_ID": "LuckyPoint", "n_Value": "1", "exception": "럭키 포인트 100% 필요량"}, {"s_ID": "LuckyAlbumOpenRate", "n_Value": "0.4", "exception": "앨범 오픈 코인 비율"}, {"s_ID": "LuckyChatCoinRate", "n_Value": "0.1", "exception": "채팅 코인 비율"}, {"s_ID": "LuckyGachaCoinRate", "n_Value": "0.5", "exception": "가챠 코인 비율"}, {"s_ID": "LuckyBlockWithdMin", "n_Value": "280", "exception": "럭키 블록 최소 크기 (가로)"}, {"s_ID": "LuckyBlockWithdMax", "n_Value": "420", "exception": "럭키 블록 최대 크기 (가로)"}, {"s_ID": "LuckyBlockHeightMin", "n_Value": "120", "exception": "럭키 블록 최소 크기 (세로)"}, {"s_ID": "LuckyBlockHeightMax", "n_Value": "120", "exception": "럭키 블록 최대 크기 (세로)"}, {"s_ID": "LuckyBlockSpeedMin", "n_Value": "600", "exception": "럭키 블록 최소 스피드"}, {"s_ID": "LuckyBlockSpeedMax", "n_Value": "800", "exception": "럭키 블록 최대 스피드"}, {"s_ID": "LuckyGame_RefillAmount", "n_Value": "10", "exception": "리필 시 추가 오브젝트 개수"}, {"s_ID": "GachaAmount", "n_Value": "10", "exception": "가챠에 필요한 가챠 코인 개수"}, {"s_ID": "GachaAD_Reward", "n_Value": "50", "exception": "가챠 광고 가챠 코인 보상 개수"}, {"s_ID": "GachaAutoRefill_DelayTime", "n_Value": "30", "exception": "가챠 광고 딜레이 시간 (초)"}, {"s_ID": "GachaAutoRefill_Amount", "n_Value": "5", "exception": "가챠 자동 획득 가챠 코인 보상 개수"}, {"s_ID": "ADSec_Gacha", "n_Value": "600", "exception": "가챠 광고 시간 (초)"}, {"s_ID": "ADSec_Shop", "n_Value": "600", "exception": "상점 광고 시간 (초)"}, {"s_ID": "MiniGameHP", "n_Value": "5", "exception": "미니 게임 HP"}, {"s_ID": "MiniGameSpeedMin", "n_Value": "0.25", "exception": "미니 게임 방해물 최소 속도"}, {"s_ID": "MiniGameSpeedMax", "n_Value": "1", "exception": "미니 게임 방해물 최대 속도"}, {"s_ID": "MiniGameWeight_White", "n_Value": "6500", "exception": "미니 게임 흰 액체 등장 확률"}, {"s_ID": "MiniGameWeight_Red", "n_Value": "800", "exception": "미니 게임 빨간 액체 등장 확률"}, {"s_ID": "MiniGameWeight_HpHeal", "n_Value": "90", "exception": "미니 게임 체력 회복 등장 확률"}, {"s_ID": "MiniGameWeight_AlbumOpen", "n_Value": "160", "exception": "미니 게임 앨범 오픈 재화 등장 확률"}, {"s_ID": "MiniGameWeight_ChatCoin", "n_Value": "50", "exception": "미니 게임 채팅 코인 등장 확률"}, {"s_ID": "MiniGameWeight_GachaCoin", "n_Value": "2250", "exception": "미니 게임 가챠 코인 등장 확률"}, {"s_ID": "MiniGameWeight_ItemBomb", "n_Value": "50", "exception": "미니 게임 폭탄 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemUmbrella", "n_Value": "50", "exception": "미니 게임 우산 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemDildo", "n_Value": "50", "exception": "미니 게임 딜도 아이템 등장 확률"}, {"s_ID": "MiniGamePCSpeed", "n_Value": "550", "exception": "미니 게임 PC 스피드"}, {"s_ID": "MiniGame_White_DMG", "n_Value": "2", "exception": "미니 게임 흰 액체 데미지"}, {"s_ID": "MiniGame_Red_DMG", "n_Value": "5", "exception": "미니 게임 빨간 액체 데미지"}, {"s_ID": "MiniGame_Heal", "n_Value": "3", "exception": "미니 게임 체력 회복량"}, {"s_ID": "MiniGame_Heart_Amount", "n_Value": "1", "exception": "미니 게임 앨범 오픈 재화 획득량"}, {"s_ID": "MiniGame_ChatCoin_Amount", "n_Value": "1", "exception": "미니 게임 채팅 코인 획득량"}, {"s_ID": "MiniGame_GachaCoin_Amount", "n_Value": "1", "exception": "미니 게임 가챠 코인 획득량"}, {"s_ID": "MiniGame_Obtacle_Create_Gap", "n_Value": "0.9", "exception": "1. 최초 생성 시간 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Reduce", "n_Value": "0.01", "exception": "2. 생성시간 감소 값 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Time", "n_Value": "1", "exception": "3. 생성 시간 감소 주기 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_LimitTime", "n_Value": "0.085", "exception": "4. 최대 생성 제한 시간 (초)"}, {"s_ID": "MiniGame_TotalEnterMoney", "n_Value": "3", "exception": "미니게임 체력 총 개수"}, {"s_ID": "MiniGame_EnterMoney_Time", "n_Value": "30", "exception": "미니게임 체력 재충전 시간 (초)"}, {"s_ID": "ShieldTime", "n_Value": "5", "exception": "미니게임 우산 보호막 시간 (초)"}, {"s_ID": "PreviewADTime", "n_Value": "180", "exception": "훔쳐보기 광고 쿨타임 (초)"}, {"s_ID": "SelectGirlHeartPrice", "n_Value": "10", "exception": "캐릭터 변경 하트 코인"}, {"s_ID": "LuckyGachaMaxHeart_Amount", "n_Value": "50", "exception": "모든 캐릭터 앨범이 열린 상태일 경우 럭키 보너스"}, {"s_ID": "FEVER_CONDITION_MIN_COUNT", "n_Value": "50", "exception": ""}, {"s_ID": "GoodType_GoldConRate", "n_Value": "0.97", "exception": "뽑기 재화 등장 확률"}, {"s_ID": "GoodType_ChatConRate", "n_Value": "0", "exception": "채팅 코인 등장 확률"}, {"s_ID": "GoodType_HeartConRate", "n_Value": "0.03", "exception": "하트 코인 등장 확률"}, {"s_ID": "BadType_Timer", "n_Value": "0.97", "exception": ""}, {"s_ID": "BadType_Bomb", "n_Value": "0.03", "exception": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/table_album.cs b/Assets/ResWork/Table/table_album.cs index 6a51403..ebdabbc 100644 --- a/Assets/ResWork/Table/table_album.cs +++ b/Assets/ResWork/Table/table_album.cs @@ -64,9 +64,10 @@ public class table_album : table_base if (index <= 0) return null; return tableDatas - .GetRange(0, index) - .AsEnumerable() - .Reverse() + .Take(index) // data + .Where(t => t.e_CollectionMethod == eCollectionMethod.Normal) + .Reverse() // ͺ .ToList(); } + public albumtabledata Get_Data(int index) { return Get_DataList().Find(f => f.n_Index == index); } } \ No newline at end of file diff --git a/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab b/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab index 7557964..0af079b 100644 --- a/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab +++ b/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab @@ -2943,6 +2943,7 @@ MonoBehaviour: texts_money: - {fileID: 3197225484109123094} - {fileID: 6159781323281063641} + - {fileID: 3003440591937821467} _timer: {fileID: 8533009102604222213} _fillImage: {fileID: 6137833702473882125} _rushTimeText: {fileID: 5330343615741654754} @@ -3021,7 +3022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2936462688356794030 RectTransform: m_ObjectHideFlags: 0 @@ -3040,7 +3041,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -25.8} + m_AnchoredPosition: {x: -150, y: -25.8} m_SizeDelta: {x: 246, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2002731133134941671 @@ -3400,7 +3401,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8543697093956919703 RectTransform: m_ObjectHideFlags: 0 @@ -3419,7 +3420,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.36, y: 61} + m_AnchoredPosition: {x: 1.36, y: 30} m_SizeDelta: {x: 372.98, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3966599381436452019 @@ -3688,7 +3689,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7240167138773547920 RectTransform: m_ObjectHideFlags: 0 @@ -4314,7 +4315,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6448055094607218252 RectTransform: m_ObjectHideFlags: 0 @@ -6052,6 +6053,7 @@ MonoBehaviour: - {fileID: 9061021693576280242} - {fileID: 3739445889265963103} - {fileID: 9110653302595014617} + - {fileID: 2601511065732257526} --- !u!1 &9124151103754399212 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png new file mode 100644 index 0000000..714443b Binary files /dev/null and b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png differ diff --git a/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png.meta b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png.meta new file mode 100644 index 0000000..d88ffdd --- /dev/null +++ b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_ChatCoinCarrot.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ab88155167ad6d84db3e0673c24f6345 +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: 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: 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 + - 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: 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: [] + 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/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png index 714443b..0c4f3e2 100644 Binary files a/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png and b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png differ diff --git a/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png.meta b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png.meta index 4fcfc5e..27f79ca 100644 --- a/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png.meta +++ b/Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png.meta @@ -1,9 +1,12 @@ fileFormatVersion: 2 -guid: ab88155167ad6d84db3e0673c24f6345 +guid: c0d98ed4704705647ac97af9ee881a04 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 7700500376927275911 + second: Bubble_GoldedCarrot_0 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -67,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,20 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - 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 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,23 +109,33 @@ TextureImporter: 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: [] + sprites: + - serializedVersion: 2 + name: Bubble_GoldedCarrot_0 + rect: + serializedVersion: 2 + x: 56 + y: 57 + width: 327 + height: 327 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 78b03873b4cadda60800000000000000 + internalID: 7700500376927275911 + vertices: [] + indices: + edges: [] + weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -145,6 +145,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushManager.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushManager.cs index f77a65b..72023e4 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushManager.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushManager.cs @@ -145,7 +145,7 @@ public class HorseRushManager : MonoBehaviour // CurrencyManager.Instance.AddGoods(103, heartAmount); SaveMgr.Ins.Add_Money(eMoney.Gacha, (int)coinAmount); - SaveMgr.Ins.Add_Money(eMoney.Chat, rubyAmount); + SaveMgr.Ins.Add_Money(eMoney.AlbumOpen, rubyAmount); SaveMgr.Ins.Save(); m_MiniGameResult.Set(coinAmount, bonuscoin, rubyAmount, maxCombo, maxFeverStreak, missionSuccessPhotoID, () => { _horseRushPanel.gameObject.SetActive(false); }); diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 1bba437..cccc801 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -16,7 +16,7 @@ public class HorseRushPanel : MonoBehaviour [SerializeField] Button _rightButton; [SerializeField] GameObject _leftEffect; [SerializeField] GameObject _rightEffect; - public TextMeshProUGUI[] texts_money; // 0 채팅 코인, 1 골드 + public TextMeshProUGUI[] texts_money; // 0 채팅 코인, 1 골드, 2 하트 #region TEST @@ -335,6 +335,7 @@ public class HorseRushPanel : MonoBehaviour _bottomSlider.value = 1; texts_money[0].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString(); texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString(); + texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.AlbumOpen).ToString(); // 시간 텍스트 초기화 TimeSpan timeSpan = TimeSpan.FromSeconds(_limitTime); diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5ecde68..299ca2a 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -50175,6 +50175,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3574105332676644573, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5075662245161426955, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} propertyPath: m_Name value: GameBG_Girls diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index c68ddb7..400bcb4 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -224,20 +224,24 @@ public class SaveMgr : MonoBehaviourSingletonTemplate { int girl = girllst[i].n_GirlID; - if (!IsObtainGirl(girl)) - continue; + //if (!IsObtainGirl(girl)) + // continue; + + var newlst = new List(); + for (int j = 0; j < m_SaveData.dic_albumOpen[girl].Count; j++) + { + var id = m_SaveData.dic_albumOpen[girl][j].ID; + if (table_album.Ins.Get_Data(id).e_CollectionMethod == eCollectionMethod.Normal) + newlst.Add(new AlbumSaveData { ID = id }); + } var albums = table_album.Ins.Get_AlbumDataList(girl); - - if (!m_SaveData.dic_albumOpen.TryGetValue(girl, out var openedAlbums)) - openedAlbums = new List(); - - if (openedAlbums.Count >= albums.Count) + if (newlst.Count >= albums.Count) continue; // 전부 획득함 // 이미 획득한 앨범 ID HashSet openedSet = new HashSet( - openedAlbums.Select(x => x.ID) + newlst.Select(x => x.ID) ); // 미획득 앨범 @@ -247,6 +251,10 @@ public class SaveMgr : MonoBehaviourSingletonTemplate if (noobtainalbums.Count > 0) { + if (albums.Count - newlst.Count == 1) + { // 마지막 앨범 획득이므로 스페셜 앨범 지급 + Open_Album(table_album.Ins.Get_SpecialAlbum(girl, eCollectionMethod.FullCollection)); + } // 여기서 랜덤 1개 리턴 return noobtainalbums[UnityEngine.Random.Range(0, noobtainalbums.Count)]; } @@ -272,13 +280,8 @@ public class SaveMgr : MonoBehaviourSingletonTemplate } public bool IsObtainGirl(int id) { - var pregirl = id - 1; - if (pregirl > 0) - { - var lst = table_album.Ins.Get_AlbumDataList(pregirl); - return lst.Count == Get_NormalImageCount(pregirl) && Get_NormalImageCount(id) > 0; - } - return true; + var tdata = table_album.Ins.Get_SpecialAlbum(id, eCollectionMethod.Default); + return IsOpenAlbum(tdata); } public bool IsOpenAlbum(albumtabledata data) { diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 787ca37..1a66382 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -172,7 +172,9 @@ public class GachaUI : uScrollViewMgr // 기존 럭키 게임 (old) //LobbyUI.Ins.m_Game_Lucky.Set(); - //Set_UI(false); + + Set_UI(false); + LobbyUI.Ins.m_LobbyCenterProfileUI.Set(false); } } diff --git a/Assets/Scripts/UI/MiniGameResult.cs b/Assets/Scripts/UI/MiniGameResult.cs index 945e6bc..050cfdf 100644 --- a/Assets/Scripts/UI/MiniGameResult.cs +++ b/Assets/Scripts/UI/MiniGameResult.cs @@ -5,7 +5,7 @@ using UnityEngine; public class MiniGameResult : MonoBehaviour { - public TextMeshProUGUI[] texts; // 0 ִ ޺, 1 ޺ ʽ, 2 ȹ ä , 3 ȹ í , 4 ߰ ȹ淮 + public TextMeshProUGUI[] texts; // 0 ִ ޺, 1 ޺ ʽ, 2 ȹ ä , 3 ȹ í , 4 ߰ ȹ淮, 5 ȹ Ʈ ProtectedInt32 m_coinAmount, m_rubyAmount; Action act_off; @@ -23,7 +23,8 @@ public class MiniGameResult : MonoBehaviour texts[0].text = maxCombo.ToString(); texts[1].text = ((int)(maxCombo / 10f)).ToString() + "%"; - texts[2].text = rubyAmount.ToString(); + //texts[2].text = ""; + texts[5].text = rubyAmount.ToString(); texts[3].text = coinAmount.ToString(); texts[4].text = $"+{bonuscoin}"; } @@ -33,7 +34,7 @@ public class MiniGameResult : MonoBehaviour ADInfo.Ins.Show_AD(false, () => { SaveMgr.Ins.Add_Money(eMoney.Gacha, m_coinAmount); - SaveMgr.Ins.Add_Money(eMoney.Chat, m_rubyAmount); + SaveMgr.Ins.Add_Money(eMoney.AlbumOpen, m_rubyAmount); SaveMgr.Ins.Save(); gameObject.SetActive(false); diff --git a/Assets/nightward.txt b/Assets/nightward.txt index ee434dd..7cc4aca 100644 --- a/Assets/nightward.txt +++ b/Assets/nightward.txt @@ -1,11 +1,19 @@ -Default : ⺻ ٹ (1 ijʹ ̰, 2 ijͺʹ ij ٹ ϰ +//Default : ⺻ ٹ (1 ijʹ ̰, 2 ijͺʹ ij ٹ ϰ κ񿡼 "ij " ⺻ ̹ Mission : ǹ 3ȸ ޼ ȹ / Ǵ -FullCollection : ٹ ȹ / Ǵ +//FullCollection : ٹ ȹ / Ǵ Gacha : í 9 ߻ / Ǵ -Normal : ŷ Ǵ Ű ʽ ȹ +//Normal : ŷ Ǵ Ű ʽ ȹ ΰ ٹ ̹ ϴ. 1. ΰ ⺻ : Album ̺ e_CollectionMethod Default ̹ 2. ΰ ǹ : Album ̺ e_CollectionMethod Mission ̹ -3. ΰ ( ̹ ϰ ) : Album ̺ e_CollectionMethod FullCollection ̹ \ No newline at end of file +3. ΰ ( ̹ ϰ ) : Album ̺ e_CollectionMethod FullCollection ̹ + +ij ȵ +̴ϰ īƮ + ٹ ȹ +̴ϰ + +Ȯ url + \ No newline at end of file