Skip to content

Commit 1847483

Browse files
committed
GameSvr数据源测试
1 parent 488533b commit 1847483

6 files changed

Lines changed: 44 additions & 13 deletions

File tree

src/GameSrv/DB/MySqlDB.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ namespace GameSrv.DB
88
{
99
public class MySqlDB : IDataSource
1010
{
11-
1211
private IDbConnection _dbConnection;
1312

1413
public int LoadItemsDB()
@@ -337,13 +336,13 @@ public void SaveSellOffItemList()
337336
}
338337
}
339338

340-
public static int LoadUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList)
339+
public int LoadUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList)
341340
{
342341
//todo 加载武器升级数据
343342
return -1;
344343
}
345344

346-
public static int SaveUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList)
345+
public int SaveUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList)
347346
{
348347
//todo 保存武器升级数据
349348
return -1;

src/GameSrv/GameApp.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void Initialize(CancellationToken stoppingToken)
108108
M2Share.LoadDenyChrNameList();
109109
M2Share.LoadNoClearMonList();
110110
LogService.Info("正在加载物品数据库...");
111-
int nCode = GameShare.CommonDb.LoadItemsDB();
111+
int nCode = GameShare.DataSource.LoadItemsDB();
112112
if (nCode < 0)
113113
{
114114
LogService.Info($"物品数据库加载失败!!! Code: {nCode}");
@@ -128,15 +128,15 @@ public void Initialize(CancellationToken stoppingToken)
128128
return;
129129
}
130130
LogService.Info("正在加载怪物数据库...");
131-
nCode = GameShare.CommonDb.LoadMonsterDB();
131+
nCode = GameShare.DataSource.LoadMonsterDB();
132132
if (nCode < 0)
133133
{
134134
LogService.Info($"加载怪物数据库失败!!! Code: {nCode}");
135135
return;
136136
}
137137
LogService.Info($"加载怪物数据库成功...[{SystemShare.WorldEngine.MonsterCount}]");
138138
LogService.Info("正在加载技能数据库...");
139-
nCode = GameShare.CommonDb.LoadMagicDB();
139+
nCode = GameShare.DataSource.LoadMagicDB();
140140
if (nCode < 0)
141141
{
142142
LogService.Info($"加载技能数据库失败!!! Code: {nCode}");
@@ -179,7 +179,7 @@ public void Initialize(CancellationToken stoppingToken)
179179
}
180180
LogService.Info("加载捆装物品信息成功...");
181181
LogService.Info("加载物品寄售系统...");
182-
GameShare.CommonDb.LoadSellOffItemList();
182+
GameShare.DataSource.LoadSellOffItemList();
183183
LogService.Info("正在加载任务地图信息...");
184184
nCode = GameShare.LocalDb.LoadMapQuest();
185185
if (nCode < 0)

src/GameSrv/GameShare.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class GameShare
1515
public static readonly long StartTime;
1616
public static readonly WordStatistics Statistics;
1717
public static readonly LocalDb LocalDb;
18-
public static readonly MySqlDB CommonDb;
18+
public static readonly IDataSource DataSource;
1919
public static readonly IPlanesService PlanesService;
2020
public static readonly NetworkMonitor NetworkMonitor;
2121
public static readonly SystemProcessor SystemProcess;
@@ -34,7 +34,7 @@ static GameShare()
3434
{
3535
Statistics = new WordStatistics();
3636
LocalDb = new LocalDb();
37-
CommonDb = new MySqlDB();
37+
DataSource = new MySqlDB();
3838
NetworkMonitor = new NetworkMonitor();
3939
SystemProcess = new SystemProcessor();
4040
UserProcessor = new UserProcessor();

src/GameSrv/Maps/MapQuestManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace GameSrv.Maps
55
public class MapQuestManager
66
{
77
public Dictionary<string, Merchant> questDict = new Dictionary<string, Merchant>();
8-
public IList<MapQuestInfo> QuestList = new List<MapQuestInfo>();
8+
private IList<MapQuestInfo> QuestList = new List<MapQuestInfo>();
99

1010
public bool CreateQuest(int nFlag, int nValue, string sMonName, string sItem, string sQuest, bool boGrouped)
1111
{

src/GameSrv/Npc/Merchant.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ private void LoadUpgradeList()
16941694
UpgradeWeaponList.Clear();
16951695
try
16961696
{
1697-
MySqlDB.LoadUpgradeWeaponRecord(ScriptName + '-' + MapName, UpgradeWeaponList);
1697+
GameShare.DataSource.LoadUpgradeWeaponRecord(ScriptName + '-' + MapName, UpgradeWeaponList);
16981698
}
16991699
catch
17001700
{
@@ -1706,7 +1706,7 @@ private void SaveUpgradingList()
17061706
{
17071707
try
17081708
{
1709-
MySqlDB.SaveUpgradeWeaponRecord(ScriptName + '-' + MapName, UpgradeWeaponList);
1709+
GameShare.DataSource.SaveUpgradeWeaponRecord(ScriptName + '-' + MapName, UpgradeWeaponList);
17101710
}
17111711
catch
17121712
{

src/M2Server/IDataSource.cs

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,39 @@
1-
namespace M2Server
1+
using SystemModule.Data;
2+
3+
namespace M2Server
24
{
35
public interface IDataSource
46
{
7+
/// <summary>
8+
/// 读取物品数据
9+
/// </summary>
10+
/// <returns></returns>
11+
public int LoadItemsDB();
12+
13+
/// <summary>
14+
/// 读取技能数据
15+
/// </summary>
16+
/// <returns></returns>
17+
public int LoadMagicDB();
18+
19+
/// <summary>
20+
/// 读取怪物数据
21+
/// </summary>
22+
/// <returns></returns>
23+
int LoadMonsterDB();
24+
25+
/// <summary>
26+
/// 加载寄售系统数据
27+
/// </summary>
28+
void LoadSellOffItemList();
29+
30+
/// <summary>
31+
/// 保存寄售系统数据
32+
/// </summary>
33+
void SaveSellOffItemList();
34+
35+
int LoadUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList);
536

37+
int SaveUpgradeWeaponRecord(string sNPCName, IList<WeaponUpgradeInfo> DataList);
638
}
739
}

0 commit comments

Comments
 (0)