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

Merge branch 'main' into DO-41-오목-무승부-확인

Browse Source
This commit is contained in:
Lim0_C 2025-03-20 15:28:02 +09:00
commit e6918e0d18
40 changed files with 677 additions and 20128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
Assets/JAY/Main-Jay.unity
View File

@ -178,7 +178,6 @@ GameObject:
m_Component:
- component: {fileID: 271965289}
- component: {fileID: 271965290}
- component: {fileID: 271965292}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@ -471,6 +470,231 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1545261105
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1867732347}
m_Modifications:
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1545261107}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnClickGameStart
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: MainPanelController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4282069284025755619, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8564394481744056992, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_Name
value: Main Panel
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
--- !u!224 &1545261106 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
m_PrefabInstance: {fileID: 1545261105}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1545261107 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
m_PrefabInstance: {fileID: 1545261105}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4dc3fd9e59f47df80e344680d1b9803, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1867732343
GameObject:
m_ObjectHideFlags: 0
@ -548,7 +772,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0

18
Assets/KJM/Admob/AdManager.cs
View File

@ -19,6 +19,12 @@ public class AdManager : MonoBehaviour
// 보상형 전면 광고 로드
public void LoadRewardedInterstitialAd()
{
if (rewardedInterstitialAd != null)
{
rewardedInterstitialAd.Destroy(); // 기존 광고 객체 해제
rewardedInterstitialAd = null;
}
AdRequest request = new AdRequest();
RewardedInterstitialAd.Load(adUnitId, request,
@ -30,7 +36,6 @@ public class AdManager : MonoBehaviour
return;
}
Debug.Log("보상형 전면 광고 로드 성공");
rewardedInterstitialAd = ad;
// 광고 종료 이벤트 설정
@ -39,14 +44,14 @@ public class AdManager : MonoBehaviour
}
// 보상형 전면 광고 실행
public void ShowRewardedInterstitialAd()
public void ShowRewardedInterstitialAd(CanvasGroup shopPanel)
{
if (rewardedInterstitialAd != null && rewardedInterstitialAd.CanShowAd())
{
rewardedInterstitialAd.Show((Reward reward) => //서버에서 500코인을 고정으로 반환하기 때문에 reward는 사용하지 않음.
{
// 코인 지급 로직
GrantReward();
GrantReward(shopPanel);
});
}
else
@ -58,20 +63,19 @@ public class AdManager : MonoBehaviour
// 광고 닫힘 이벤트 처리
private void HandleAdClosed()
{
Debug.Log("보상형 전면 광고 닫힘, 새로운 광고 로드.");
LoadRewardedInterstitialAd(); // 광고가 닫힌 후 다시 로드
}
// 코인 지급 함수
private void GrantReward()
private void GrantReward(CanvasGroup shopPanel)
{
NetworkManager.Instance.WatchAdForCoins((coinsAdded) =>
{
// UI 업데이트
GameManager.Instance.panelManager.UpdateCoinsPanelUI(coinsAdded);
GameManager.Instance.panelManager.UpdateCoinsPanelUI(coinsAdded, shopPanel);
}, () =>
{
Debug.Log("광고 시청 후 코인 추가 실패!");
Debug.Log("광고 시청 후 코인 추가 실패");
});
}
}

46
Assets/KJM/Admob/Admob.prefab
View File

@ -1,46 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8786799901643631561
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7455536569977767830}
- component: {fileID: 2424336103342601865}
m_Layer: 0
m_Name: Admob
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7455536569977767830
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8786799901643631561}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2424336103342601865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8786799901643631561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 644acbaf5d5791242b26c1b1b0a0ceeb, type: 3}
m_Name:
m_EditorClassIdentifier:

7
Assets/KJM/Admob/Admob.prefab.meta
View File

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

4
Assets/KJM/KJMprefabs/ScrollItem/RankingScrollItem.prefab
View File

@ -413,8 +413,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4

27
Assets/KJM/KJMprefabs/ScrollItem/ShopScrollItem.prefab
View File

@ -34,8 +34,8 @@ 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: -25, y: 0}
m_SizeDelta: {x: 200, y: 100}
m_AnchoredPosition: {x: 0.5, y: 0}
m_SizeDelta: {x: 250, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8644449565768019552
CanvasRenderer:
@ -168,8 +168,8 @@ 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: 176.9, y: 0}
m_SizeDelta: {x: 200, y: 100}
m_AnchoredPosition: {x: 200, y: 0}
m_SizeDelta: {x: 160, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7968533753814083057
CanvasRenderer:
@ -356,6 +356,7 @@ GameObject:
- component: {fileID: 5750108967662755581}
- component: {fileID: 6941609111617388457}
- component: {fileID: -8178793116256795857}
- component: {fileID: 1941271810694746857}
m_Layer: 5
m_Name: ShopScrollItem
m_TagString: Untagged
@ -413,8 +414,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -491,5 +492,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4d28917ad20c19e428cbf98ba5609e69, type: 3}
m_Name:
m_EditorClassIdentifier:
profileSprites:
- {fileID: 21300000, guid: 307bff9630735f342852f28b1cd5d300, type: 3}
--- !u!114 &1941271810694746857
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7605012172595602668}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 644acbaf5d5791242b26c1b1b0a0ceeb, type: 3}
m_Name:
m_EditorClassIdentifier:

2
Assets/KJM/KJMprefabs/Shop Panel.prefab
View File

@ -350,7 +350,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -392, y: -56.72364}
m_AnchoredPosition: {x: -392, y: -5.317383}
m_SizeDelta: {x: 784, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2389273839879143832

64
Assets/KJM/KimJaeMin.unity
View File

@ -294,12 +294,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 03aef985a8b802a409630fdcab7be09b, type: 3}
m_Name:
m_EditorClassIdentifier:
settingsPanel: {fileID: 2861881646994438329, guid: ea820246b5075c54d9f614291ca41c5d, type: 3}
confirmPanel: {fileID: 8145365568262946399, guid: 76f1fe6b5243faf4f9b8caee7312d336, type: 3}
rankingPanel: {fileID: 154459105952450598, guid: bf4bb18aa323fe748b3eb1d537503596, type: 3}
shopPanel: {fileID: 8190964574954487140, guid: eb257b0a685b2254f860f294ce8cba54, type: 3}
giboPanel: {fileID: 3090474328172188941, guid: c63914e01332f8d479ada92325335e41, type: 3}
_canvas: {fileID: 6741227126671320411}
--- !u!222 &71273024816384741
CanvasRenderer:
m_ObjectHideFlags: 0
@ -347,63 +341,6 @@ MonoBehaviour:
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!1001 &523594383261405864
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8786799901643631561, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_Name
value: Admob
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
--- !u!1 &658145525140724706
GameObject:
m_ObjectHideFlags: 0
@ -1747,4 +1684,3 @@ SceneRoots:
- {fileID: 656468223}
- {fileID: 937655098394579964}
- {fileID: 1842188762}
- {fileID: 523594383261405864}

9
Assets/KJM/ShopTest/MainPanelButtonController.cs
View File

@ -16,8 +16,8 @@ public class MainPanelButtonController : MonoBehaviour
{
ShopItem shopItem = new ShopItem
{
Name = "코인500개 ",
Price = "광고"
name = "광고) 코인500개 ",
price = 0
};
shopItems.Add(shopItem);
}
@ -25,13 +25,12 @@ public class MainPanelButtonController : MonoBehaviour
{
ShopItem shopItem = new ShopItem
{
Name = "코인"+i*1000+"개 ",
Price = (i * 1000)+ "원"
name = i*1000+"개 ",
price = i * 1000
};
shopItems.Add(shopItem);
}
}
GameManager.Instance.panelManager.OpenShopPanel(shopItems);
}

2
Assets/KJM/ShopTest/MainPanelButtonController.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c9598d78723880e4f8026beb096f28c4
guid: 93bfed50167472f489a27f0518070ed5
MonoImporter:
externalObjects: {}
serializedVersion: 2

114
Assets/KJM/ShopTest/ShopTestKJM.unity
View File

@ -248,17 +248,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 35a4c6d5d3a97b444b968e68ec8bb9f7, type: 3}
m_Name:
m_EditorClassIdentifier:
mainPanel: {fileID: 8564394481744056992, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
signinPanel: {fileID: 925522282249935710, guid: e14c9b2925f0ddb4192af743e5cc166a, type: 3}
signupPanel: {fileID: 3181524094944658765, guid: 8827fe7caa3145e40b1369cc42f8697d, type: 3}
settingsPanel: {fileID: 2861881646994438329, guid: ea820246b5075c54d9f614291ca41c5d, type: 3}
confirmPanel: {fileID: 8145365568262946399, guid: 76f1fe6b5243faf4f9b8caee7312d336, type: 3}
rankingPanel: {fileID: 154459105952450598, guid: bf4bb18aa323fe748b3eb1d537503596, type: 3}
shopPanel: {fileID: 8190964574954487140, guid: eb257b0a685b2254f860f294ce8cba54, type: 3}
giboPanel: {fileID: 3090474328172188941, guid: c63914e01332f8d479ada92325335e41, type: 3}
loadingPanel: {fileID: 1942997847427067673, guid: 634a60576b4855940a97d1e7447b9fcc, type: 3}
mainBgm: {fileID: 8300000, guid: 1d9c7fb20aa822c48933d00b6bd6a757, type: 3}
profileSprites: []
panelManagerPrefab: {fileID: 3475740041361426276, guid: 085ca07ca90c92545b2594bd13412701, type: 3}
audioManagerPrefab: {fileID: 2946408323859178723, guid: e829818dce39a5d4383e061111bed871, type: 3}
--- !u!224 &183715513
RectTransform:
m_ObjectHideFlags: 0
@ -346,63 +337,52 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &634833532
PrefabInstance:
--- !u!1 &1280076947
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1280076949}
- component: {fileID: 1280076948}
m_Layer: 0
m_Name: MainPanelManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1280076948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1280076947}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0696b08f74b24325a7b378405f6170af, type: 3}
m_Name:
m_EditorClassIdentifier:
loadingPanelController: {fileID: 1454248679793356470, guid: 634a60576b4855940a97d1e7447b9fcc, type: 3}
mainPanelController: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3}
--- !u!4 &1280076949
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1280076947}
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455536569977767830, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8786799901643631561, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
propertyPath: m_Name
value: Admob
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c401513426cb83c4e8759c73d8be4c3a, type: 3}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1340395578
GameObject:
m_ObjectHideFlags: 0
@ -604,4 +584,4 @@ SceneRoots:
- {fileID: 183715513}
- {fileID: 1340395582}
- {fileID: 521295933}
- {fileID: 634833532}
- {fileID: 1280076949}

682
Assets/LIN/Scenes/MainTestLIN.unity
View File

@ -1,682 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 2
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 0
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &150251232
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 759297939}
m_Modifications:
- target: {fileID: 180756268084732627, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 180756268084732627, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 837160915965981132, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnclickRecordButton
objectReference: {fileID: 0}
- target: {fileID: 1316706425349991338, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: replayPanel
value:
objectReference: {fileID: 3090474328172188941, guid: c63914e01332f8d479ada92325335e41, type: 3}
- target: {fileID: 4282069284025755619, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4733773333797619672, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5033979732381400892, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8446481687955831510, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8564394481744056992, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_Name
value: Main Panel Test LIN
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8768541925252566370, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 519420032}
- component: {fileID: 519420031}
- component: {fileID: 519420029}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &519420029
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
--- !u!20 &519420031
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 0
m_HDR: 1
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &519420032
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &759297935
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 759297939}
- component: {fileID: 759297938}
- component: {fileID: 759297937}
- component: {fileID: 759297936}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &759297936
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759297935}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &759297937
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759297935}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &759297938
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759297935}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &759297939
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759297935}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 972014384}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!224 &972014384 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6110152713294678410, guid: 6f42a47846f21b044b1cda32a9516609, type: 3}
m_PrefabInstance: {fileID: 150251232}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1017982169
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1017982171}
- component: {fileID: 1017982172}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1017982171
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017982169}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1017982172
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017982169}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da4e7b6c90ef1dd49a95d0f1716dedc7, type: 3}
m_Name:
m_EditorClassIdentifier:
signinPanel: {fileID: 925522282249935710, guid: e14c9b2925f0ddb4192af743e5cc166a, type: 3}
signupPanel: {fileID: 3181524094944658765, guid: 8827fe7caa3145e40b1369cc42f8697d, type: 3}
canvas: {fileID: 759297938}
profileSprites: []
--- !u!1 &1231053598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1231053601}
- component: {fileID: 1231053600}
- component: {fileID: 1231053599}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1231053599
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1231053598}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1231053600
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1231053598}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1231053601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1231053598}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1464921194
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1464921196}
- component: {fileID: 1464921195}
m_Layer: 0
m_Name: StoneController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1464921195
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1464921194}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8f82a74d5e1f8de44af5f574b2934a95, type: 3}
m_Name:
m_EditorClassIdentifier:
stones: []
--- !u!4 &1464921196
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1464921194}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 540, y: 960, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 519420032}
- {fileID: 1017982171}
- {fileID: 759297939}
- {fileID: 1231053601}
- {fileID: 1464921196}

7
Assets/LIN/Scenes/MainTestLIN.unity.meta
View File

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

18564
Assets/LIN/Scenes/Trash/GameCopyTestLIN.unity
View File

File diff suppressed because it is too large Load Diff

7
Assets/LIN/Scenes/Trash/GameCopyTestLIN.unity.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 88b1093ef5e1f3b4db329a67d13e8920
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

290
Assets/LIN/Scenes/Trash/GameTestLIN.unity
View File

@ -1,290 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1100315178
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1100315181}
- component: {fileID: 1100315180}
- component: {fileID: 1100315179}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1100315179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1100315178}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1100315180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1100315178}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1100315181
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1100315178}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1603784401
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1603784404}
- component: {fileID: 1603784403}
- component: {fileID: 1603784402}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1603784402
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1603784401}
m_Enabled: 1
--- !u!20 &1603784403
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1603784401}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1603784404
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1603784401}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1603784404}
- {fileID: 1100315181}

7
Assets/LIN/Scenes/Trash/GameTestLIN.unity.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3f72acd812737e54da767a0a48b4a60d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

150
Assets/LIN/Scripts/GameManagerTestLIN.cs
View File

@ -1,150 +0,0 @@
using UnityEngine;
using UnityEngine.SceneManagement;
using System.Collections;
using System.Collections.Generic;
public class GameManagerTestLIN : Singleton<GameManagerTestLIN>
{
[SerializeField] private GameObject signinPanel;
[SerializeField] private GameObject signupPanel;
[SerializeField] private Canvas canvas;
private UserManager _userManager; // UserManager 인스턴스 관리
private Enums.GameType _gameType;
private GameLogic _gameLogic;
private StoneController _stoneController;
private Canvas _canvas;
public Sprite[] profileSprites; //패널에서 사용할 테스트 배열
private void Awake()
{
// UserManager가 없으면 생성
if (UserManager.Instance == null)
{
GameObject userManagerObj = new GameObject("UserManager");
_userManager = userManagerObj.AddComponent<UserManager>();
//TODO: 게임 내에서 기보 타입 적용하기
_gameType = Enums.GameType.Replay;
}
}
private void Start()
{
Debug.Log(UserManager.Instance.Nickname);
//TODO: 기보 타입으로 들어왔을 때 데이터 로드 테스트 수정할것
ReplayManager.Instance.InitReplayBoard(ReplayManager.Instance.LoadReplayDatas()[9]);
//게임 씬에서 확인하기 위한 임시 코드
}
private void TryAutoSignin()
{
NetworkManager.Instance.GetInfo((userInfo) =>
{
Debug.Log("자동 로그인 성공");
UpdateMainPanelUI();
// ScoreData.SetScore(userInfo.score);
// OpenConfirmPanel(userInfo.nickname + "님 로그인 성공하였습니다.", () => { });
}, () =>
{
Debug.Log("자동 로그인 실패");
// 로그인 화면
OpenSigninPanel();
});
}
private void UpdateMainPanelUI()
{
MainPanelController mainPanel = FindObjectOfType<MainPanelController>();
if (mainPanel != null)
{
mainPanel.UpdateUserInfo();
}
}
public void OpenSigninPanel()
{
if (canvas != null)
{
var signinPanelObject = Instantiate(signinPanel, canvas.transform);
}
}
public void OpenSignupPanel()
{
if (canvas != null)
{
var signupPanelObject = Instantiate(signupPanel, canvas.transform);
}
}
public void OnClickConfirmButton()
{
_gameLogic.SetNewBoardValue(_gameLogic.currentTurn, _gameLogic.selectedRow,_gameLogic.selectedCol);
}
public void OnClickReplayNextButton()
{
Move nextMove = ReplayManager.Instance.GetNextMove();
if (nextMove != null)
{
if (nextMove.stoneType.Equals(Enums.StoneType.Black.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerA, nextMove.columnIndex, nextMove.rowIndex);
}
else if (nextMove.stoneType.Equals(Enums.StoneType.White.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerB, nextMove.columnIndex, nextMove.rowIndex);
}
ReplayManager.Instance.PushMove(nextMove);
}
}
public void OnClickReplayUndoButton()
{
Move targetMove = ReplayManager.Instance.PopMove();
if (targetMove != null)
{
if (targetMove.stoneType.Equals(Enums.StoneType.Black.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerA, targetMove.columnIndex, targetMove.rowIndex);
}
else if (targetMove.stoneType.Equals(Enums.StoneType.White.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerB, targetMove.columnIndex, targetMove.rowIndex);
}
ReplayManager.Instance.PushUndoMove(targetMove);
//TODO: 화면상에서 돌 치우기
}
}
private void ChangeToGameScene(Enums.GameType gameType)
{
_gameType = gameType;
SceneManager.LoadScene("Game");
}
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
if (scene.name == "Game")
{
_stoneController = GameObject.FindObjectOfType<StoneController>();
_stoneController.InitStones();
_gameLogic = new GameLogic(_stoneController, _gameType);
}
else if (scene.name == "Replay")
{
_stoneController = GameObject.FindObjectOfType<StoneController>();
_stoneController.InitStones();
_gameLogic = new GameLogic(_stoneController, Enums.GameType.Replay);
}
_canvas = GameObject.Find("Canvas").GetComponent<Canvas>();
}
}

11
Assets/LIN/Scripts/GameManagerTestLIN.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: da4e7b6c90ef1dd49a95d0f1716dedc7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

40
Assets/LIN/Scripts/MainPanelControllerTestLIN.cs
View File

@ -1,40 +0,0 @@
using System;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class MainPanelControllerTestLIN : MonoBehaviour
{
[SerializeField] private TextMeshProUGUI nicknameText;
[SerializeField] private TextMeshProUGUI ratingText;
[SerializeField] private Button signOutButton;
[SerializeField] private GameObject replayPanel;
public void UpdateUserInfo()
{
if (UserManager.Instance == null) return;
nicknameText.text = UserManager.Instance.Nickname;
ratingText.text = $"{UserManager.Instance.Rating}급";
}
public void OnSignOutClick()
{
NetworkManager.Instance.SignOut(() =>
{
Debug.Log("로그아웃 성공");
// 로그인 화면
GameManager.Instance.panelManager.OpenSigninPanel();
}, () =>
{
Debug.Log("로그아웃 실패");
// OpenConfirmPanel("로그아웃 되었습니다.", () => { });
});
}
public void OnclickRecordButton()
{
Instantiate(replayPanel, GetComponent<Transform>());
}
}

3
Assets/LIN/Scripts/MainPanelControllerTestLIN.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 67ce17de423b0644bb099f5272a48faf
timeCreated: 1741848912

1
Assets/Resources/Prefabs/Panels/Coins Panel.prefab
View File

@ -56,6 +56,7 @@ MonoBehaviour:
coinsRemoveAudioClip: {fileID: 8300000, guid: 585a9de0fb7ee4163af5c559ba5b2364, type: 3}
coinsAddAudioClip: {fileID: 8300000, guid: 1ec44182fa76a4b3eb1459c0a6d9a8ab, type: 3}
coinsEmptyAudioClip: {fileID: 8300000, guid: 908a78cb991984977bea42916bed8684, type: 3}
ShopPanel: {fileID: 8190964574954487140, guid: eb257b0a685b2254f860f294ce8cba54, type: 3}
--- !u!82 &5499754916380040505
AudioSource:
m_ObjectHideFlags: 0

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

@ -120,7 +120,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 3015309825845733259}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: PanelManager, Assembly-CSharp
m_MethodName: OnRankingPanelClick
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 &683375887058748135
GameObject:
m_ObjectHideFlags: 0
@ -375,7 +387,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6468719718473664808}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: PanelManager, Assembly-CSharp
m_MethodName: OpenSettingsPanel
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 &1637449823560643887
GameObject:
m_ObjectHideFlags: 0
@ -386,7 +410,7 @@ GameObject:
m_Component:
- component: {fileID: 2720476515686469179}
- component: {fileID: 7796730417217941349}
- component: {fileID: 8890768496808647529}
- component: {fileID: 5873276942444222861}
m_Layer: 5
m_Name: Buttons
m_TagString: Untagged
@ -444,7 +468,7 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &8890768496808647529
--- !u!114 &5873276942444222861
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -453,7 +477,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1637449823560643887}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c9598d78723880e4f8026beb096f28c4, type: 3}
m_Script: {fileID: 11500000, guid: 93bfed50167472f489a27f0518070ed5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2440131775796007731
@ -845,7 +869,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8890768496808647529}
- m_Target: {fileID: 5873276942444222861}
m_TargetAssemblyTypeName: MainPanelButtonController, Assembly-CSharp
m_MethodName: OnShopPanelClick
m_Mode: 1
@ -1093,7 +1117,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "16\uAE09"
m_text: "18\uAE09"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
@ -1283,9 +1307,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8890768496808647529}
m_TargetAssemblyTypeName: MainPanelButtonController, Assembly-CSharp
m_MethodName: OpenReplayPanelClick
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: PanelManager, Assembly-CSharp
m_MethodName: OpenReplayPanel
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -1690,7 +1714,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uD14C\uC2A4\uD2B801"
m_text: test1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}

9
Assets/Resources/Prefabs/Panels/Replay Panel.prefab
View File

@ -102,7 +102,7 @@ GameObject:
- component: {fileID: 4433003410674354461}
- component: {fileID: 7284996522760678143}
- component: {fileID: 9008029491930858052}
- component: {fileID: 5051480494068645349}
- component: {fileID: 1799015040358630920}
m_Layer: 5
m_Name: Replay Panel
m_TagString: Untagged
@ -180,7 +180,7 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &5051480494068645349
--- !u!114 &1799015040358630920
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -189,13 +189,12 @@ MonoBehaviour:
m_GameObject: {fileID: 3090474328172188941}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dd8226d0f420f6e45b27896f8c57b9c1, type: 3}
m_Script: {fileID: 11500000, guid: 43d3a140ef05b96439c226fb3de1178e, type: 3}
m_Name:
m_EditorClassIdentifier:
panelRectTransform: {fileID: 1819504122199746525}
scrollItemPrefab: {fileID: 7605012172595602668, guid: bef1de10a3cc5834a95a8689a2de2bb7, type: 3}
content: {fileID: 7514948643227889924}
replayCellPrefab: {fileID: 6381393519116383223, guid: e4d9ccbb1a6d7b1408923e47b6e7b690, type: 3}
--- !u!1 &3668037476601755215
GameObject:
m_ObjectHideFlags: 0
@ -316,7 +315,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5051480494068645349}
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: ScrollPanelController, Assembly-CSharp
m_MethodName: OnClickCloseButton
m_Mode: 1

131
Assets/Scenes/Replay.unity
View File

@ -5198,6 +5198,7 @@ GameObject:
m_Component:
- component: {fileID: 679766978}
- component: {fileID: 679766977}
- component: {fileID: 679766979}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@ -5217,16 +5218,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 35a4c6d5d3a97b444b968e68ec8bb9f7, type: 3}
m_Name:
m_EditorClassIdentifier:
mainPanel: {fileID: 0}
signinPanel: {fileID: 0}
signupPanel: {fileID: 0}
settingsPanel: {fileID: 0}
confirmPanel: {fileID: 8145365568262946399, guid: 76f1fe6b5243faf4f9b8caee7312d336, type: 3}
rankingPanel: {fileID: 0}
shopPanel: {fileID: 0}
giboPanel: {fileID: 0}
canvas: {fileID: 2704399793934511678}
profileSprites: []
panelManagerPrefab: {fileID: 3475740041361426276, guid: 085ca07ca90c92545b2594bd13412701, type: 3}
audioManagerPrefab: {fileID: 2946408323859178723, guid: e829818dce39a5d4383e061111bed871, type: 3}
--- !u!4 &679766978
Transform:
m_ObjectHideFlags: 0
@ -5242,6 +5235,102 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &679766979
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 679766976}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &681290285
PrefabInstance:
m_ObjectHideFlags: 0
@ -18687,7 +18776,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 3806122117153528265}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 6113787613455091454}
m_TargetAssemblyTypeName: ReplayController, Assembly-CSharp
m_MethodName: OnclickExitButton
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 &2180157736468784195
GameObject:
m_ObjectHideFlags: 0
@ -18825,7 +18926,7 @@ GameObject:
- component: {fileID: 182763848042457448}
- component: {fileID: 5649645114534718557}
m_Layer: 5
m_Name: Player Name Text
m_Name: PlayerB Name Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -18944,7 +19045,7 @@ GameObject:
- component: {fileID: 1750532428139497284}
- component: {fileID: 4888719462519445862}
m_Layer: 5
m_Name: Player Name Text
m_Name: PlayerA Name Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -19364,6 +19465,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bda9793c3fea2104199340f907378533, type: 3}
m_Name:
m_EditorClassIdentifier:
playerANicknameText: {fileID: 4888719462519445862}
playerBNicknameText: {fileID: 5649645114534718557}
playerAImage: {fileID: 8274101518570821972}
playerBImage: {fileID: 1516328598779423605}
--- !u!224 &6390176559513736999
RectTransform:
m_ObjectHideFlags: 0

15
Assets/Script/Common/CoinsPanelController.cs
View File

@ -2,6 +2,7 @@ using System;
using UnityEngine;
using DG.Tweening;
using TMPro;
using UnityEngine.EventSystems;
using UnityEngine.Serialization;
using UnityEngine.UI;
@ -66,7 +67,7 @@ public class CoinsPanelController : MonoBehaviour
if (isAdd)
{
var currentHeartCount = coinsCountText.text;
coinsCountText.text = (int.Parse(currentHeartCount) + 100).ToString();
coinsCountText.text = (int.Parse(currentHeartCount) + 500).ToString();
// 코인 텍스트 100씩 증가
}
else
@ -93,13 +94,15 @@ public class CoinsPanelController : MonoBehaviour
/// 코인 추가 함수
/// </summary>
/// <param name="coinsCount"> 추가할 코인 수량</param>
/// <param name="shopPanel">상점 패널 캔버스 그룹</param>
/// <param name="action">애니메이션 종료 후 동작 EX) 코인 수량 변경</param>
public void AddCoins(int coinsCount, Action action)
public void AddCoins(int coinsCount, CanvasGroup shopPanel,Action action)
{
Sequence sequence = DOTween.Sequence();
shopPanel.blocksRaycasts = false; //코인 중복 추가 방지 코드
Sequence sequence = DOTween.Sequence();
// i += a 반복 횟수 조절, 100개 단위로 상승 차감 시 100으로 설정
for (int i = 0; i < coinsCount; i+=100)
for (int i = 0; i < coinsCount; i+=500)
{
sequence.AppendCallback(() =>
{
@ -115,6 +118,10 @@ public class CoinsPanelController : MonoBehaviour
});
sequence.AppendInterval(0.5f);
}
sequence.OnComplete(() =>
{
shopPanel.blocksRaycasts = true; //구매 후 클릭 활성화
});
}
public void EmptyCoins()

1
Assets/Script/Common/Constants.cs
View File

@ -3,4 +3,5 @@
public const string ServerURL = "http://localhost:3000";
public const string GameServerURL = "ws://localhost:3000";
public const int BoardSize = 15;
public const int ReplayMaxRecordSize = 10;
}

4
Assets/Script/Common/ScrollItem/ShopItem.cs
View File

@ -4,6 +4,6 @@ using UnityEngine;
public class ShopItem
{
public string Name;
public string Price;
public string name;
public int price;
}

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

@ -75,12 +75,6 @@ public class GameManager : Singleton<GameManager>
var fioTimer = FindObjectOfType<FioTimer>();
_gameLogic = new GameLogic(_stoneController, _gameType, fioTimer);
}
else if (scene.name == "Replay")
{
_stoneController = GameObject.FindObjectOfType<StoneController>();
_stoneController.InitStones();
_gameLogic = new GameLogic(_stoneController, Enums.GameType.Replay);
}
}
//임시 재시작 재대결
public void RetryGame()
@ -90,39 +84,4 @@ public class GameManager : Singleton<GameManager>
_gameLogic.SetState(_gameLogic.firstPlayerState);
}
#region ReplayControll
public void ReplayNext(Move nextMove )
{
// 보드에 돌을 설정하기 위해 gameLogic의 SetNewBoardValue호출
if (nextMove.stoneType.Equals(Enums.StoneType.Black.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerA, nextMove.columnIndex, nextMove.rowIndex);
}
else if (nextMove.stoneType.Equals(Enums.StoneType.White.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerB, nextMove.columnIndex, nextMove.rowIndex);
}
// 돌이 놓인 내역을 ReplayManager에도 반영
ReplayManager.Instance.PushMove(nextMove);
}
public void ReplayUndo(Move targetMove)
{
if (targetMove.stoneType.Equals(Enums.StoneType.Black.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerA, targetMove.columnIndex, targetMove.rowIndex);
}
else if (targetMove.stoneType.Equals(Enums.StoneType.White.ToString()))
{
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerB, targetMove.columnIndex, targetMove.rowIndex);
}
ReplayManager.Instance.PushUndoMove(targetMove);
//TODO: 화면상에서 돌 치우기
}
#endregion
}

44
Assets/Script/Main/NetworkManager.cs
View File

@ -376,20 +376,29 @@ public class NetworkManager : Singleton<NetworkManager>
}
}
//코인 구매 함수
public void PurchaseCoins(Action<int> success, Action failure)
/// <summary>
/// 코인 구매 함수
/// </summary>
/// <param name="amount">충전양</param>
/// <param name="paymentId">결제ID(??)</param>
/// <param name="paymentType">결제타입(카드,구글페이)</param>
/// <param name="success"></param>
/// <param name="failure"></param>
public void PurchaseCoins(int amount, string paymentId, string paymentType, Action<int> success, Action failure)
{
StartCoroutine(PurchaseCoinsCoroutine(success, failure));
StartCoroutine(PurchaseCoinsCoroutine(amount, paymentId, paymentType, success, failure));
}
private IEnumerator PurchaseCoinsCoroutine(Action<int> success, Action failure)
private IEnumerator PurchaseCoinsCoroutine(int amount, string paymentId, string paymentType, Action<int> success, Action failure)
{
string jsonString = "{\"adCompleted\": true}"; //테스트를 위해 ture로 설정
byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonString);
string url = Constants.ServerURL + "/coins/purchase"; // 서버 엔드포인트
PurchaseData purchaseData = new PurchaseData(amount, paymentId, paymentType);
string jsonString = JsonUtility.ToJson(purchaseData);
using (UnityWebRequest www =
new UnityWebRequest(Constants.ServerURL + "/coins/recharge/ad", UnityWebRequest.kHttpVerbPOST))
using (UnityWebRequest www = new UnityWebRequest(url, UnityWebRequest.kHttpVerbPOST))
{
byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonString);
www.uploadHandler = new UploadHandlerRaw(bodyRaw);
www.downloadHandler = new DownloadHandlerBuffer();
www.SetRequestHeader("Content-Type", "application/json");
@ -408,26 +417,29 @@ public class NetworkManager : Singleton<NetworkManager>
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError ||
www.result == UnityWebRequest.Result.ProtocolError)
if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError)
{
Debug.Log("광고 시청 후 코인 충전 실패: " + www.error);
Debug.LogError("결제 요청 실패: " + www.error);
failure?.Invoke();
}
else
{
var result = www.downloadHandler.text;
var rechargeResult = JsonUtility.FromJson<CoinsAdResult>(result);
var purchaseResult = JsonUtility.FromJson<CoinsPurchaseResult>(result);
if (rechargeResult.result == "SUCCESS")
if (purchaseResult.result == "SUCCESS")
{
Debug.Log("광고 시청으로 코인 충전 완료: " + rechargeResult.recharged);
Debug.Log($"결제 완료 {purchaseResult.purchased} 코인 충전됨, 현재 코인: {purchaseResult.currentCoins}");
// 유저 데이터 갱신
UserManager.Instance.SetCoinsInfo();
success?.Invoke(rechargeResult.recharged);
// 최신 코인 개수를 성공 콜백으로 전달
success?.Invoke(purchaseResult.purchased);
}
else
{
Debug.Log("광고 시청 후 충전 실패: " + rechargeResult.result);
Debug.LogError("결제 후 코인 충전 실패: " + purchaseResult.result);
failure?.Invoke();
}
}

1
Assets/Script/Main/SigninPanelController.cs
View File

@ -55,7 +55,6 @@ public class SigninPanelController : MonoBehaviour
NetworkManager.Instance.Signin(signinData, (signinResult) =>
{
mainPanel = gameObject.GetComponent<MainPanelManager>();
Destroy(gameObject);
// 유저 정보 저장

32
Assets/Script/Main/UserManager.cs
View File

@ -20,6 +20,19 @@ public class CoinsInfoResult
public int coins;
}
/// <summary>
/// 코인 구매 응답 클래스
/// </summary>
public class CoinsPurchaseResult
{
public string result;
public string message;
public int purchased; // 충전된 코인량
public int currentCoins; // 현재 보유 코인량
}
/// <summary>
/// 광고 시청 응답 클래스
/// </summary>
public class CoinsAdResult
{
public string result;
@ -28,6 +41,25 @@ public class CoinsAdResult
public int currentCoins; // 현재 보유 코인량
}
/// <summary>
/// 코인 구매 요청 데이터 클래스
/// </summary>
public class PurchaseData
{
public int amount;
public string paymentId;
public string paymentType;
public PurchaseData(int amount, string paymentId, string paymentType)
{
this.amount = amount;
this.paymentId = paymentId;
this.paymentType = paymentType;
}
}
public class UserManager : Singleton<UserManager>
{
public string UserId { get; private set; }

30
Assets/Script/Replay/ReplayController.cs
View File

@ -1,30 +1,39 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class ReplayController : MonoBehaviour
{
void Awake()
[SerializeField] private TMP_Text playerANicknameText;
[SerializeField] private TMP_Text playerBNicknameText;
[SerializeField] private Image playerAImage;
[SerializeField] private Image playerBImage;
void Start()
{
//TODO: 리플레이매니저 데이터로 화면 초기화
InitReplayUI();
//TODO: 프로필 이미지 불러오기
}
public void OnclickExitButton()
{
//TODO: 메인씬으로 다시 넘어갈 때 호출해야하는 함수 등등이 있을지....
SceneManager.LoadScene("Main-Jay");
}
public void OnclickFirstButton()
{
ReplayManager.Instance.ReplayFirst();
}
public void OnclickUndoButton()
{
Move targetMove = ReplayManager.Instance.PopMove();
Move targetMove = ReplayManager.Instance.PopPlacedMove();
if (targetMove != null)
{
GameManager.Instance.ReplayUndo(targetMove);
ReplayManager.Instance.ReplayUndo(targetMove);
}
}
@ -33,14 +42,19 @@ public class ReplayController : MonoBehaviour
Move nextMove = ReplayManager.Instance.GetNextMove();
if (nextMove != null)
{
GameManager.Instance.ReplayNext(nextMove);
ReplayManager.Instance.ReplayNext(nextMove);
}
}
public void OnClickFinishButton()
{
ReplayManager.Instance.ReplayFinish();
}
public void InitReplayUI()
{
playerANicknameText.text = ReplayManager.Instance.GetPlayerANickname();
playerBNicknameText.text = ReplayManager.Instance.GetPlayerBNickname();
}
}

73
Assets/Script/Replay/ReplayManager.cs
View File

@ -42,6 +42,8 @@ public class ReplayManager : Singleton<ReplayManager>
private Stack<Move> _undoStack;
private int _moveIndex;
private GameLogic _gameLogic;
private StoneController _stoneController;
public void InitReplayBoard(ReplayRecord replayRecord)
{
@ -70,7 +72,7 @@ public class ReplayManager : Singleton<ReplayManager>
_placedStoneStack.Push(storedMove);
}
public Move PopMove()
public Move PopPlacedMove()
{
if (_placedStoneStack.Count == 0)
return null;
@ -78,7 +80,7 @@ public class ReplayManager : Singleton<ReplayManager>
return move;
}
public void PushUndoMove(Move storedMove)
private void PushUndoMove(Move storedMove)
{
_undoStack.Push(storedMove);
}
@ -165,13 +167,14 @@ public class ReplayManager : Singleton<ReplayManager>
return records;
}
// 최대 저장 개수만큼 기보데이터가 저장, 유지되도록 하는 함수
private void RecordCountChecker()
{
try
{
string path = Application.persistentDataPath;
var files = Directory.GetFiles(path, "*.json");
if (files.Length <= 10)
if (files.Length <= Constants.ReplayMaxRecordSize)
return;
File.Delete(files[0]);
RecordCountChecker();
@ -182,36 +185,74 @@ public class ReplayManager : Singleton<ReplayManager>
}
}
// 기보 데이터 하나를 선택해서 매니저에 저장(씬 이동 후 데이터 활용을 위해)
public void SetReplayData(ReplayRecord replayRecord)
{
_selectedReplayRecord = replayRecord;
}
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
#region ReplayController에서 호출할 함수들
public void ReplayNext(Move nextMove)
{
if (scene.name == "Replay")
// 보드에 돌을 설정하기 위해 gameLogic의 SetNewBoardValue호출
if (nextMove.stoneType.Equals(Enums.StoneType.Black.ToString()))
{
if (_selectedReplayRecord != null)
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerA, nextMove.columnIndex, nextMove.rowIndex);
}
else if (nextMove.stoneType.Equals(Enums.StoneType.White.ToString()))
{
InitReplayBoard(_selectedReplayRecord);
_gameLogic.SetNewBoardValue(Enums.PlayerType.PlayerB, nextMove.columnIndex, nextMove.rowIndex);
}
// 돌이 놓인 내역을 ReplayManager에도 반영
ReplayManager.Instance.PushMove(nextMove);
}
// TODO: 데이터 잘못 가져왔을 때 어떻게 처리할지 고민하기
// Main으로 강제 전환 ?
public void ReplayUndo(Move targetMove)
{
ReplayManager.Instance.PushUndoMove(targetMove);
_gameLogic.RemoveStone(targetMove.columnIndex, targetMove.rowIndex);
}
public void ReplayFirst()
{
while (_placedStoneStack.Count > 0)
{
ReplayUndo(_placedStoneStack.Pop());
}
}
#region for tests
public void OnClickSaveButton(string winnerPlayerType = "PlayerA")
public void ReplayFinish()
{
if(winnerPlayerType == Enums.PlayerType.PlayerA.ToString())
SaveReplayData(Enums.PlayerType.PlayerA);
else
SaveReplayData(Enums.PlayerType.PlayerB);
while(_placedStoneStack.Count < _selectedReplayRecord.moves.Count)
{
ReplayNext(GetNextMove());
}
}
public string GetPlayerANickname()
{
return _selectedReplayRecord.playerA;
}
public string GetPlayerBNickname()
{
return _selectedReplayRecord.playerB;
}
#endregion
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
if (scene.name == "Replay")
{
InitReplayBoard(_selectedReplayRecord);
//게임 매니저에서 가져온 코드입니다.
_stoneController = GameObject.FindObjectOfType<StoneController>();
_stoneController.InitStones();
_gameLogic = new GameLogic(_stoneController, Enums.GameType.Replay);
}
}
}

28
Assets/Script/UI/PanelChildController/ShopItemController.cs
View File

@ -6,9 +6,8 @@ using UnityEngine.UI;
public class ShopItemController : MonoBehaviour
{
ShopItem _shopItem;
public Sprite[] profileSprites;
AdManager _adManager;
public void Init(ShopItem shopItem)
{
@ -16,20 +15,35 @@ public class ShopItemController : MonoBehaviour
var itemImage = GetComponentsInChildren<Image>()[1];
var itemText = GetComponentsInChildren<TextMeshProUGUI>();
itemText[0].text = this._shopItem.Name;
itemText[1].text = this._shopItem.Price;
itemText[0].text = this._shopItem.name;
itemText[1].text = this._shopItem.price+"원";
}
public void OnClickShopItem()
{
if (_shopItem.Price == "광고")
var shopPanel = GetComponentInParent<CanvasGroup>(); //코인 구매시 상점 패널의 캔버스 그룹 raycast를 비활성화하여 중복클릭 방지.
if (_shopItem.price == 0)
{
//보상형 전면 광고 로드
FindObjectOfType<AdManager>().ShowRewardedInterstitialAd(); //Todo FindOf 함수 수정
_adManager = GetComponent<AdManager>();
_adManager.ShowRewardedInterstitialAd(shopPanel);
}
else
{
//todo 가격별로 구매하기
NetworkManager.Instance.PurchaseCoins(
_shopItem.price, // 충전할 코인 개수
_shopItem.name, // 결제 ID
"GooglePay", // 결제 방식 (GooglePay, PayPal 등)
(coins) => {
GameManager.Instance.panelManager.UpdateCoinsPanelUI(coins,shopPanel);
},
() => {
Debug.LogError("결제 후 코인 충전 실패");
}
);
}
}
}

26
Assets/Script/UI/PanelController/PanelManager.cs
View File

@ -19,7 +19,6 @@ public class PanelManager : MonoBehaviour
private void Awake()
{
SetCanvas();
// Prefabs 폴더에서 모든 패널 프리팹 로드
GameObject[] prefabs = Resources.LoadAll<GameObject>("Prefabs/Panels");
@ -31,7 +30,7 @@ public class PanelManager : MonoBehaviour
Debug.Log($"총 {panelPrefabs.Count}개의 패널이 로드됨.");
}
private void SetCanvas()
void Start()
{
if (_canvas == null)
{
@ -142,7 +141,7 @@ public class PanelManager : MonoBehaviour
if (_canvas != null)
{
var replayPanelObject = GetPanel("Replay Panel");
replayPanelObject.GetComponent<ReplayPanelController>().Show();
replayPanelObject.GetComponent<ReplayPanelItemsController>().Show();
}
}
@ -177,16 +176,15 @@ public class PanelManager : MonoBehaviour
//상점 패널 생성
public void OnShopPanelClick()
{
List<ShopItem> shopItems = new List<ShopItem>(); //테스트 데이터 리스트 생성
for (int i = 0; i < 10; i++)
List<ShopItem> shopItems = new List<ShopItem>(); //상점 데이터 리스트 생성
for (int i = 0; i < 5; i++)
{
if (i == 0) //광고 항목
{
ShopItem shopItem = new ShopItem
{
Name = "코인10개",
Price = "광고"
name = "광고) 코인500개 ",
price = 0
};
shopItems.Add(shopItem);
}
@ -194,21 +192,21 @@ public class PanelManager : MonoBehaviour
{
ShopItem shopItem = new ShopItem
{
Name = "코인"+i+"개",
Price = (i * 1000)+ "원"
name = i*1000+"개 ",
price = i * 1000
};
shopItems.Add(shopItem);
}
}
OpenShopPanel(shopItems);
GameManager.Instance.panelManager.OpenShopPanel(shopItems);
}
public void UpdateCoinsPanelUI(int coinsChanged)
//코인 패널 코인 갱신
public void UpdateCoinsPanelUI(int coinsChanged, CanvasGroup shopPanel)
{
if (_coinsPanel != null)
{
_coinsPanel.AddCoins(coinsChanged, () =>
_coinsPanel.AddCoins(coinsChanged, shopPanel, () =>
{
});

2
Assets/Script/UI/PanelController/ReplayPanelController.cs → Assets/Script/UI/PanelController/ReplayPanelItemsController.cs
View File

@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ReplayPanelController : ScrollPanelController
public class ReplayPanelItemsController : ScrollPanelController
{
private string _myNickname;

2
Assets/Script/UI/PanelController/ReplayPanelController.cs.meta → Assets/Script/UI/PanelController/ReplayPanelItemsController.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dd8226d0f420f6e45b27896f8c57b9c1
guid: 43d3a140ef05b96439c226fb3de1178e
MonoImporter:
externalObjects: {}
serializedVersion: 2

8
Assets/Trash Can_JY/CoinUITestScript.cs
View File

@ -8,10 +8,10 @@ public class CoinUITestScript : MonoBehaviour
public void OnClickAddCoin()
{
coinsPanelController.AddCoins(100, () =>
{
Debug.Log("Add coin 후 동작");
});
// coinsPanelController.AddCoins(100, () =>
// {
// Debug.Log("Add coin 후 동작");
// });
}
public void OnClickRemoveCoin()

3
ProjectSettings/EditorBuildSettings.asset
View File

@ -17,4 +17,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/LYC/GameCopyLYC.unity
guid: c7eedd59cc78a7648a2168fd25540b88
- enabled: 1
path: Assets/Scenes/Replay.unity
guid: 393dbf55b04641847ae9b882a54856af
m_configObjects: {}