신규 테이블 오류 수정
This commit is contained in:
parent
2956e1deca
commit
999a80e229
|
|
@ -27,15 +27,17 @@ namespace Server.SQL
|
||||||
{
|
{
|
||||||
return randomRewardData.Values.ToList();
|
return randomRewardData.Values.ToList();
|
||||||
}
|
}
|
||||||
public void init(sheet data)
|
public void init(Sheet data)
|
||||||
{
|
{
|
||||||
this.randomRewardData = new Dictionary<long, RandomRewardData>();
|
this.randomRewardData = new Dictionary<long, RandomRewardData>();
|
||||||
foreach (var item in data.dicViewer)
|
foreach (var item in data.dicViewer)
|
||||||
{
|
{
|
||||||
//RandomRewardData RandomRewardData = new RandomRewardData();
|
RandomRewardData randomRewardData = new RandomRewardData();
|
||||||
//RandomRewardData.index = item.Key;
|
randomRewardData.index = item.Key;
|
||||||
//RandomRewardData.part = (int)item.Value["part"];
|
randomRewardData.group = (int)item.Value["group"];
|
||||||
//this.RandomRewardData.Add(item.Key, RandomRewardData);
|
randomRewardData.reward = (long)item.Value["reward"];
|
||||||
|
randomRewardData.prob = (int)item.Value["prob"];
|
||||||
|
this.randomRewardData.Add(item.Key, randomRewardData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,15 +37,16 @@ namespace Server.SQL
|
||||||
{
|
{
|
||||||
return rewardData.Values.ToList();
|
return rewardData.Values.ToList();
|
||||||
}
|
}
|
||||||
public void init(sheet data)
|
public void init(Sheet data)
|
||||||
{
|
{
|
||||||
this.rewardData = new Dictionary<long, RewardData>();
|
this.rewardData = new Dictionary<long, RewardData>();
|
||||||
foreach (var item in data.dicViewer)
|
foreach (var item in data.dicViewer)
|
||||||
{
|
{
|
||||||
//RewardData RewardData = new RewardData();
|
RewardData rewardData = new RewardData();
|
||||||
//RewardData.index = item.Key;
|
rewardData.index = item.Key;
|
||||||
//RewardData.part = (int)item.Value["part"];
|
rewardData.buy_type = (eBuyType)item.Value["part"];
|
||||||
//this.RewardData.Add(item.Key, RewardData);
|
rewardData.return_item = (long)item.Value["return_item"];
|
||||||
|
this.rewardData.Add(item.Key, rewardData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,15 +34,17 @@ namespace Server.SQL
|
||||||
{
|
{
|
||||||
return shopItemData.Values.ToList();
|
return shopItemData.Values.ToList();
|
||||||
}
|
}
|
||||||
public void init(sheet data)
|
public void init(Sheet data)
|
||||||
{
|
{
|
||||||
this.shopItemData = new Dictionary<long, ShopItemData>();
|
this.shopItemData = new Dictionary<long, ShopItemData>();
|
||||||
foreach (var item in data.dicViewer)
|
foreach (var item in data.dicViewer)
|
||||||
{
|
{
|
||||||
//ShopItemData ShopItemData = new ShopItemData();
|
ShopItemData shopItemData = new ShopItemData();
|
||||||
//ShopItemData.index = item.Key;
|
shopItemData.index = item.Key;
|
||||||
//ShopItemData.part = (int)item.Value["part"];
|
shopItemData.buy_type = (eBuyType)item.Value["buy_type"];
|
||||||
//this.ShopItemData.Add(item.Key, ShopItemData);
|
shopItemData.buy = (int)item.Value["buy"];
|
||||||
|
shopItemData.reward = (long)item.Value["reward"];
|
||||||
|
this.shopItemData.Add(item.Key, shopItemData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,11 @@ namespace Server.Service
|
||||||
{
|
{
|
||||||
|
|
||||||
User user;
|
User user;
|
||||||
|
#region 로그인
|
||||||
List<DynamicData> dynamicDataList = Statics.dynamicDataSQL.Select();
|
List<DynamicData> dynamicDataList = Statics.dynamicDataSQL.Select();
|
||||||
List<DeckUnitInfo> deckUnitInfoList = null;
|
List<DeckUnitInfo> deckUnitInfoList = null;
|
||||||
List<DeckInfo> deckInfoList = null;
|
List<DeckInfo> deckInfoList = null;
|
||||||
List<Equipment> equipmentList = null;
|
List<Equipment> equipmentList = null;
|
||||||
|
|
||||||
if (req.uuid == "")
|
if (req.uuid == "")
|
||||||
{
|
{
|
||||||
//최초 메일 로그인
|
//최초 메일 로그인
|
||||||
|
|
@ -116,6 +116,11 @@ namespace Server.Service
|
||||||
equipmentList = new List<Equipment>();
|
equipmentList = new List<Equipment>();
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
//#region 상점 아이템
|
||||||
|
//List<ShopItemData> shopItemDatas = Statics.shopItemExcel.getShopItemData();
|
||||||
|
//#endregion
|
||||||
|
|
||||||
return makeResp(user, dynamicDataList, deckUnitInfoList, deckInfoList, equipmentList);
|
return makeResp(user, dynamicDataList, deckUnitInfoList, deckInfoList, equipmentList);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,5 +28,8 @@ namespace Server.System
|
||||||
|
|
||||||
//DATA
|
//DATA
|
||||||
public static EquipmentDataExcel equipmentExcel = new EquipmentDataExcel();
|
public static EquipmentDataExcel equipmentExcel = new EquipmentDataExcel();
|
||||||
|
public static RandomRewardDataExcel randomRewardExcel = new RandomRewardDataExcel();
|
||||||
|
public static RewardDataExcel rewardExcel = new RewardDataExcel();
|
||||||
|
public static ShopItemDataExcel shopItemExcel = new ShopItemDataExcel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue