diff --git a/Assets/02.Scripts/Character/SpineController.cs b/Assets/02.Scripts/Character/SpineController.cs index ab8b4ca29..1e295bc37 100644 --- a/Assets/02.Scripts/Character/SpineController.cs +++ b/Assets/02.Scripts/Character/SpineController.cs @@ -53,22 +53,8 @@ namespace BlueWater.Players InitializeComponents(); } - #endregion - - // Initialize methods - #region Initialize methods - - [Button("셋팅 초기화")] - public virtual void InitializeComponents() + private void Start() { - SkeletonAnimation = transform.GetComponentInChildren(); - if (!_originalMaterial) - { - _originalMaterial = SkeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; - } - - _animationState = SkeletonAnimation.AnimationState; - if (_isRandomSkin) { if (_isRandomRange) @@ -85,6 +71,23 @@ namespace BlueWater.Players SetSkin(_initialSkinName); } } + + #endregion + + // Initialize methods + #region Initialize methods + + [Button("셋팅 초기화")] + public virtual void InitializeComponents() + { + SkeletonAnimation = transform.GetComponentInChildren(); + if (!_originalMaterial) + { + _originalMaterial = SkeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; + } + + _animationState = SkeletonAnimation.AnimationState; + } #endregion diff --git a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs index 72b473b78..38ccefd21 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Mushroom.cs @@ -20,6 +20,11 @@ namespace BlueWater.Tycoons private void Update() { + if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) + { + Destroy(); + } + if (IsShowing) { EventManager.InvokeHoldInteracting(HoldingElapsedTime); @@ -48,7 +53,7 @@ namespace BlueWater.Tycoons public void Initialize() { - InteractionCanvas.BalloonUi.ShowUi(); + InteractionCanvas.BalloonUi.OrderItem(0, TycoonManager.Instance.TycoonStageController.StageDataSo.MushroomWaitTime); } public override void Interaction() diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 465920f55..79640d1fb 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -42,6 +42,9 @@ namespace BlueWater.Tycoons [SerializeField] private string _changeRandomBoxSfxName = "ChangeRandomBox"; + [SerializeField] + private string _changeRandomCocktailSfxName = "ChangeRandomCocktail"; + private bool _isPlayerInteracting; private bool _canInteraction = true; @@ -217,6 +220,7 @@ namespace BlueWater.Tycoons EventManager.InvokeChangedRandomCocktail(randomCocktail); EventManager.InvokeCocktailCompleted(randomCocktail, false); InteractionCanvas.BalloonUi.OrderItem(0, TycoonManager.Instance.TycoonStageController.StageDataSo.RandomChangeWaitTime); + AudioManager.Instance.PlaySfx(_changeRandomCocktailSfxName); HoldingElapsedTime = 0f; _canInteraction = false; diff --git a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset index 9033c8f26..4e185556f 100644 --- a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset +++ b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset @@ -133,3 +133,5 @@ MonoBehaviour: k__BackingField: {fileID: 8300000, guid: a041f5ba1fec6304895b80091ebf431b, type: 3} - k__BackingField: RareCardOpen k__BackingField: {fileID: 8300000, guid: 28272de0f0479f94691b57e097565010, type: 3} + - k__BackingField: ChangeRandomCocktail + k__BackingField: {fileID: 8300000, guid: 1aa0c8d522ad97142b364d31409681eb, type: 3} diff --git a/Assets/02.Scripts/Tycoon/StageDataSo.cs b/Assets/02.Scripts/Tycoon/StageDataSo.cs index f90abc093..0f56e0821 100644 --- a/Assets/02.Scripts/Tycoon/StageDataSo.cs +++ b/Assets/02.Scripts/Tycoon/StageDataSo.cs @@ -21,7 +21,7 @@ namespace BlueWater.Tycoons public int DirtyTableWaitTime { get; private set; } = 30; [field: SerializeField] - public int MushroomWaitTime { get; private set; } = 30; + public int MushroomWaitTime { get; private set; } = 120; [field: SerializeField] public int ServingBonusCount { get; private set; } = 6; diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index 7f28cc67d..39ad32c83 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -148,7 +148,7 @@ namespace BlueWater.Tycoons { EventManager.InvokeAutoSupplyBarrels(); } - _tycoonStatus.BarrelAutoIncrease += 3; + _tycoonStatus.BarrelAutoIncrease += 5; break; case "ServerNpcUpgrade": _tycoonStatus.ServerTipMultiplier += 0.1f; diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index b5d9a0758..b1cc263e1 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -2216,7 +2216,6 @@ Transform: - {fileID: 5578779526326982216} - {fileID: 2293958163153770537} - {fileID: 689968658835591552} - - {fileID: 4344715145151621724} - {fileID: 3095616540887016565} - {fileID: 7086014105546016486} - {fileID: 857916852457137265} @@ -8079,93 +8078,6 @@ Transform: - {fileID: 1468205683951429771} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4049649860807354816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4344715145151621724} - - component: {fileID: 2049121804750255304} - m_Layer: 0 - m_Name: Web01 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4344715145151621724 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049649860807354816} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0, z: -0, w: 1} - m_LocalPosition: {x: 6.8289995, y: -4.7820215, z: -3.2285023} - m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1184480094916943590} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &2049121804750255304 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049649860807354816} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 10 - m_Sprite: {fileID: 21300000, guid: 9e6d665713d2c874abeba5ac3c5da830, type: 3} - m_Color: {r: 0.36862746, g: 0.36862746, b: 0.36862746, 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 &4049722829107676396 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Random_Box_Get.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Random_Box_Get.mp3.meta new file mode 100644 index 000000000..b0e9b2bcc --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Random_Box_Get.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1aa0c8d522ad97142b364d31409681eb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/13.Localization/StringDataTable.csv b/Assets/13.Localization/StringDataTable.csv index d30788525..22085b7d3 100644 --- a/Assets/13.Localization/StringDataTable.csv +++ b/Assets/13.Localization/StringDataTable.csv @@ -18,11 +18,11 @@ GoldBoost,골드 획득량 +10%,Increases gold earnings by 10%,金币获得量 AllCleanUp,주점 내부 모두 청소,Cleans the entire bar interior,打扫整个酒馆内部,打掃整個酒館內部,居酒屋の中のすべての掃除,Limpieza de todo el interior del local,Очищает весь интерьер бара,Nettoie l’intérieur entier du bar GaugeReset,손님들의 기다림 시간 초기화,Resets customers' wait time,重置顾客等待时间,重置顧客等待時間,お客様の待ち時間の初期化,Restablecimiento del tiempo de espera de los clientes,Сбрасывает время ожидания клиентов,Réinitialise le temps d’attente des clients DashCooldownReduction,대시 쿨타임 -1초,Reduces dash cooldown by 1 second,急速移动冷却时间缩短-1秒,急速移動冷卻時間縮短-1秒,ダッシュクールタイム - 1秒,Recuperación de impulso -1s,Уменьшает время восстановления рывка на 1 секунду,Réduit le temps de récupération du sprint de 1 seconde -TipBoost,팁 획득량 +10%,Increases tip earnings by 10%,小费获得量增加+10%,小費獲得量增加+10%,チップ獲得量+10%,Obtención de propina +10%,Увеличивает доходы от чаевых на 10%,Augmente les pourboires de 10 % +TipBoost,팁 획득량 +10%,Increases tip earnings by 10%,小费获得量增加+10%,小費獲得量增加+10%,チップ獲得量+10%,Obtención de propina +20%,Увеличивает доходы от чаевых на 10%,Augmente les pourboires de 10 % EndGoldBoost,게임오버 후 골드 회수 비율 +10%,Increases gold recovery rate after a game over by 10%,游戏结束后金币回收率增加+10%,遊戲結束後金幣回收率增加+10%,ゲームオーバー後のゴールド回収比率+10%,Recaudación de oro tras la partida +10%,Увеличивает восстановление золота после окончания игры на 10%,Augmente le taux de récupération d’or après un échec de 10 % AllCustomerPurification,현재 손님들 모두 퇴장,Dismisses all current customers,当前顾客全部离场,當前顧客全部離場,現在、お客様は全員退場,Salida de todos los clientes actuales,Удаляет всех текущих клиентов,Expulse tous les clients actuels GaugeTimeUp,손님들의 기다림 시간 +3초,Increases the waiting time of customers by 3 seconds,顾客的等待时间增加+3秒,顧客的等待時間增加+3秒,お客様の待ち時間+3秒,Tiempo de espera de los clientes +3s,Увеличивает время ожидания клиентов на 3 секунды,Augmente le temps d’attente des clients de 3 secondes -BarrelAutoSupply,모든 칵테일 재료가 초당 +3ml 자동 충전,Auto-recharges +3ml of every alcohol ingredient per second,所有鸡尾酒材料每秒自动补充+3ml,所有雞尾酒材料每秒自動補充+3ml,すべてのカクテルの材料が1秒当たり+3ml自動充電,Recarga automática de todos los ingredientes de cóctel +3ml/s,Автоматически добавляет +3 мл каждого алкогольного ингредиента в секунду,Recharge automatiquement +3 ml de chaque ingrédient alcoolisé par seconde +BarrelAutoSupply,모든 칵테일 재료가 초당 +5ml 자동 충전,Auto-recharges +5ml of every alcohol ingredient per second,所有鸡尾酒材料每秒自动补充+5ml,所有雞尾酒材料每秒自動補充+5ml,すべてのカクテルの材料が1秒当たり+5ml自動充電,Recarga automática de todos los ingredientes de cóctel +5ml/s,Автоматически добавляет +5 мл каждого алкогольного ингредиента в секунду,Recharge automatiquement +5 ml de chaque ingrédient alcoolisé par seconde ServerNpcUpgrade,서빙 종업원의 팁 획득량 +10%,Increases server tip earnings by 10%,服务员的小费获得量增加+10%,服務員的小費獲得量增加+10%,サービング従業員のチップ獲得量+10%,Obtención de propina de los mozos +10%,Увеличивает доходы от чаевых официанта на 10%,Augmente les pourboires des serveurs de 10 % CleanerNpcUpgrade,종업원의 청소 시간 -1초,Reduces employees' cleaning time by 1 second,员工打扫时间缩短-1秒,員工打掃時間縮短-1秒,従業員の清掃時間 -1秒,Tiempo de limpieza del empleado -1s,Уменьшает время уборки сотрудниками на 1 секунду,Réduit le temps de nettoyage des employés de 1 seconde BartenderNpcUpgrade,종업원의 칵테일 제조 속도 -1초,Reduces employees' cocktail production speed by 1 second,员工鸡尾酒调制速度缩短-1秒,員工雞尾酒調製速度縮短-1秒,従業員のカクテル製造速度 -1秒,Tiempo de preparación de trago del empleado -1s,Уменьшает время приготовления коктейлей сотрудниками на 1 секунду,Réduit le temps de préparation des cocktails des employés de 1 seconde @@ -32,17 +32,16 @@ PassiveRandomChange,"특정 휴지통을 랜덤 박스로 변경 Try discarding a cocktail into a random box!","特定垃圾桶变成随机箱 请将鸡尾酒丢弃到随机箱中！）","特定垃圾桶變成隨機箱 請將雞尾酒丟棄到隨機箱中！","特定のゴミ箱をランダムボックスに変更 -ランダムボックスにカクテルを捨ててください！","Cambio de basurero específico por caja aleatoria -¡Tira el cóctel en una caja aleatoria!","Изменяет некоторые мусорные баки на случайные ящики +ランダムボックスにカクテルを捨ててください！",Cambio de basurero específico por caja aleatoria ¡Tira el cóctel en una caja aleatoria!,"Изменяет некоторые мусорные баки на случайные ящики Попробуйте выбросить коктейль в случайный ящик!","Transforme certaines poubelles en boîtes aléatoires Essayez de jeter un cocktail dans une boîte aléatoire !" PassiveGoldAutoGain,60초마다 계산대의 골드 자동으로 회수,Automatically collects gold from the register every 60 seconds,每60秒自动回收收银台的金币,每60秒自動回收收銀臺的金幣,60秒ごとにレジのゴールドを自動的に回収,Recaudación automática de oro de la registradora cada 60s,Автоматически собирает золото из кассы каждые 60 секунд,Collecte automatiquement l’or de la caisse toutes les 60 secondes PassiveMakingBonus,칵테일 제조 성공시 팁 획득량만큼 골드 획득,Earns gold equal to tip earnings upon successfully crafting a cocktail,鸡尾酒调制成功时，获得与小费获得量相同的金币数量,雞尾酒調製成功時，獲得與小費獲得量相同的金幣數量,カクテル製造に成功した場合、チップ獲得量だけゴールド獲得,Obtención de oro según la propina obtenida al preparar con éxito un cóctel,"Зарабатывает золото, равное чаевым, при успешном приготовлении коктейля",Gagne de l’or équivalent aux pourboires en cas de création réussie d’un cocktail -PassiveServingBonus,서빙 6번 성공시 하트 반 개 회복,Restores half a heart after successfully serving 6 times,成功出餐6次时，恢复半个爱心,成功出餐6次時，恢復半個愛心,サービング6回成功したらハート半分回復,Recuperación de medio corazón al servir 6 veces con éxito,Восстанавливает половину сердца после успешной подачи 6 коктейлей,Restaure un demi-cœur après avoir servi 6 cocktails avec succès +PassiveServingBonus,서빙 6번 성공시 하트 반 개 회복,Restores half a heart after successfully serving 6 times,成功出餐6次时，恢复半个爱心,成功出餐6次時，恢復半個愛心,サービング6回成功したらハート半分回復,Recuperación de medio corazón al servir 3 veces con éxito,Восстанавливает половину сердца после успешной подачи 6 коктейлей,Restaure un demi-cœur après avoir servi 6 cocktails avec succès PassiveCleaningBonus,청소 5번 성공시 바텐더의 제조 속도가 30초간 x2배 빨라짐,Increases the bartender’s crafting speed by 2x for 30 seconds after successfully cleaning 5 times,成功打扫5次时，调酒师的调酒速度30秒内加快x2倍,成功打掃5次時，調酒師的調酒速度30秒內加快x2倍,掃除5回成功するとバーテンダーの製造速度が30秒間x2倍速くなる,Velocidad de preparación del barman x2 durante 30s al limpiar 5 veces con éxito,Увеличивает скорость приготовления коктейлей барменом в 2 раза на 30 секунд после,Double la vitesse de préparation des cocktails par le barman pendant 30 secondes après 5 nettoyages réussis InteractionVomiting,구토 치우기,Clean Up Vomit,清理呕吐物,清理嘔吐物,嘔吐の片づけ,Limpiar vómito,Убрать рвоту,Nettoyer le vomi InteractionTableSeat,책상 치우기,Clean Up Table,清理书桌,清理書桌,机の片付け,Limpiar mesa,Убрать со стола,Nettoyer la table -InteractionMushroom,버섯 치우기,Clean Up Mushroom,清理蘑菇,清理蘑菇,きのこの片づけ,Limpiar hongo,Убрать гриб,Nettoyer le champignon +InteractionMushroom,버섯 치우기,Clean Up Mushroom,清理蘑菇,清理蘑菇,きのこの片づけ,Eliminar setas,Убрать гриб,Nettoyer le champignon InteractionMoneyCounter,골드 회수하기,Collect Gold,回收金币,回收金幣,ゴールド回収,Recaudar oro,Собрать золото,Ramasser l’or InteractionServingTablePickUp,칵테일 들기,Hold Cocktail,举起鸡尾酒,舉起雞尾酒,カクテルを持ち上げること,Levantar cóctel,Взять коктейль,Tenir le cocktail InteractionServingTablePutDown,칵테일 내려놓기,Put Down Cocktail,放下鸡尾酒,放下雞尾酒,カクテルを下ろすこと,Bajar cóctel,Поставить коктейль,Déposer le cocktail @@ -57,7 +56,7 @@ Options,옵션,Options,设置,設置,オプション,Ajustes,Настройки, Quit,종료,Exit,结束,結束,終了,Salir,Выход,Quitter Sound,소리,Sound,声音,聲音,音,Sonidos,Звук,Son Graphic,그래픽,Graphics,图像,圖像,グラフィック,Gráficos,Графика,Graphismes -Master,마스터,Master,主,主,マスター,Principal,Общие,Principal +Master,마스터,Master,主,主,マスター,Todo,Общие,Principal Bgm,배경음,BGM,背景音,背景音,背景音,Música de fondo,Фоновая музыка (BGM),Musique de fond (BGM) Sfx,효과음,SFX,效果音,效果音,効果音,Efectos de sonido,Звуковые эффекты (SFX),Effets sonores (SFX) Display,디스플레이,Display,显示,顯示,ディスプレイ,Pantalla,Экран,Affichage @@ -91,7 +90,7 @@ MarginOfError,오차 범위,Margin of Error,误差范围,誤差範圍,誤差範 YouDie,당신은 죽었습니다,You Die,你死了,你死了,あなたは死にました,Has Muerto,Вы умираете,Vous êtes mort Round,라운드,Round,回合,回合,ラウンド,Ronda,Раунд,Manche PressAnyKey,아무 키나 입력해 주세요,Press Any Key,请按任意键,請按任意鍵,どのキーでも入力してください,Toca cualquier tecla,Нажмите любую клавишу,Appuyez sur une touche -Continue,계속하기,Continue,继续,繼續,継続,Continuar,Продолжить,Continuer +Continue,계속하기,Continue,继续,繼續,継続,Seguir juego,Продолжить,Continuer PlayTime,플레이 시간,Play Time,游戏时间,遊戲時間,プレイ時間,Tiempo de juego,Время игры,Temps de jeu TotalGold,최종 골드,Total Gold,最终金币,最終金幣,最終ゴールド,Oro final,Всего золота,Or total Card,카드,Card,卡,卡,カード,Carta,Карта,Carte diff --git a/Assets/13.Localization/Tables/StringDataTable_en.asset b/Assets/13.Localization/Tables/StringDataTable_en.asset index 89ccd7a57..ef74e806e 100644 --- a/Assets/13.Localization/Tables/StringDataTable_en.asset +++ b/Assets/13.Localization/Tables/StringDataTable_en.asset @@ -111,7 +111,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: Auto-recharges +3ml of every alcohol ingredient per second + m_Localized: Auto-recharges +5ml of every alcohol ingredient per second m_Metadata: m_Items: [] - m_Id: 12185765163031 diff --git a/Assets/13.Localization/Tables/StringDataTable_es-ES.asset b/Assets/13.Localization/Tables/StringDataTable_es-ES.asset index 53a355b6d..4aa6c0e9d 100644 --- a/Assets/13.Localization/Tables/StringDataTable_es-ES.asset +++ b/Assets/13.Localization/Tables/StringDataTable_es-ES.asset @@ -95,7 +95,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163026 - m_Localized: "Obtenci\xF3n de propina +10%" + m_Localized: "Obtenci\xF3n de propina +20%" m_Metadata: m_Items: [] - m_Id: 12185765163027 @@ -111,7 +111,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: "Recarga autom\xE1tica de todos los ingredientes de c\xF3ctel +3ml/s" + m_Localized: "Recarga autom\xE1tica de todos los ingredientes de c\xF3ctel +5ml/s" m_Metadata: m_Items: [] - m_Id: 12185765163031 @@ -131,8 +131,8 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163035 - m_Localized: "Cambio de basurero espec\xEDfico por caja aleatoria \n\xA1Tira - el c\xF3ctel en una caja aleatoria!" + m_Localized: "Cambio de basurero espec\xEDfico por caja aleatoria \xA1Tira el + c\xF3ctel en una caja aleatoria!" m_Metadata: m_Items: [] - m_Id: 12185765163036 @@ -145,7 +145,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163038 - m_Localized: "Recuperaci\xF3n de medio coraz\xF3n al servir 6 veces con \xE9xito" + m_Localized: "Recuperaci\xF3n de medio coraz\xF3n al servir 3 veces con \xE9xito" m_Metadata: m_Items: [] - m_Id: 12185765163039 @@ -162,7 +162,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 43158066180096 - m_Localized: Limpiar hongo + m_Localized: Eliminar setas m_Metadata: m_Items: [] - m_Id: 43510928781312 @@ -222,7 +222,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 656750005780480 - m_Localized: Principal + m_Localized: Todo m_Metadata: m_Items: [] - m_Id: 656828409905152 @@ -358,7 +358,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 1755640098992128 - m_Localized: Continuar + m_Localized: Seguir juego m_Metadata: m_Items: [] - m_Id: 1758559271661568 diff --git a/Assets/13.Localization/Tables/StringDataTable_fr.asset b/Assets/13.Localization/Tables/StringDataTable_fr.asset index c75fbf828..cda2cb396 100644 --- a/Assets/13.Localization/Tables/StringDataTable_fr.asset +++ b/Assets/13.Localization/Tables/StringDataTable_fr.asset @@ -112,7 +112,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: "Recharge automatiquement +3 ml de chaque ingr\xE9dient alcoolis\xE9 + m_Localized: "Recharge automatiquement +5 ml de chaque ingr\xE9dient alcoolis\xE9 par seconde" m_Metadata: m_Items: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_ja.asset b/Assets/13.Localization/Tables/StringDataTable_ja.asset index bd3d972dd..fe2128626 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ja.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ja.asset @@ -113,7 +113,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: "\u3059\u3079\u3066\u306E\u30AB\u30AF\u30C6\u30EB\u306E\u6750\u6599\u304C1\u79D2\u5F53\u305F\u308A+3ml\u81EA\u52D5\u5145\u96FB" + m_Localized: "\u3059\u3079\u3066\u306E\u30AB\u30AF\u30C6\u30EB\u306E\u6750\u6599\u304C1\u79D2\u5F53\u305F\u308A+5ml\u81EA\u52D5\u5145\u96FB" m_Metadata: m_Items: [] - m_Id: 12185765163031 diff --git a/Assets/13.Localization/Tables/StringDataTable_ko.asset b/Assets/13.Localization/Tables/StringDataTable_ko.asset index 6e12d6a99..432489f8c 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ko.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ko.asset @@ -113,7 +113,7 @@ MonoBehaviour: m_Items: [] - m_Id: 12185765163030 m_Localized: "\uBAA8\uB4E0 \uCE75\uD14C\uC77C \uC7AC\uB8CC\uAC00 \uCD08\uB2F9 - +3ml \uC790\uB3D9 \uCDA9\uC804" + +5ml \uC790\uB3D9 \uCDA9\uC804" m_Metadata: m_Items: [] - m_Id: 12185765163031 diff --git a/Assets/13.Localization/Tables/StringDataTable_ru.asset b/Assets/13.Localization/Tables/StringDataTable_ru.asset index a617e4395..8da133f61 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ru.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ru.asset @@ -143,7 +143,7 @@ MonoBehaviour: m_Items: [] - m_Id: 12185765163030 m_Localized: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 - \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 +3 \u043C\u043B \u043A\u0430\u0436\u0434\u043E\u0433\u043E + \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 +5 \u043C\u043B \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0430\u043B\u043A\u043E\u0433\u043E\u043B\u044C\u043D\u043E\u0433\u043E \u0438\u043D\u0433\u0440\u0435\u0434\u0438\u0435\u043D\u0442\u0430 \u0432 \u0441\u0435\u043A\u0443\u043D\u0434\u0443" m_Metadata: diff --git a/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset b/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset index 78c033dce..a189d783a 100644 --- a/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset +++ b/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset @@ -111,7 +111,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: "\u6240\u6709\u9E21\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52A8\u8865\u5145+3ml" + m_Localized: "\u6240\u6709\u9E21\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52A8\u8865\u5145+5ml" m_Metadata: m_Items: [] - m_Id: 12185765163031 diff --git a/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset b/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset index 0bcfb2712..86ee9160d 100644 --- a/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset +++ b/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset @@ -111,7 +111,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 12185765163030 - m_Localized: "\u6240\u6709\u96DE\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52D5\u88DC\u5145+3ml" + m_Localized: "\u6240\u6709\u96DE\u5C3E\u9152\u6750\u6599\u6BCF\u79D2\u81EA\u52D5\u88DC\u5145+5ml" m_Metadata: m_Items: [] - m_Id: 12185765163031 diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 62ce7303c..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index a6bbef241..000000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 234f4d47697e60e449c7e4d259bf6746 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: