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

오탈자 수정및 덱 변경 시스템 수정

This commit is contained in:
김판돌 2024-03-01 16:10:29 +09:00
parent 12b68b9a5f
commit ce9d968c05
10 changed files with 121 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14704,8 +14704,9 @@ GameObject:
- component: {fileID: 914848362}
- component: {fileID: 914848364}
- component: {fileID: 914848363}
- component: {fileID: 914848365}
m_Layer: 5
m_Name: Story
m_Name: Deck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -14772,6 +14773,86 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 914848361}
m_CullTransparentMesh: 1
--- !u!114 &914848365
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 914848361}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1884849876}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 544367042}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 1205412846}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 544367046}
m_TargetAssemblyTypeName: UnitSetUiCtrl, Assembly-CSharp
m_MethodName: ButtonDeck
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &918095905
GameObject:
m_ObjectHideFlags: 0

2
Client/Assets/1_Script/DeckPrefab.cs
View File

@ -59,7 +59,7 @@ public class DeckPrefab : MonoBehaviour
}
else
{
img.sprite = Statics.longUnits[Statics.deckUnit[unit_id].unit_id].GetComponent<UnitCtrl>().unitSprite;
img.sprite = Statics.longUnits[Statics.deckUnit[unit_id].unit_data_id].GetComponent<UnitCtrl>().unitSprite;
img.color = Color.white;
}
}

2
Client/Assets/1_Script/Info/UnitInfo.cs
View File

@ -48,7 +48,7 @@ public class UnitInfo
{
foreach (var item in Statics.deckUnit)
{
if (item.Value.unit_id == _id)
if (item.Value.unit_data_id == _id)
{
this.deckUnitInfo = item.Value;
}

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

@ -122,7 +122,7 @@ public class MainCtrl : MonoBehaviour
{
PlayerPrefs.SetString("uuid", data.uuid);
Statics.uuid = data.uuid;
List<DeckUnitInfo> units = data.deck_unit.OrderBy(n => n.unit_id).ToList();
List<DeckUnitInfo> units = data.deck_unit.OrderBy(n => n.unit_data_id).ToList();
Statics.deck_info = data.deck_info.OrderBy(n => n.id).ToList();
Statics.equipment = data.equipment.OrderBy(n => n.equipment_data_id).ToList();
//유닛정보 Set

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

@ -44,15 +44,15 @@ public class PlayCtrl : SingletonMonoBehaviour<PlayCtrl>
isEndGame = false;
delay = 0.0f;
units = new UnitCtrl[9];
units[0] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit0_id].unit_id].GetComponent<UnitCtrl>();
units[1] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit1_id].unit_id].GetComponent<UnitCtrl>();
units[2] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit2_id].unit_id].GetComponent<UnitCtrl>();
units[3] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit3_id].unit_id].GetComponent<UnitCtrl>();
units[4] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit4_id].unit_id].GetComponent<UnitCtrl>();
units[5] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit5_id].unit_id].GetComponent<UnitCtrl>();
units[6] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit6_id].unit_id].GetComponent<UnitCtrl>();
units[7] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit7_id].unit_id].GetComponent<UnitCtrl>();
units[8] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit8_id].unit_id].GetComponent<UnitCtrl>();
units[0] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit0_id].unit_data_id].GetComponent<UnitCtrl>();
units[1] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit1_id].unit_data_id].GetComponent<UnitCtrl>();
units[2] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit2_id].unit_data_id].GetComponent<UnitCtrl>();
units[3] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit3_id].unit_data_id].GetComponent<UnitCtrl>();
units[4] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit4_id].unit_data_id].GetComponent<UnitCtrl>();
units[5] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit5_id].unit_data_id].GetComponent<UnitCtrl>();
units[6] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit6_id].unit_data_id].GetComponent<UnitCtrl>();
units[7] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit7_id].unit_data_id].GetComponent<UnitCtrl>();
units[8] = Statics.longUnits[Statics.deckUnit[Statics.deck_info[0].deck_unit8_id].unit_data_id].GetComponent<UnitCtrl>();
for (int n = 0; n < unitSpriteButton.Length; n++)
{
unitSpriteButton[n].sprite = units[n].unitSprite;

2
Client/Assets/1_Script/System/Datas/AIData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
public class AIData : Excel
{
public int index;
public long index;
public int chapter;
public int stage;
public eCommand command;

2
Client/Assets/1_Script/System/Datas/EquipmentData.cs
View File

@ -2,7 +2,7 @@
public class EquipmentData : Excel
{
public int index;
public long index;
public string name;
public ePart part;
public int stats1;

4
Client/Assets/1_Script/System/Datas/ShopData.cs
View File

@ -3,13 +3,13 @@ public class ShopData : Excel
{
public long index;
public string name;
public eShopType type;
public eImageType image_type;
public override void toJson()
{
}
}
public enum eShopType
public enum eImageType
{
bigImage = 1,
smallBox,

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

@ -69,6 +69,8 @@ public class LoginResp : Request<LoginResp>
public List<DeckUnitInfo> deck_unit { get; set; }
public List<DeckInfo> deck_info { get; set; }
public List<Equipment> equipment { get; set; }
public List<ConsumableItem> consumableItem { get; set; }
public List<EtcItem> etcItem { get; set; }
public void Request(LoginReq loginReq, Action<LoginResp> onRequestFinished, Action errorRequestFinished)
{
@ -163,7 +165,7 @@ public class NicknameChangeResp : Request<NicknameChangeResp>
public class DynamicData
{
public int id { get; set; }
public long id { get; set; }
public string name { get; set; }
public string value { get; set; }
}
@ -171,7 +173,7 @@ public class DynamicData
public class DeckUnitInfo
{
public long id { get; set; }
public long unit_id { get; set; }
public long unit_data_id { get; set; }
public long equip0_id { get; set; }
public long equip1_id { get; set; }
public long equip2_id { get; set; }
@ -219,4 +221,22 @@ public class DeckInfo
this.deck_unit8_id = newData.deck_unit8_id;
}
}
public class ConsumableItem
{
public long id { get; set; }
public long consumable_item_data_id { get; set; }
public int count { get; set; }
}
public class EtcItem
{
public long id { get; set; }
public long etc_item_data_id { get; set; }
public int count { get; set; }
}

2
Client/Assets/1_Script/UnitPrefab.cs
View File

@ -15,7 +15,7 @@ public class UnitPrefab : MonoBehaviour
public void SetData(DeckUnitInfo deckUnitInfo)
{
this.deckUnitInfo = deckUnitInfo;
unitData = Statics.excelDatas.unitData[deckUnitInfo.unit_id];
unitData = Statics.excelDatas.unitData[deckUnitInfo.unit_data_id];
unit = Statics.stringUnits[unitData.name];
unitCtrl = unit.GetComponent<UnitCtrl>();
image.sprite = unitCtrl.unitSprite;