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

로그인 버그 수정완료

This commit is contained in:
김판돌 2024-02-25 21:53:54 +09:00
parent c37a1e925d
commit 10e10773b6
6 changed files with 81 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Client/Assets/1_Script/System/GameManager.cs
View File

@ -17,14 +17,10 @@ public class GameManager : DontDestroy<GameManager>
/// <summary>
/// 현재 엑셀 처리가 끝났는지 확인하는 부분.
/// </summary>
public bool isExcel { get { return _isExcel; } }
//멀티 쓰레드가 너무 빠르게 동작해 데이터 세팅이 끝나지 않았는데 씬이 먼져 넘어가버림
//그래서 이미지 데이터가 불러와 지지 않는 상태에서 로딩이 끝나버리는 버그가 발생해서 방식을 수정.
public bool _isExcel;
public bool isExcel { get { return corExcel != null && corExcel.IsRunning; } }
protected override void OnStart()
{
_isExcel = true;
Statics.version = PlayerPrefs.GetString("version");
DownlodeResp request = new DownlodeResp();
request.Request((data) =>
@ -68,7 +64,6 @@ public class GameManager : DontDestroy<GameManager>
Statics.stringIcons.Add(data.Value.name, Sprite.Create(obj, new Rect(0, 0, obj.width, obj.height), new Vector2(0.5f, 0.5f)));
}
}
_isExcel = false;
}
//public float x = 2160f;

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

@ -75,66 +75,6 @@ public class LoginResp : Request<LoginResp>
CreateRequest(protocol, onRequestFinished, loginReq, HTTPMethods.Post, errorRequestFinished);
}
}
public class DynamicData
{
public int id { get; set; }
public string name { get; set; }
public string value { get; set; }
}
public class DeckUnitInfo
{
public long id { get; set; }
public long unit_id { get; set; }
public long equip0_id { get; set; }
public long equip1_id { get; set; }
public long equip2_id { get; set; }
public long equip3_id { get; set; }
public long equip4_id { get; set; }
public long equip5_id { get; set; }
public int level { get; set; }
public long exp { get; set; }
}
public class Equipment
{
public long id { get; set; }
public long equip_unit { get; set; }
public int rand_stats { get; set; }
public long equipment_data_id { get; set; }
}
public class DeckInfo
{
public long id { get; set; }
public int deck_type { get; set; }
public long deck_unit0_id { get; set; }
public long deck_unit1_id { get; set; }
public long deck_unit2_id { get; set; }
public long deck_unit3_id { get; set; }
public long deck_unit4_id { get; set; }
public long deck_unit5_id { get; set; }
public long deck_unit6_id { get; set; }
public long deck_unit7_id { get; set; }
public long deck_unit8_id { get; set; }
public void newDataSet(DeckInfo newData)
{
this.id = newData.id;
this.deck_type = newData.deck_type;
this.deck_unit0_id = newData.deck_unit0_id;
this.deck_unit1_id = newData.deck_unit1_id;
this.deck_unit2_id = newData.deck_unit2_id;
this.deck_unit3_id = newData.deck_unit3_id;
this.deck_unit4_id = newData.deck_unit4_id;
this.deck_unit5_id = newData.deck_unit5_id;
this.deck_unit6_id = newData.deck_unit6_id;
this.deck_unit7_id = newData.deck_unit7_id;
this.deck_unit8_id = newData.deck_unit8_id;
}
}
#endregion
#region 200 : EquipChange
@ -219,4 +159,64 @@ public class NicknameChangeResp : Request<NicknameChangeResp>
CreateRequest(protocol, onRequestFinished, new NicknameChangeReq(newNickname), HTTPMethods.Post, null);
}
}
#endregion
#endregion
public class DynamicData
{
public int id { get; set; }
public string name { get; set; }
public string value { get; set; }
}
public class DeckUnitInfo
{
public long id { get; set; }
public long unit_id { get; set; }
public long equip0_id { get; set; }
public long equip1_id { get; set; }
public long equip2_id { get; set; }
public long equip3_id { get; set; }
public long equip4_id { get; set; }
public long equip5_id { get; set; }
public int level { get; set; }
public long exp { get; set; }
}
public class Equipment
{
public long id { get; set; }
public long equip_unit { get; set; }
public int rand_stats { get; set; }
public long equipment_data_id { get; set; }
}
public class DeckInfo
{
public long id { get; set; }
public int deck_type { get; set; }
public long deck_unit0_id { get; set; }
public long deck_unit1_id { get; set; }
public long deck_unit2_id { get; set; }
public long deck_unit3_id { get; set; }
public long deck_unit4_id { get; set; }
public long deck_unit5_id { get; set; }
public long deck_unit6_id { get; set; }
public long deck_unit7_id { get; set; }
public long deck_unit8_id { get; set; }
public void newDataSet(DeckInfo newData)
{
this.id = newData.id;
this.deck_type = newData.deck_type;
this.deck_unit0_id = newData.deck_unit0_id;
this.deck_unit1_id = newData.deck_unit1_id;
this.deck_unit2_id = newData.deck_unit2_id;
this.deck_unit3_id = newData.deck_unit3_id;
this.deck_unit4_id = newData.deck_unit4_id;
this.deck_unit5_id = newData.deck_unit5_id;
this.deck_unit6_id = newData.deck_unit6_id;
this.deck_unit7_id = newData.deck_unit7_id;
this.deck_unit8_id = newData.deck_unit8_id;
}
}

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

@ -6,6 +6,7 @@ public class Statics
{
#if UNITY_EDITOR
public static readonly string url = "https://127.0.0.1:4860";
//public static readonly string url = "https://game.pandoli365.com";
#else
public static readonly string url = "https://game.pandoli365.com";
#endif

10
Client/Assets/1_Script/Test.cs
View File

@ -21,4 +21,14 @@ public class Test : MonoBehaviour
}
[ContextMenu("ResetData")]
public void ResetData()
{
PlayerPrefs.SetString("e", "");
PlayerPrefs.SetString("version", "");
PlayerPrefs.SetString("uuid", "");
Debug.Log("Reset");
}
}

1
Client/Packages/manifest.json
View File

@ -3,6 +3,7 @@
"com.unity.collab-proxy": "2.0.5",
"com.unity.feature.2d": "2.0.0",
"com.unity.feature.development": "1.0.1",
"com.unity.mobile.android-logcat": "1.3.2",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.5",

7
Client/Packages/packages-lock.json
View File

@ -195,6 +195,13 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mobile.android-logcat": {
"version": "1.3.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.2.1",
"depth": 0,