PausePopup UI

This commit is contained in:
IDMhan 2024-05-08 02:32:50 +09:00
parent a1ac5704f1
commit 685e30b35a
19 changed files with 11148 additions and 21 deletions

View File

@ -13971,12 +13971,12 @@ PrefabInstance:
- target: {fileID: 5290961994918313947, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.4826491
value: -0.45930937
objectReference: {fileID: 0}
- target: {fileID: 5290961994918313947, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.87581384
value: 0.8882764
objectReference: {fileID: 0}
- target: {fileID: 5465818858273453228, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
@ -14026,17 +14026,17 @@ PrefabInstance:
- target: {fileID: 6474911501201492956, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalPosition.x
value: 5.22
value: 274.43045
objectReference: {fileID: 0}
- target: {fileID: 6474911501201492956, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalPosition.y
value: 12.534
value: 718.0885
objectReference: {fileID: 0}
- target: {fileID: 6474911501201492956, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalPosition.z
value: -5.18
value: -1005.74023
objectReference: {fileID: 0}
- target: {fileID: 6474911501201492956, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
@ -14091,17 +14091,17 @@ PrefabInstance:
- target: {fileID: 7878254740279761662, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalScale.x
value: 1
value: 72.09709
objectReference: {fileID: 0}
- target: {fileID: 7878254740279761662, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalScale.y
value: 1
value: 72.09709
objectReference: {fileID: 0}
- target: {fileID: 7878254740279761662, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
propertyPath: m_LocalScale.z
value: 1
value: 72.09709
objectReference: {fileID: 0}
- target: {fileID: 8211506079654505266, guid: be1d50d0f9a83864698b17f9e155db2d,
type: 3}
@ -14813,8 +14813,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107368052}
serializedVersion: 2
m_LocalRotation: {x: 0.37865573, y: 3e-45, z: -1e-45, w: 0.92553765}
m_LocalPosition: {x: 5.22, y: 12.534, z: -5.18}
m_LocalRotation: {x: 0.31622773, y: -5.146757e-15, z: 2.0116448e-15, w: 0.9486833}
m_LocalPosition: {x: 5.22, y: 8.174, z: -1.1799998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -18955,7 +18955,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -243.47003, y: 9}
m_SizeDelta: {x: 1654.9401, y: 1487.5566}
m_SizeDelta: {x: 1654.9401, y: 1153.6602}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &143139992
MonoBehaviour:
@ -19542,7 +19542,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9fefb799b32b54c91bd2fd9189517c29, type: 3}
m_Sprite: {fileID: 21300000, guid: 5ca0f1ea611d642cd84b9dcd6a4bac7a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -63334,8 +63334,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
serializedVersion: 2
m_LocalRotation: {x: 0.37865573, y: 3e-45, z: -1e-45, w: 0.92553765}
m_LocalPosition: {x: 5.22, y: 12.534, z: -5.18}
m_LocalRotation: {x: 0.31622773, y: -5.146757e-15, z: 2.0116448e-15, w: 0.9486833}
m_LocalPosition: {x: 5.22, y: 8.174, z: -1.1799998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -119687,6 +119687,8 @@ GameObject:
- component: {fileID: 957212527}
- component: {fileID: 957212532}
- component: {fileID: 957212531}
- component: {fileID: 957212533}
- component: {fileID: 957212534}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@ -119804,6 +119806,125 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 54648b16fa3ac47d9bc7543e261ac76e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &957212533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 957212526}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls: []
m_ActionId: e46165d9-8066-4400-8950-9b7d4bb9ca75
m_ActionName: 'Player/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 7d9814fb-48e0-4717-91c3-0c7b7d99972c
m_ActionName: 'Player/AssaultMode[/Keyboard/v]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 367e7267-d329-439d-9806-5e960b8114b5
m_ActionName: 'Player/Interaction[/Keyboard/e]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: a28fe5f5-b2a2-4794-8f99-fa2494aedfc3
m_ActionName: 'Player/InteractionHold[/Keyboard/e]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 548e1aff-2de9-4dcc-8fe3-6c20ee0e74d4
m_ActionName: 'Player/Zkey[/Keyboard/z]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: e520b814-2e0b-4d05-853e-ac1a35bb6b51
m_ActionName: 'Player/TakeAim[/Keyboard/space]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: c8a82170-8a07-4432-b22f-9ec40486ed27
m_ActionName: 'Player/Cancel[/Keyboard/f]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: bb26b6ad-feae-49d8-a4d8-3633bcabfcab
m_ActionName: 'Player/Targeting[/Keyboard/q]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: c3e552b9-a9be-4d38-8cde-27cc60f7888f
m_ActionName: 'Player/TargetingHold[/Keyboard/q]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 1558b861-5937-46f7-8887-3f322044049b
m_ActionName: 'Player/SpawnInIsladnPlayer[/Keyboard/t]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: b5508379-f9b3-45f9-ba2e-c16fb67bb36a
m_ActionName: 'Player/CancelHold[/Keyboard/f]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 5042e547-e870-4479-8263-b143f4d03597
m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/k]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: c68960a5-036f-4304-8d05-25778470ecfd
m_ActionName: 'Player/Roll[/Keyboard/space]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 26cdda4e-9797-43df-a511-7745f1de2567
m_ActionName: 'Camera/Zoom[/Mouse/scroll/y]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: d9db46b6-0228-4e7f-8b51-53cae3ccc330
m_ActionName: 'Camera/Rotate[/Mouse/rightButton,/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 2c1978d2-b4be-453a-9413-7b54903dbf38
m_ActionName: 'Unit/SelectUnit[/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 952be7b5-8952-47b7-a2db-ced6517d161a
m_ActionName: 'Unit/CancelSelectedUnit[/Keyboard/escape]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 2fe8434e-42e2-4b88-b0b3-0b2b4f8596a8
m_ActionName: 'Unit/MoveUnit[/Mouse/rightButton]'
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &957212534
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 957212526}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e555db85055743968af7ce57a3c13177, type: 3}
m_Name:
m_EditorClassIdentifier:
Id:
Category: UICanvas
Name: Main
Custom: 1
--- !u!1001 &957919060
PrefabInstance:
m_ObjectHideFlags: 0
@ -209711,7 +209832,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 10.81, z: -11}
m_FollowOffset: {x: 0, y: 6.45, z: -7}
m_XDamping: 0
m_YDamping: 0
m_ZDamping: 0
@ -209732,7 +209853,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_TrackedObjectOffset: {x: 0, y: 1.2, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
@ -273225,6 +273346,8 @@ MonoBehaviour:
gridEditorMode: 2
buildableGridObjectTypeSOList:
- {fileID: 11400000, guid: 153a250c89e8b4409829a5aa92252ef9, type: 2}
- {fileID: 11400000, guid: 35263e36278d346dd98e955fd41d18c4, type: 2}
- {fileID: 11400000, guid: 755439bbed4b3426cae0318539a8e2e4, type: 2}
buildableEdgeObjectTypeSOList: []
buildableFreeObjectTypeSOList: []
gridAxis: 0

View File

@ -4,19 +4,32 @@ using System.Collections.Generic;
using BlueWaterProject;
using Doozy.Runtime.UIManager.Containers;
using UnityEngine;
using UnityEngine.InputSystem;
public class TycoonUi : MonoBehaviour
{
public UIView BuildListPopup { get; set; }
public UIPopup PausePopup { get; set; }
private string pausePopup => "PausePopup";
private void Init()
{
UiManager.Inst.TycoonUi = this;
BuildListPopup = transform.Find("BuildListView").GetComponent<UIView>();
if (PausePopup == null) PausePopup = UIPopup.Get(pausePopup);
}
private void Awake()
{
Init();
}
private void OnEsc(InputValue value)
{
if (PausePopup == null) PausePopup = UIPopup.Get(pausePopup);
if (!PausePopup.isVisible) PausePopup.Show();
else PausePopup.Hide();
}
}

View File

@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1

View File

@ -0,0 +1,40 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 65d2d645654a6df41b437ed3f8e35368, type: 3}
m_Name: TableWithChiair 1
m_EditorClassIdentifier:
objectName: TableWithChiair
buildableCategorySO: {fileID: 11400000, guid: 00d47d8fda444fb4f9e6779dcd31f855,
type: 2}
objectDescription:
objectToolTipDescription:
objectIcon: {fileID: 21300000, guid: da275903a58364d2d94db9d94c652901, type: 3}
objectPrefab:
- {fileID: 2913372423088364878, guid: 70a59559b78434765919d1a94f6439ec, type: 3}
ghostPrefab: {fileID: 2913372423088364878, guid: 70a59559b78434765919d1a94f6439ec,
type: 3}
placeableGhostMaterial: {fileID: 0}
notPlaceableGhostMaterial: {fileID: 0}
setBuiltObjectLayer: 0
builtObjectLayer:
serializedVersion: 2
m_Bits: 0
showGridBelowObject: 1
objectGridCanvas: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b,
type: 3}
gridImageSprite: {fileID: 21300000, guid: 89f923662002a7240b3f8939cdc9bc13, type: 3}
gridImagePlaceableColor: {r: 0.5019608, g: 0.8392157, b: 0.99215686, a: 1}
gridImageNotPlaceableColor: {r: 0.7058824, g: 0.23529412, b: 0.24313726, a: 1}
holdToPlace: 0
placeAndDeselect: 0
enableBuildCondition: 0
buildConditionSO: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 35263e36278d346dd98e955fd41d18c4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,40 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 65d2d645654a6df41b437ed3f8e35368, type: 3}
m_Name: TableWithChiair 2
m_EditorClassIdentifier:
objectName: TableWithChiair
buildableCategorySO: {fileID: 11400000, guid: 00d47d8fda444fb4f9e6779dcd31f855,
type: 2}
objectDescription:
objectToolTipDescription:
objectIcon: {fileID: 21300000, guid: da275903a58364d2d94db9d94c652901, type: 3}
objectPrefab:
- {fileID: 2913372423088364878, guid: 70a59559b78434765919d1a94f6439ec, type: 3}
ghostPrefab: {fileID: 2913372423088364878, guid: 70a59559b78434765919d1a94f6439ec,
type: 3}
placeableGhostMaterial: {fileID: 0}
notPlaceableGhostMaterial: {fileID: 0}
setBuiltObjectLayer: 0
builtObjectLayer:
serializedVersion: 2
m_Bits: 0
showGridBelowObject: 1
objectGridCanvas: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b,
type: 3}
gridImageSprite: {fileID: 21300000, guid: 89f923662002a7240b3f8939cdc9bc13, type: 3}
gridImagePlaceableColor: {r: 0.5019608, g: 0.8392157, b: 0.99215686, a: 1}
gridImageNotPlaceableColor: {r: 0.7058824, g: 0.23529412, b: 0.24313726, a: 1}
holdToPlace: 0
placeAndDeselect: 0
enableBuildCondition: 0
buildConditionSO: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 755439bbed4b3426cae0318539a8e2e4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 944cf36f28e4d404597b088485ab10eb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 814366aff908f4829bf87d1a5d3376d4
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17fe256f5db7049dc91b6aa2cf5786c5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 97303356de09b4fe5b92ea5796758eb7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0806a67463d44083a37a5d55be2b34ba, type: 3}
m_Name: UIPopup - PausePopup
m_EditorClassIdentifier:
PrefabName: PausePopup
Prefab: {fileID: 7160688581674794363, guid: 97303356de09b4fe5b92ea5796758eb7, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e9ccf5cb1551e4415b3531162735182e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -16,3 +16,4 @@ MonoBehaviour:
- {fileID: 11400000, guid: 133a5b0a3435c424a951fcfedb6cbc4d, type: 2}
- {fileID: 11400000, guid: 9cfc9665aed030446bcab743e91bfad3, type: 2}
- {fileID: 11400000, guid: 4d8b44d5990791b4390addc59c0ffe67, type: 2}
- {fileID: 11400000, guid: e9ccf5cb1551e4415b3531162735182e, type: 2}

View File

@ -57,6 +57,6 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 128, y: 128}
m_Spacing: {x: 0, y: 0}
m_Constraint: 2
m_Spacing: {x: 5, y: 10}
m_Constraint: 1
m_ConstraintCount: 5

View File

@ -4,12 +4,12 @@
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[System.Collections.Generic.List`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]",
"key": "Unity.Muse.Common.Preferences.organizations",
"value": "{\"value\":[{\"rid\":1000}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14569290698329\",\"org_name\":\"qkdzhr33\",\"status\":\"not-entitled\"}}]}}"
"value": "{\"value\":[{\"rid\":1000},{\"rid\":1001},{\"rid\":1002}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"2410602\",\"org_name\":\"CaperMovie\",\"status\":\"not-entitled\"}},{\"rid\":1001,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"7971586351139\",\"org_name\":\"Ntion\",\"status\":\"not-entitled\"}},{\"rid\":1002,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14568734561576\",\"org_name\":\"한국콘텐츠진흥원 글로벌게임허브센터\",\"status\":\"not-entitled\"}}]}}"
},
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]",
"key": "Unity.Muse.Common.Preferences.organization",
"value": "{\"value\":{\"rid\":1000},\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14569290698329\",\"org_name\":\"qkdzhr33\",\"status\":\"not-entitled\"}}]}}"
"value": "{\"value\":{\"rid\":1000},\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"2410602\",\"org_name\":\"CaperMovie\",\"status\":\"not-entitled\"}}]}}"
},
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]",