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

0.3.3.12 업데이트

Browse Source
This commit is contained in:
NTG_Lenovo 2024-11-11 16:06:33 +09:00
parent 5143cb3bff
commit d01a2ba262
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/02.Scripts/Prop/Tycoon/TrashCan.cs
View File

@ -68,8 +68,8 @@ namespace BlueWater.Tycoons
public override bool CanInteraction() public override bool CanInteraction()
{ {
return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything() && return CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpAnything() &&
((_canInteraction && TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange) || ((TycoonManager.Instance.TycoonStatus.CurrentPassiveCard == PassiveCard.RandomChange && _canInteraction) ||
!_canInteraction); TycoonManager.Instance.TycoonStatus.CurrentPassiveCard != PassiveCard.RandomChange);
} }
public override void ShowInteractionUi() public override void ShowInteractionUi()

10
Assets/05.Prefabs/Uis/Tycoons/Card.prefab
View File

@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 120} m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 400, y: 400} m_SizeDelta: {x: 380, y: 380}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &144498693429315535 --- !u!222 &144498693429315535
CanvasRenderer: CanvasRenderer:
@ -224,7 +224,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -250} m_AnchoredPosition: {x: 0, y: -250}
m_SizeDelta: {x: 400, y: 250} m_SizeDelta: {x: 400, y: 240}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3904437696116363940 --- !u!222 &3904437696116363940
CanvasRenderer: CanvasRenderer:
@ -254,7 +254,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: Information m_text: 'hello '
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
@ -284,9 +284,9 @@ MonoBehaviour:
m_fontSize: 36 m_fontSize: 36
m_fontSizeBase: 36 m_fontSizeBase: 36
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 1
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 72 m_fontSizeMax: 36
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 2 m_HorizontalAlignment: 2
m_VerticalAlignment: 512 m_VerticalAlignment: 512

4
Assets/TextMesh Pro/Resources/TMP Settings.asset
View File

@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: TMP Settings m_Name: TMP Settings
m_EditorClassIdentifier: m_EditorClassIdentifier:
assetVersion: 2 assetVersion: 2
m_TextWrappingMode: 0 m_TextWrappingMode: 1
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
@ -46,4 +46,4 @@ MonoBehaviour:
m_StyleSheetsResourcePath: m_StyleSheetsResourcePath:
m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3} m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3} m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
m_UseModernHangulLineBreakingRules: 0 m_UseModernHangulLineBreakingRules: 1