Degulleo/Degullmok-client
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Refactor] 게임씬 전환 병합

Browse Source
This commit is contained in:
Lim0_C 2025-03-21 15:20:20 +09:00
parent 9d5c737e7e
commit d9fbf26978
9 changed files with 54137 additions and 17192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Resources/Prefabs/Panels/Main Panel.prefab
View File

@ -1457,7 +1457,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &405965270916774547
RectTransform:
m_ObjectHideFlags: 0
@ -1635,7 +1635,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1899561816919013120}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 7488082087611091670}
m_TargetAssemblyTypeName: MainPanelController, Assembly-CSharp
m_MethodName: OnClickGameStart
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &4880640143325961548
GameObject:
m_ObjectHideFlags: 0
@ -1701,7 +1713,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uD638\uB7AD\uC774"
m_text: tester
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
@ -1787,7 +1799,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8172929902404983356
RectTransform:
m_ObjectHideFlags: 0

16922
Assets/Resources/Prefabs/StoneController.prefab
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Prefabs/StoneController.prefab.meta
View File

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

100
Assets/Resources/Prefabs/[Canvas] Game UI.prefab
View File

@ -25,17 +25,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 23766695982208470}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6113787613246818512}
m_Father: {fileID: 540353529445133032}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: -0.00012207031}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 3413.3333}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3385207238430958496
CanvasRenderer:
@ -208,7 +208,6 @@ GameObject:
- component: {fileID: 2704399793730691091}
- component: {fileID: 4320824635642948795}
- component: {fileID: 1366478885981645499}
- component: {fileID: 3077068655643976656}
m_Layer: 5
m_Name: '[Canvas] Game UI'
m_TagString: Untagged
@ -228,9 +227,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4532012953686283018}
- {fileID: 4044003808430543235}
- {fileID: 8942070830740152784}
- {fileID: 540353529445133032}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -301,18 +298,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &3077068655643976656
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626368541760032086}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35a536dce57360441898a57e5d5a1335, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &638907547342607085
GameObject:
m_ObjectHideFlags: 0
@ -518,12 +503,12 @@ RectTransform:
- {fileID: 4020956126151567600}
- {fileID: 3928015243027423495}
- {fileID: 5290633878409985}
m_Father: {fileID: 6113787613246818512}
m_Father: {fileID: 540353529445133032}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 350}
m_AnchoredPosition: {x: 0, y: 1706.6667}
m_SizeDelta: {x: 1920, y: 350}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3625391796739244380
CanvasRenderer:
@ -670,12 +655,12 @@ RectTransform:
m_Children:
- {fileID: 451599240785790819}
- {fileID: 6209444297678801107}
m_Father: {fileID: 6113787613246818512}
m_Father: {fileID: 540353529445133032}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 100}
m_SizeDelta: {x: 0, y: 500}
m_AnchoredPosition: {x: 0, y: -1606.6667}
m_SizeDelta: {x: 1920, y: 500}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &870318249725167959
CanvasRenderer:
@ -836,7 +821,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3077068655643976656}
- m_Target: {fileID: 8132279047060667277}
m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp
m_MethodName: OnClickRetryButton
m_Mode: 1
@ -1192,6 +1177,67 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3791069783579554366
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 540353529445133032}
- component: {fileID: 8132279047060667277}
- component: {fileID: 8937297938790164307}
m_Layer: 0
m_Name: Game Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &540353529445133032
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3791069783579554366}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4532012953686283018}
- {fileID: 4044003808430543235}
- {fileID: 8942070830740152784}
m_Father: {fileID: 6113787613246818512}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8132279047060667277
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3791069783579554366}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35a536dce57360441898a57e5d5a1335, type: 3}
m_Name:
m_EditorClassIdentifier:
panelRectTransform: {fileID: 0}
--- !u!225 &8937297938790164307
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3791069783579554366}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &3856590192762510114
GameObject:
m_ObjectHideFlags: 0
@ -1313,7 +1359,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3077068655643976656}
- m_Target: {fileID: 8132279047060667277}
m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp
m_MethodName: OnClickConfirmButton
m_Mode: 1

54268
Assets/Scenes/Game.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/Main.unity
View File

@ -199,7 +199,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0

1
Assets/Script/Game/GameManager.cs
View File

@ -73,6 +73,7 @@ public class GameManager : Singleton<GameManager>
var fioTimer = FindObjectOfType<FioTimer>();
_gameLogic = new GameLogic(_stoneController, _gameType, fioTimer);
}
InitPanels();
}
//임시 재시작 재대결
public void RetryGame()

3
Assets/Script/Renju/RenjuForbiddenMoveDetector.cs
View File

@ -69,9 +69,6 @@ public class RenjuForbiddenMoveDetector : ForbiddenDetectorBase
forbiddenMoves.Add(new Vector2Int(pos.x, pos.y));
}
}
Debug.Log(DebugBoard(board));
return forbiddenMoves;
}

6
ProjectSettings/EditorBuildSettings.asset
View File

@ -11,12 +11,6 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Game.unity
guid: 90d8e06582d54504c8033aab27b15564
- enabled: 1
path: Assets/JAY/Main-Jay.unity
guid: aa6a3e598ecaa6e4aa2ad0f1d81bea93
- enabled: 1
path: Assets/LYC/GameCopyLYC.unity
guid: c7eedd59cc78a7648a2168fd25540b88
- enabled: 1
path: Assets/Scenes/Replay.unity
guid: 393dbf55b04641847ae9b882a54856af