Team.thewar
/
thewar_client
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

잘못된 시스템 제거

This commit is contained in:
김판돌 2024-08-22 19:04:27 +09:00
parent a7607d2a93
commit b669ec160a
7 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Client/Assets/0_Scenes/Game.unity
View File

@ -6673,7 +6673,19 @@ MonoBehaviour:
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 1 m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1699950333}
m_TargetAssemblyTypeName: StoryUiCtrl, Assembly-CSharp
m_MethodName: testButton
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 m_CallState: 2
--- !u!114 &440143456 --- !u!114 &440143456
MonoBehaviour: MonoBehaviour:

24
Client/Assets/0_Scenes/Play.unity
View File

@ -13888,7 +13888,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!114 &2330720395909538063 --- !u!114 &2330720395909538063
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13903,8 +13903,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
iUnit: {fileID: 6975796988758163051} iUnit: {fileID: 6975796988758163051}
iUnitNickname: {fileID: 5127557828549460664} iUnitNickname: {fileID: 5127557828549460664}
iUnitImage: {fileID: 7982507254516978407}
youUnit: {fileID: 37635086790962674} youUnit: {fileID: 37635086790962674}
youUnitNickname: {fileID: 6831365340785763945} youUnitNickname: {fileID: 6831365340785763945}
youUnitImage: {fileID: 4711687304681685242}
scriptText: {fileID: 6037302274294790102} scriptText: {fileID: 6037302274294790102}
--- !u!1 &2554568632941243214 --- !u!1 &2554568632941243214
GameObject: GameObject:
@ -14157,7 +14159,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 30, y: 0} m_AnchoredPosition: {x: 30, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 146.01001, y: 63.91}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!114 &5127557828549460664 --- !u!114 &5127557828549460664
MonoBehaviour: MonoBehaviour:
@ -14299,7 +14301,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -30, y: 0.000030517578} m_AnchoredPosition: {x: -30, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 146.01001, y: 63.91}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &6037302274294790102 --- !u!114 &6037302274294790102
MonoBehaviour: MonoBehaviour:
@ -14740,10 +14742,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 4848356131037571491} m_Father: {fileID: 4848356131037571491}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 73.005005, y: 0} m_AnchoredPosition: {x: 73.005005, y: -31.955}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 116.01, y: 33.91}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &8383471597735064555 --- !u!224 &8383471597735064555
RectTransform: RectTransform:
@ -14797,10 +14799,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5620797552056137420} m_Father: {fileID: 5620797552056137420}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 73.005005, y: 0} m_AnchoredPosition: {x: 73.005005, y: -31.955}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 116.01, y: 33.91}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &8772798237890598308 --- !u!224 &8772798237890598308
RectTransform: RectTransform:

8
Client/Assets/1_Script/GameUI/StoryUiCtrl.cs
View File

@ -1,4 +1,5 @@
using UnityEngine; using UnityEngine;
using static GameManager;
public class StoryUiCtrl : SingletonMonoBehaviour<StoryUiCtrl> public class StoryUiCtrl : SingletonMonoBehaviour<StoryUiCtrl>
{ {
@ -8,11 +9,14 @@ public class StoryUiCtrl : SingletonMonoBehaviour<StoryUiCtrl>
protected override void OnStart() protected override void OnStart()
{ {
foreach(var item in Statics.excelDatas.storyData) foreach (var item in Statics.excelDatas.storyData)
{ {
StoryPrefab storyPrefab = Instantiate(itemPrefab, itemContent).GetComponent<StoryPrefab>(); StoryPrefab storyPrefab = Instantiate(itemPrefab, itemContent).GetComponent<StoryPrefab>();
storyPrefab.Set(item.Value); storyPrefab.Set(item.Value);
} }
}
public void testButton()
{
GameManager.Instance.NextScene(eScene.Play);
} }
} }

18
Client/Assets/1_Script/MainCtrl.cs
View File

@ -120,7 +120,7 @@ public class MainCtrl : MonoBehaviour
if (data.status.Equals(200)) if (data.status.Equals(200))
{ {
PlayerPrefs.SetString("uuid", data.uuid); PlayerPrefs.SetString("uuid", data.uuid);
Statics.uuid = data.uuid; Statics.uuid = data.session;
Statics.deck_info = data.deck_info.OrderBy(n => n.id).ToList(); Statics.deck_info = data.deck_info.OrderBy(n => n.id).ToList();
//다이나믹 데이터 Set //다이나믹 데이터 Set
foreach (var item in data.dynamic_data) foreach (var item in data.dynamic_data)
@ -132,11 +132,6 @@ public class MainCtrl : MonoBehaviour
Statics.gold = data.gold; Statics.gold = data.gold;
Statics.cash = data.cash; Statics.cash = data.cash;
if (data.new_user) //신규 유저
GameManager.Instance.NextScene(GameManager.eScene.Play);
else
GameManager.Instance.NextScene(GameManager.eScene.Game);
//상점 데이터 //상점 데이터
foreach (var item in Statics.excelDatas.shopItemData) foreach (var item in Statics.excelDatas.shopItemData)
{ {
@ -169,7 +164,15 @@ public class MainCtrl : MonoBehaviour
Statics.shopItems.Add(itemData.index, itemData); Statics.shopItems.Add(itemData.index, itemData);
} }
if (data.new_user) //신규 유저
GameManager.Instance.NextScene(GameManager.eScene.Play);
else
GameManager.Instance.NextScene(GameManager.eScene.Game);
}
else if (data.status.Equals(502))
{
Debug.Log("세션만료");
Application.Quit();
} }
else else
{ {
@ -178,7 +181,6 @@ public class MainCtrl : MonoBehaviour
} }
}, () => }, () =>
{ {
}); });

1
Client/Assets/1_Script/System/Http/Protocol.cs
View File

@ -64,6 +64,7 @@ public class LoginResp : Request<LoginResp>
{ {
private Protocol protocol = Protocol.Login; private Protocol protocol = Protocol.Login;
public string uuid { get; set; } public string uuid { get; set; }
public string session { get; set; }
public string nickname { get; set; } public string nickname { get; set; }
public uint gold { get; set; } public uint gold { get; set; }
public uint cash { get; set; } public uint cash { get; set; }

2
Client/Assets/1_Script/System/ItemManager.cs
View File

@ -1,7 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Unity.VisualScripting;
using static UnityEditor.Progress;
public class ItemManager public class ItemManager
{ {

4
Client/Assets/1_Script/System/Statics.cs
View File

@ -5,8 +5,8 @@ using UnityEngine.UI;
public class Statics public class Statics
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
public static readonly string url = "https://127.0.0.1:4860"; //public static readonly string url = "https://localhost:4860";
//public static readonly string url = "https://game.pandoli365.com"; public static readonly string url = "https://game.pandoli365.com";
#else #else
public static readonly string url = "https://game.pandoli365.com"; public static readonly string url = "https://game.pandoli365.com";
#endif #endif