Browse Source

删除无用的配置。

huangjinghao 1 month ago
parent
commit
5414618e6d
100 changed files with 0 additions and 8136 deletions
  1. 0 103
      GameConfig/Code/Client/M_AbysmFishingKingCFG.cpp
  2. 0 27
      GameConfig/Code/Client/M_AbysmFishingKingCFG.h
  3. 0 105
      GameConfig/Code/Client/M_AbysmFishingKingSignCFG.cpp
  4. 0 29
      GameConfig/Code/Client/M_AbysmFishingKingSignCFG.h
  5. 0 107
      GameConfig/Code/Client/M_AccCheckCFG.cpp
  6. 0 31
      GameConfig/Code/Client/M_AccCheckCFG.h
  7. 0 133
      GameConfig/Code/Client/M_ActivExchange.cpp
  8. 0 33
      GameConfig/Code/Client/M_ActivExchange.h
  9. 0 131
      GameConfig/Code/Client/M_ActiveLogin.cpp
  10. 0 31
      GameConfig/Code/Client/M_ActiveLogin.h
  11. 0 111
      GameConfig/Code/Client/M_ActiveReward.cpp
  12. 0 35
      GameConfig/Code/Client/M_ActiveReward.h
  13. 0 105
      GameConfig/Code/Client/M_ActiveTurntable.cpp
  14. 0 29
      GameConfig/Code/Client/M_ActiveTurntable.h
  15. 0 203
      GameConfig/Code/Client/M_ActivityCFG.cpp
  16. 0 71
      GameConfig/Code/Client/M_ActivityCFG.h
  17. 0 109
      GameConfig/Code/Client/M_ActivityCannonDrawCFG.cpp
  18. 0 33
      GameConfig/Code/Client/M_ActivityCannonDrawCFG.h
  19. 0 159
      GameConfig/Code/Client/M_ActivityCarnivalFullCFG.cpp
  20. 0 39
      GameConfig/Code/Client/M_ActivityCarnivalFullCFG.h
  21. 0 133
      GameConfig/Code/Client/M_ActivityCarnivalRankingCFG.cpp
  22. 0 33
      GameConfig/Code/Client/M_ActivityCarnivalRankingCFG.h
  23. 0 105
      GameConfig/Code/Client/M_ActivityChipBoxCFG.cpp
  24. 0 29
      GameConfig/Code/Client/M_ActivityChipBoxCFG.h
  25. 0 109
      GameConfig/Code/Client/M_ActivityChipBoxLottery.cpp
  26. 0 33
      GameConfig/Code/Client/M_ActivityChipBoxLottery.h
  27. 0 131
      GameConfig/Code/Client/M_ActivityDBFCollectingCFG.cpp
  28. 0 31
      GameConfig/Code/Client/M_ActivityDBFCollectingCFG.h
  29. 0 119
      GameConfig/Code/Client/M_ActivityDBFHandbookCFG.cpp
  30. 0 43
      GameConfig/Code/Client/M_ActivityDBFHandbookCFG.h
  31. 0 115
      GameConfig/Code/Client/M_ActivityDBFLuckDrawCFG.cpp
  32. 0 39
      GameConfig/Code/Client/M_ActivityDBFLuckDrawCFG.h
  33. 0 139
      GameConfig/Code/Client/M_ActivityDBFMissionCFG.cpp
  34. 0 39
      GameConfig/Code/Client/M_ActivityDBFMissionCFG.h
  35. 0 157
      GameConfig/Code/Client/M_ActivityDBFSignCFG.cpp
  36. 0 33
      GameConfig/Code/Client/M_ActivityDBFSignCFG.h
  37. 0 157
      GameConfig/Code/Client/M_ActivityDayHuntCFG.cpp
  38. 0 37
      GameConfig/Code/Client/M_ActivityDayHuntCFG.h
  39. 0 111
      GameConfig/Code/Client/M_ActivityDoubleElevenDiamondGift.cpp
  40. 0 35
      GameConfig/Code/Client/M_ActivityDoubleElevenDiamondGift.h
  41. 0 113
      GameConfig/Code/Client/M_ActivityDoubleElevenLottery.cpp
  42. 0 37
      GameConfig/Code/Client/M_ActivityDoubleElevenLottery.h
  43. 0 107
      GameConfig/Code/Client/M_ActivityDoubleElevenLotteryEx.cpp
  44. 0 31
      GameConfig/Code/Client/M_ActivityDoubleElevenLotteryEx.h
  45. 0 107
      GameConfig/Code/Client/M_ActivityDoubleElevenLotteryTicketShop.cpp
  46. 0 31
      GameConfig/Code/Client/M_ActivityDoubleElevenLotteryTicketShop.h
  47. 0 113
      GameConfig/Code/Client/M_ActivityDoubleElevenMission.cpp
  48. 0 37
      GameConfig/Code/Client/M_ActivityDoubleElevenMission.h
  49. 0 133
      GameConfig/Code/Client/M_ActivityDoubleElevenRank.cpp
  50. 0 33
      GameConfig/Code/Client/M_ActivityDoubleElevenRank.h
  51. 0 133
      GameConfig/Code/Client/M_ActivityDoubleElevenRecharge.cpp
  52. 0 33
      GameConfig/Code/Client/M_ActivityDoubleElevenRecharge.h
  53. 0 111
      GameConfig/Code/Client/M_ActivityDrawLottery.cpp
  54. 0 35
      GameConfig/Code/Client/M_ActivityDrawLottery.h
  55. 0 131
      GameConfig/Code/Client/M_ActivityElevenCollectingCFG.cpp
  56. 0 31
      GameConfig/Code/Client/M_ActivityElevenCollectingCFG.h
  57. 0 119
      GameConfig/Code/Client/M_ActivityElevenHandbookCFG.cpp
  58. 0 43
      GameConfig/Code/Client/M_ActivityElevenHandbookCFG.h
  59. 0 115
      GameConfig/Code/Client/M_ActivityElevenLuckDrawCFG.cpp
  60. 0 39
      GameConfig/Code/Client/M_ActivityElevenLuckDrawCFG.h
  61. 0 139
      GameConfig/Code/Client/M_ActivityElevenMissionCFG.cpp
  62. 0 39
      GameConfig/Code/Client/M_ActivityElevenMissionCFG.h
  63. 0 157
      GameConfig/Code/Client/M_ActivityElevenSignCFG.cpp
  64. 0 33
      GameConfig/Code/Client/M_ActivityElevenSignCFG.h
  65. 0 171
      GameConfig/Code/Client/M_ActivityFeedBackGiftCFG.cpp
  66. 0 35
      GameConfig/Code/Client/M_ActivityFeedBackGiftCFG.h
  67. 0 251
      GameConfig/Code/Client/M_ActivityFeedBackPrizeCFG.cpp
  68. 0 55
      GameConfig/Code/Client/M_ActivityFeedBackPrizeCFG.h
  69. 0 105
      GameConfig/Code/Client/M_ActivityFishingCeleBaseInfo.cpp
  70. 0 29
      GameConfig/Code/Client/M_ActivityFishingCeleBaseInfo.h
  71. 0 125
      GameConfig/Code/Client/M_ActivityFishingCeleExchangeCFG.cpp
  72. 0 49
      GameConfig/Code/Client/M_ActivityFishingCeleExchangeCFG.h
  73. 0 131
      GameConfig/Code/Client/M_ActivityFishingCeleGiftLottery.cpp
  74. 0 31
      GameConfig/Code/Client/M_ActivityFishingCeleGiftLottery.h
  75. 0 111
      GameConfig/Code/Client/M_ActivityFishingCeleGiftLotteryMap.cpp
  76. 0 35
      GameConfig/Code/Client/M_ActivityFishingCeleGiftLotteryMap.h
  77. 0 107
      GameConfig/Code/Client/M_ActivityFishingCeleGiftRecharge.cpp
  78. 0 31
      GameConfig/Code/Client/M_ActivityFishingCeleGiftRecharge.h
  79. 0 157
      GameConfig/Code/Client/M_ActivityFishingCeleLotteryMap.cpp
  80. 0 33
      GameConfig/Code/Client/M_ActivityFishingCeleLotteryMap.h
  81. 0 107
      GameConfig/Code/Client/M_ActivityFishingCeleLotteryTicketShop.cpp
  82. 0 31
      GameConfig/Code/Client/M_ActivityFishingCeleLotteryTicketShop.h
  83. 0 133
      GameConfig/Code/Client/M_ActivityFishingCeleRank.cpp
  84. 0 33
      GameConfig/Code/Client/M_ActivityFishingCeleRank.h
  85. 0 131
      GameConfig/Code/Client/M_ActivityFishingCeleStage.cpp
  86. 0 31
      GameConfig/Code/Client/M_ActivityFishingCeleStage.h
  87. 0 111
      GameConfig/Code/Client/M_ActivityFortuenShopCFG.cpp
  88. 0 35
      GameConfig/Code/Client/M_ActivityFortuenShopCFG.h
  89. 0 151
      GameConfig/Code/Client/M_ActivityFortuenTaskCFG.cpp
  90. 0 39
      GameConfig/Code/Client/M_ActivityFortuenTaskCFG.h
  91. 0 107
      GameConfig/Code/Client/M_ActivityGetRichCFG.cpp
  92. 0 31
      GameConfig/Code/Client/M_ActivityGetRichCFG.h
  93. 0 105
      GameConfig/Code/Client/M_ActivityGetRichDrawCFG.cpp
  94. 0 29
      GameConfig/Code/Client/M_ActivityGetRichDrawCFG.h
  95. 0 119
      GameConfig/Code/Client/M_ActivityGrandPrixCFG.cpp
  96. 0 31
      GameConfig/Code/Client/M_ActivityGrandPrixCFG.h
  97. 0 121
      GameConfig/Code/Client/M_ActivityHappySummerBlindBoxCFG.cpp
  98. 0 45
      GameConfig/Code/Client/M_ActivityHappySummerBlindBoxCFG.h
  99. 0 107
      GameConfig/Code/Client/M_ActivityHappySummerLuckyTurnCFG.cpp
  100. 0 31
      GameConfig/Code/Client/M_ActivityHappySummerLuckyTurnCFG.h

+ 0 - 103
GameConfig/Code/Client/M_AbysmFishingKingCFG.cpp

@@ -1,103 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_AbysmFishingKingCFG.h"
-std::auto_ptr<M_AbysmFishingKingCFG> M_AbysmFishingKingCFG::msSingleton(nullptr);
-
-int M_AbysmFishingKingCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_AbysmFishingKingCFGData* M_AbysmFishingKingCFG::GetData(std::string Key)
-{
-	auto it = mMapData.find(Key);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<std::string, M_AbysmFishingKingCFGData>& M_AbysmFishingKingCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_AbysmFishingKingCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_AbysmFishingKingCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_AbysmFishingKingCFGData data;
-		data.mKey = element->Attribute("Key");
-		data.mValue = element->IntAttribute("Value");
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_AbysmFishingKingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AbysmFishingKingCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_AbysmFishingKingCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_AbysmFishingKingCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_AbysmFishingKingCFGData data;
-		LuaCfgHelper::readString(L, "Key", data.mKey);
-		LuaCfgHelper::readInt(L, "Value", data.mValue);
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_AbysmFishingKingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AbysmFishingKingCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_AbysmFishingKingCFG* M_AbysmFishingKingCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_AbysmFishingKingCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_AbysmFishingKingCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 27
GameConfig/Code/Client/M_AbysmFishingKingCFG.h

@@ -1,27 +0,0 @@
-#pragma once
-#include <map>
-struct M_AbysmFishingKingCFGData
-{
-	//Key
-	std::string mKey;
-	//ÊýÖµ
-	int mValue;
-};
-
-class M_AbysmFishingKingCFG
-{
-public:
-private:
-	static std::auto_ptr<M_AbysmFishingKingCFG> msSingleton;
-public:
-	int GetCount();
-	const M_AbysmFishingKingCFGData* GetData(std::string Key);
-	const std::map<std::string, M_AbysmFishingKingCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_AbysmFishingKingCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<std::string, M_AbysmFishingKingCFGData> mMapData;
-};

+ 0 - 105
GameConfig/Code/Client/M_AbysmFishingKingSignCFG.cpp

@@ -1,105 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_AbysmFishingKingSignCFG.h"
-std::auto_ptr<M_AbysmFishingKingSignCFG> M_AbysmFishingKingSignCFG::msSingleton(nullptr);
-
-int M_AbysmFishingKingSignCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_AbysmFishingKingSignCFGData* M_AbysmFishingKingSignCFG::GetData(int Day)
-{
-	auto it = mMapData.find(Day);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_AbysmFishingKingSignCFGData>& M_AbysmFishingKingSignCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_AbysmFishingKingSignCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_AbysmFishingKingSignCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_AbysmFishingKingSignCFGData data;
-		data.mDay = element->IntAttribute("Day");
-		data.mRewardItem = element->IntAttribute("RewardItem");
-		data.mRewardQuantity = element->IntAttribute("RewardQuantity");
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_AbysmFishingKingSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AbysmFishingKingSignCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_AbysmFishingKingSignCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_AbysmFishingKingSignCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_AbysmFishingKingSignCFGData data;
-		LuaCfgHelper::readInt(L, "Day", data.mDay);
-		LuaCfgHelper::readInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readInt(L, "RewardQuantity", data.mRewardQuantity);
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_AbysmFishingKingSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AbysmFishingKingSignCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_AbysmFishingKingSignCFG* M_AbysmFishingKingSignCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_AbysmFishingKingSignCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_AbysmFishingKingSignCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 29
GameConfig/Code/Client/M_AbysmFishingKingSignCFG.h

@@ -1,29 +0,0 @@
-#pragma once
-#include <map>
-struct M_AbysmFishingKingSignCFGData
-{
-	//ÌìÊý
-	int mDay;
-	//½±ÀøÎïÆ·
-	int mRewardItem;
-	//½±ÀøÊýÁ¿
-	int mRewardQuantity;
-};
-
-class M_AbysmFishingKingSignCFG
-{
-public:
-private:
-	static std::auto_ptr<M_AbysmFishingKingSignCFG> msSingleton;
-public:
-	int GetCount();
-	const M_AbysmFishingKingSignCFGData* GetData(int Day);
-	const std::map<int, M_AbysmFishingKingSignCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_AbysmFishingKingSignCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_AbysmFishingKingSignCFGData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_AccCheckCFG.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_AccCheckCFG.h"
-std::auto_ptr<M_AccCheckCFG> M_AccCheckCFG::msSingleton(nullptr);
-
-int M_AccCheckCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_AccCheckCFGData* M_AccCheckCFG::GetData(std::string ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<std::string, M_AccCheckCFGData>& M_AccCheckCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_AccCheckCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_AccCheckCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_AccCheckCFGData data;
-		data.mID = element->Attribute("ID");
-		data.mAccTableName = element->Attribute("AccTableName");
-		data.mAccKey = element->Attribute("AccKey");
-		data.mPayTableName = element->Attribute("PayTableName");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_AccCheckCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AccCheckCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_AccCheckCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_AccCheckCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_AccCheckCFGData data;
-		LuaCfgHelper::readString(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "AccTableName", data.mAccTableName);
-		LuaCfgHelper::readString(L, "AccKey", data.mAccKey);
-		LuaCfgHelper::readString(L, "PayTableName", data.mPayTableName);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_AccCheckCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_AccCheckCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_AccCheckCFG* M_AccCheckCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_AccCheckCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_AccCheckCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_AccCheckCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_AccCheckCFGData
-{
-	//ID
-	std::string mID;
-	//Õ˺űí
-	std::string mAccTableName;
-	//Õ˺Åkey
-	std::string mAccKey;
-	//³äÖµ±í
-	std::string mPayTableName;
-};
-
-class M_AccCheckCFG
-{
-public:
-private:
-	static std::auto_ptr<M_AccCheckCFG> msSingleton;
-public:
-	int GetCount();
-	const M_AccCheckCFGData* GetData(std::string ID);
-	const std::map<std::string, M_AccCheckCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_AccCheckCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<std::string, M_AccCheckCFGData> mMapData;
-};

+ 0 - 133
GameConfig/Code/Client/M_ActivExchange.cpp

@@ -1,133 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivExchange.h"
-std::auto_ptr<M_ActivExchange> M_ActivExchange::msSingleton(nullptr);
-
-int M_ActivExchange::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivExchangeData* M_ActivExchange::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivExchangeData>& M_ActivExchange::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivExchange::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivExchange.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivExchangeData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* ExchangeItems = element->Attribute("ExchangeItems");
-			std::vector<std::string> vecExchangeItems;
-			boost::split(vecExchangeItems, ExchangeItems, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecExchangeItems.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecExchangeItems[i].c_str(), &temp))
-				{
-					data.mExchangeItems.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* QuantityRequired = element->Attribute("QuantityRequired");
-			std::vector<std::string> vecQuantityRequired;
-			boost::split(vecQuantityRequired, QuantityRequired, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecQuantityRequired.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecQuantityRequired[i].c_str(), &temp))
-				{
-					data.mQuantityRequired.push_back(temp);
-				}
-			}
-		}
-		data.mGetItems = element->IntAttribute("GetItems");
-		data.mGetQuantity = element->IntAttribute("GetQuantity");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivExchange Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivExchange::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivExchange");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivExchange");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivExchangeData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "ExchangeItems", data.mExchangeItems);
-		LuaCfgHelper::readVectorInt(L, "QuantityRequired", data.mQuantityRequired);
-		LuaCfgHelper::readInt(L, "GetItems", data.mGetItems);
-		LuaCfgHelper::readInt(L, "GetQuantity", data.mGetQuantity);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivExchange Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivExchange::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivExchange* M_ActivExchange::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivExchange());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivExchange::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivExchange.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivExchangeData
-{
-	//ID
-	int mID;
-	//兑换所需物品
-	std::vector<int> mExchangeItems;
-	//所需物品数量
-	std::vector<int> mQuantityRequired;
-	//兑换获得物品
-	int mGetItems;
-	//获得物品数量
-	int mGetQuantity;
-};
-
-class M_ActivExchange
-{
-public:
-private:
-	static std::auto_ptr<M_ActivExchange> msSingleton;
-public:
-	int GetCount();
-	const M_ActivExchangeData* GetData(int ID);
-	const std::map<int, M_ActivExchangeData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivExchange* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivExchangeData> mMapData;
-};

+ 0 - 131
GameConfig/Code/Client/M_ActiveLogin.cpp

@@ -1,131 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActiveLogin.h"
-std::auto_ptr<M_ActiveLogin> M_ActiveLogin::msSingleton(nullptr);
-
-int M_ActiveLogin::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActiveLoginData* M_ActiveLogin::GetData(int Day)
-{
-	auto it = mMapData.find(Day);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActiveLoginData>& M_ActiveLogin::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActiveLogin::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActiveLogin.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActiveLoginData data;
-		data.mDay = element->IntAttribute("Day");
-		data.mType = element->IntAttribute("Type");
-		{
-			const char* ItemId = element->Attribute("ItemId");
-			std::vector<std::string> vecItemId;
-			boost::split(vecItemId, ItemId, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemId.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemId[i].c_str(), &temp))
-				{
-					data.mItemId.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemNumber = element->Attribute("ItemNumber");
-			std::vector<std::string> vecItemNumber;
-			boost::split(vecItemNumber, ItemNumber, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemNumber.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemNumber[i].c_str(), &temp))
-				{
-					data.mItemNumber.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActiveLogin Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveLogin::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActiveLogin");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActiveLogin");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActiveLoginData data;
-		LuaCfgHelper::readInt(L, "Day", data.mDay);
-		LuaCfgHelper::readInt(L, "Type", data.mType);
-		LuaCfgHelper::readVectorInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readVectorInt(L, "ItemNumber", data.mItemNumber);
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActiveLogin Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveLogin::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActiveLogin* M_ActiveLogin::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActiveLogin());
-	}
-	return msSingleton.get();
-}
-
-void M_ActiveLogin::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActiveLogin.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActiveLoginData
-{
-	//天数
-	int mDay;
-	//类型
-	int mType;
-	//奖励物品ID
-	std::vector<int> mItemId;
-	//奖励物品数量
-	std::vector<int> mItemNumber;
-};
-
-class M_ActiveLogin
-{
-public:
-private:
-	static std::auto_ptr<M_ActiveLogin> msSingleton;
-public:
-	int GetCount();
-	const M_ActiveLoginData* GetData(int Day);
-	const std::map<int, M_ActiveLoginData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActiveLogin* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActiveLoginData> mMapData;
-};

+ 0 - 111
GameConfig/Code/Client/M_ActiveReward.cpp

@@ -1,111 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActiveReward.h"
-std::auto_ptr<M_ActiveReward> M_ActiveReward::msSingleton(nullptr);
-
-int M_ActiveReward::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActiveRewardData* M_ActiveReward::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActiveRewardData>& M_ActiveReward::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActiveReward::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActiveReward.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActiveRewardData data;
-		data.mID = element->IntAttribute("ID");
-		data.mNeedActive = element->IntAttribute("NeedActive");
-		data.mName = element->Attribute("Name");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mCount = element->IntAttribute("Count");
-		data.mIcon = element->Attribute("Icon");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActiveReward Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveReward::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActiveReward");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActiveReward");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActiveRewardData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "NeedActive", data.mNeedActive);
-		LuaCfgHelper::readString(L, "Name", data.mName);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readInt(L, "Count", data.mCount);
-		LuaCfgHelper::readString(L, "Icon", data.mIcon);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActiveReward Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveReward::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActiveReward* M_ActiveReward::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActiveReward());
-	}
-	return msSingleton.get();
-}
-
-void M_ActiveReward::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActiveReward.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActiveRewardData
-{
-	//编号
-	int mID;
-	//达成所需活跃度
-	int mNeedActive;
-	//没用
-	std::string mName;
-	//奖励物品ID
-	int mItemId;
-	//奖励物品数量
-	int mCount;
-	//图标
-	std::string mIcon;
-};
-
-class M_ActiveReward
-{
-public:
-private:
-	static std::auto_ptr<M_ActiveReward> msSingleton;
-public:
-	int GetCount();
-	const M_ActiveRewardData* GetData(int ID);
-	const std::map<int, M_ActiveRewardData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActiveReward* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActiveRewardData> mMapData;
-};

+ 0 - 105
GameConfig/Code/Client/M_ActiveTurntable.cpp

@@ -1,105 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActiveTurntable.h"
-std::auto_ptr<M_ActiveTurntable> M_ActiveTurntable::msSingleton(nullptr);
-
-int M_ActiveTurntable::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActiveTurntableData* M_ActiveTurntable::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActiveTurntableData>& M_ActiveTurntable::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActiveTurntable::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActiveTurntable.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActiveTurntableData data;
-		data.mID = element->IntAttribute("ID");
-		data.mShowAwardItemIDs = element->Attribute("ShowAwardItemIDs");
-		data.mGiftPackageID = element->IntAttribute("GiftPackageID");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActiveTurntable Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveTurntable::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActiveTurntable");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActiveTurntable");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActiveTurntableData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "ShowAwardItemIDs", data.mShowAwardItemIDs);
-		LuaCfgHelper::readInt(L, "GiftPackageID", data.mGiftPackageID);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActiveTurntable Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActiveTurntable::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActiveTurntable* M_ActiveTurntable::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActiveTurntable());
-	}
-	return msSingleton.get();
-}
-
-void M_ActiveTurntable::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 29
GameConfig/Code/Client/M_ActiveTurntable.h

@@ -1,29 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActiveTurntableData
-{
-	//ID
-	int mID;
-	//转盘中用于客户端显示奖励道具
-	std::string mShowAwardItemIDs;
-	//礼包ID
-	int mGiftPackageID;
-};
-
-class M_ActiveTurntable
-{
-public:
-private:
-	static std::auto_ptr<M_ActiveTurntable> msSingleton;
-public:
-	int GetCount();
-	const M_ActiveTurntableData* GetData(int ID);
-	const std::map<int, M_ActiveTurntableData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActiveTurntable* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActiveTurntableData> mMapData;
-};

+ 0 - 203
GameConfig/Code/Client/M_ActivityCFG.cpp

@@ -1,203 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityCFG.h"
-std::auto_ptr<M_ActivityCFG> M_ActivityCFG::msSingleton(nullptr);
-
-int M_ActivityCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityCFGData* M_ActivityCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityCFGData>& M_ActivityCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mActivityName = element->Attribute("ActivityName");
-		data.mOpenType = element->IntAttribute("OpenType");
-		data.mStartTime = element->Attribute("StartTime");
-		data.mEndTime = element->Attribute("EndTime");
-		{
-			const char* OpenDay = element->Attribute("OpenDay");
-			std::vector<std::string> vecOpenDay;
-			boost::split(vecOpenDay, OpenDay, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecOpenDay.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecOpenDay[i].c_str(), &temp))
-				{
-					data.mOpenDay.push_back(temp);
-				}
-			}
-		}
-		data.mActivityCenter = element->IntAttribute("ActivityCenter");
-		data.mbit = element->IntAttribute("bit");
-		data.mActivitySort = element->IntAttribute("ActivitySort");
-		{
-			const char* OpenWday = element->Attribute("OpenWday");
-			std::vector<std::string> vecOpenWday;
-			boost::split(vecOpenWday, OpenWday, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecOpenWday.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecOpenWday[i].c_str(), &temp))
-				{
-					data.mOpenWday.push_back(temp);
-				}
-			}
-		}
-		data.mRecvEndTime = element->Attribute("RecvEndTime");
-		data.mActivityIcon = element->Attribute("ActivityIcon");
-		data.mCornerMarker = element->IntAttribute("CornerMarker");
-		{
-			const char* ActivityTips = element->Attribute("ActivityTips");
-			std::vector<std::string> vecActivityTips;
-			boost::split(vecActivityTips, ActivityTips, boost::is_any_of(","));
-			for (unsigned int i = 0; i < vecActivityTips.size(); i++)
-			{
-				data.mActivityTips.push_back(vecActivityTips[i]);
-			}
-		}
-		data.mActivityType = element->IntAttribute("ActivityType");
-		data.mRechargeRMB = element->IntAttribute("RechargeRMB");
-		data.mVipLevel = element->IntAttribute("VipLevel");
-		data.mLoginDay = element->Attribute("LoginDay");
-		data.mPayId = element->IntAttribute("PayId");
-		{
-			const char* RewardList = element->Attribute("RewardList");
-			std::vector<std::string> vecRewardList;
-			boost::split(vecRewardList, RewardList, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardList.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardList[i].c_str(), &temp))
-				{
-					data.mRewardList.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardCount = element->Attribute("RewardCount");
-			std::vector<std::string> vecRewardCount;
-			boost::split(vecRewardCount, RewardCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardCount[i].c_str(), &temp))
-				{
-					data.mRewardCount.push_back(temp);
-				}
-			}
-		}
-		data.mActivityRewardMailTitle = element->Attribute("ActivityRewardMailTitle");
-		data.mActivityRewardMailContent = element->Attribute("ActivityRewardMailContent");
-		data.mReceiveWay = element->IntAttribute("ReceiveWay");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "ActivityName", data.mActivityName);
-		LuaCfgHelper::readInt(L, "OpenType", data.mOpenType);
-		LuaCfgHelper::readString(L, "StartTime", data.mStartTime);
-		LuaCfgHelper::readString(L, "EndTime", data.mEndTime);
-		LuaCfgHelper::readVectorInt(L, "OpenDay", data.mOpenDay);
-		LuaCfgHelper::readInt(L, "ActivityCenter", data.mActivityCenter);
-		LuaCfgHelper::readInt(L, "bit", data.mbit);
-		LuaCfgHelper::readInt(L, "ActivitySort", data.mActivitySort);
-		LuaCfgHelper::readVectorInt(L, "OpenWday", data.mOpenWday);
-		LuaCfgHelper::readString(L, "RecvEndTime", data.mRecvEndTime);
-		LuaCfgHelper::readString(L, "ActivityIcon", data.mActivityIcon);
-		LuaCfgHelper::readInt(L, "CornerMarker", data.mCornerMarker);
-		LuaCfgHelper::readVectorString(L, "ActivityTips", data.mActivityTips);
-		LuaCfgHelper::readInt(L, "ActivityType", data.mActivityType);
-		LuaCfgHelper::readInt(L, "RechargeRMB", data.mRechargeRMB);
-		LuaCfgHelper::readInt(L, "VipLevel", data.mVipLevel);
-		LuaCfgHelper::readString(L, "LoginDay", data.mLoginDay);
-		LuaCfgHelper::readInt(L, "PayId", data.mPayId);
-		LuaCfgHelper::readVectorInt(L, "RewardList", data.mRewardList);
-		LuaCfgHelper::readVectorInt(L, "RewardCount", data.mRewardCount);
-		LuaCfgHelper::readString(L, "ActivityRewardMailTitle", data.mActivityRewardMailTitle);
-		LuaCfgHelper::readString(L, "ActivityRewardMailContent", data.mActivityRewardMailContent);
-		LuaCfgHelper::readInt(L, "ReceiveWay", data.mReceiveWay);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityCFG* M_ActivityCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 71
GameConfig/Code/Client/M_ActivityCFG.h

@@ -1,71 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityCFGData
-{
-	//Key
-	int mID;
-	//活动名称
-	std::string mActivityName;
-	//开放类型 
-	int mOpenType;
-	//开始时间
-	std::string mStartTime;
-	//结束时间 
-	std::string mEndTime;
-	//每周开放时间
-	std::vector<int> mOpenDay;
-	//是否活动中心
-	int mActivityCenter;
-	//对应bit值
-	int mbit;
-	//显示排序
-	int mActivitySort;
-	//客户端专用开启日期
-	std::vector<int> mOpenWday;
-	//领取奖励结束时间 
-	std::string mRecvEndTime;
-	//页签icon
-	std::string mActivityIcon;
-	//活动角标
-	int mCornerMarker;
-	//活动提示
-	std::vector<std::string> mActivityTips;
-	//活动类型
-	int mActivityType;
-	//充值
-	int mRechargeRMB;
-	//VIP等级条件
-	int mVipLevel;
-	//登陆日期
-	std::string mLoginDay;
-	//支付ID,与M_RechangeCFG表对应
-	int mPayId;
-	//奖励列表
-	std::vector<int> mRewardList;
-	//奖励个数
-	std::vector<int> mRewardCount;
-	//奖励邮件标题
-	std::string mActivityRewardMailTitle;
-	//奖励邮件内容
-	std::string mActivityRewardMailContent;
-	//奖励领取方式, 0:通过邮件 1:手动点击按钮领取,2立即领取
-	int mReceiveWay;
-};
-
-class M_ActivityCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityCFGData* GetData(int ID);
-	const std::map<int, M_ActivityCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityCFGData> mMapData;
-};

+ 0 - 109
GameConfig/Code/Client/M_ActivityCannonDrawCFG.cpp

@@ -1,109 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityCannonDrawCFG.h"
-std::auto_ptr<M_ActivityCannonDrawCFG> M_ActivityCannonDrawCFG::msSingleton(nullptr);
-
-int M_ActivityCannonDrawCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityCannonDrawCFGData* M_ActivityCannonDrawCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityCannonDrawCFGData>& M_ActivityCannonDrawCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityCannonDrawCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityCannonDrawCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityCannonDrawCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mRewardItem = element->IntAttribute("RewardItem");
-		data.mRewardCount = element->IntAttribute("RewardCount");
-		data.mSign = element->IntAttribute("Sign");
-		data.mWeight = element->IntAttribute("Weight");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityCannonDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCannonDrawCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityCannonDrawCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityCannonDrawCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityCannonDrawCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readInt(L, "RewardCount", data.mRewardCount);
-		LuaCfgHelper::readInt(L, "Sign", data.mSign);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityCannonDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCannonDrawCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityCannonDrawCFG* M_ActivityCannonDrawCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityCannonDrawCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityCannonDrawCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityCannonDrawCFG.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityCannonDrawCFGData
-{
-	//编号
-	int mID;
-	//奖励道具
-	int mRewardItem;
-	//奖励数量
-	int mRewardCount;
-	//大奖标记
-	int mSign;
-	//权重
-	int mWeight;
-};
-
-class M_ActivityCannonDrawCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityCannonDrawCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityCannonDrawCFGData* GetData(int ID);
-	const std::map<int, M_ActivityCannonDrawCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityCannonDrawCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityCannonDrawCFGData> mMapData;
-};

+ 0 - 159
GameConfig/Code/Client/M_ActivityCarnivalFullCFG.cpp

@@ -1,159 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityCarnivalFullCFG.h"
-std::auto_ptr<M_ActivityCarnivalFullCFG> M_ActivityCarnivalFullCFG::msSingleton(nullptr);
-
-int M_ActivityCarnivalFullCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityCarnivalFullCFGData* M_ActivityCarnivalFullCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityCarnivalFullCFGData>& M_ActivityCarnivalFullCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityCarnivalFullCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityCarnivalFullCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityCarnivalFullCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mDsc = element->Attribute("Dsc");
-		data.mNeedRecharged = element->IntAttribute("NeedRecharged");
-		data.mBigRedId = element->IntAttribute("BigRedId");
-		{
-			const char* BigRedIntegral = element->Attribute("BigRedIntegral");
-			std::vector<std::string> vecBigRedIntegral;
-			boost::split(vecBigRedIntegral, BigRedIntegral, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecBigRedIntegral.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecBigRedIntegral[i].c_str(), &temp))
-				{
-					data.mBigRedIntegral.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* BigRedDisplay = element->Attribute("BigRedDisplay");
-			std::vector<std::string> vecBigRedDisplay;
-			boost::split(vecBigRedDisplay, BigRedDisplay, boost::is_any_of(","));
-			for (unsigned int i = 0; i < vecBigRedDisplay.size(); i++)
-			{
-				data.mBigRedDisplay.push_back(vecBigRedDisplay[i]);
-			}
-		}
-		{
-			const char* AwardItemIDs = element->Attribute("AwardItemIDs");
-			std::vector<std::string> vecAwardItemIDs;
-			boost::split(vecAwardItemIDs, AwardItemIDs, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecAwardItemIDs.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecAwardItemIDs[i].c_str(), &temp))
-				{
-					data.mAwardItemIDs.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* AwardItemCounts = element->Attribute("AwardItemCounts");
-			std::vector<std::string> vecAwardItemCounts;
-			boost::split(vecAwardItemCounts, AwardItemCounts, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecAwardItemCounts.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecAwardItemCounts[i].c_str(), &temp))
-				{
-					data.mAwardItemCounts.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityCarnivalFullCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCarnivalFullCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityCarnivalFullCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityCarnivalFullCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityCarnivalFullCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "Dsc", data.mDsc);
-		LuaCfgHelper::readInt(L, "NeedRecharged", data.mNeedRecharged);
-		LuaCfgHelper::readInt(L, "BigRedId", data.mBigRedId);
-		LuaCfgHelper::readVectorInt(L, "BigRedIntegral", data.mBigRedIntegral);
-		LuaCfgHelper::readVectorString(L, "BigRedDisplay", data.mBigRedDisplay);
-		LuaCfgHelper::readVectorInt(L, "AwardItemIDs", data.mAwardItemIDs);
-		LuaCfgHelper::readVectorInt(L, "AwardItemCounts", data.mAwardItemCounts);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityCarnivalFullCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCarnivalFullCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityCarnivalFullCFG* M_ActivityCarnivalFullCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityCarnivalFullCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityCarnivalFullCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityCarnivalFullCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityCarnivalFullCFGData
-{
-	//编号
-	int mID;
-	//描述
-	std::string mDsc;
-	//完成计数
-	int mNeedRecharged;
-	//积分ID
-	int mBigRedId;
-	//单个大红包积分
-	std::vector<int> mBigRedIntegral;
-	//红包前端显示数值
-	std::vector<std::string> mBigRedDisplay;
-	//奖励物品ID
-	std::vector<int> mAwardItemIDs;
-	//奖励物品数量
-	std::vector<int> mAwardItemCounts;
-};
-
-class M_ActivityCarnivalFullCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityCarnivalFullCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityCarnivalFullCFGData* GetData(int ID);
-	const std::map<int, M_ActivityCarnivalFullCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityCarnivalFullCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityCarnivalFullCFGData> mMapData;
-};

+ 0 - 133
GameConfig/Code/Client/M_ActivityCarnivalRankingCFG.cpp

@@ -1,133 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityCarnivalRankingCFG.h"
-std::auto_ptr<M_ActivityCarnivalRankingCFG> M_ActivityCarnivalRankingCFG::msSingleton(nullptr);
-
-int M_ActivityCarnivalRankingCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityCarnivalRankingCFGData* M_ActivityCarnivalRankingCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityCarnivalRankingCFGData>& M_ActivityCarnivalRankingCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityCarnivalRankingCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityCarnivalRankingCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityCarnivalRankingCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mStartRank = element->IntAttribute("StartRank");
-		data.mEndRank = element->IntAttribute("EndRank");
-		{
-			const char* RewardItme = element->Attribute("RewardItme");
-			std::vector<std::string> vecRewardItme;
-			boost::split(vecRewardItme, RewardItme, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardItme.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardItme[i].c_str(), &temp))
-				{
-					data.mRewardItme.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardCount = element->Attribute("RewardCount");
-			std::vector<std::string> vecRewardCount;
-			boost::split(vecRewardCount, RewardCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardCount[i].c_str(), &temp))
-				{
-					data.mRewardCount.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityCarnivalRankingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCarnivalRankingCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityCarnivalRankingCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityCarnivalRankingCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityCarnivalRankingCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "StartRank", data.mStartRank);
-		LuaCfgHelper::readInt(L, "EndRank", data.mEndRank);
-		LuaCfgHelper::readVectorInt(L, "RewardItme", data.mRewardItme);
-		LuaCfgHelper::readVectorInt(L, "RewardCount", data.mRewardCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityCarnivalRankingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityCarnivalRankingCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityCarnivalRankingCFG* M_ActivityCarnivalRankingCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityCarnivalRankingCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityCarnivalRankingCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityCarnivalRankingCFG.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityCarnivalRankingCFGData
-{
-	//编号
-	int mID;
-	//开始排名
-	int mStartRank;
-	//结束排名
-	int mEndRank;
-	//奖励道具
-	std::vector<int> mRewardItme;
-	//奖励数量
-	std::vector<int> mRewardCount;
-};
-
-class M_ActivityCarnivalRankingCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityCarnivalRankingCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityCarnivalRankingCFGData* GetData(int ID);
-	const std::map<int, M_ActivityCarnivalRankingCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityCarnivalRankingCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityCarnivalRankingCFGData> mMapData;
-};

+ 0 - 105
GameConfig/Code/Client/M_ActivityChipBoxCFG.cpp

@@ -1,105 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityChipBoxCFG.h"
-std::auto_ptr<M_ActivityChipBoxCFG> M_ActivityChipBoxCFG::msSingleton(nullptr);
-
-int M_ActivityChipBoxCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityChipBoxCFGData* M_ActivityChipBoxCFG::GetData(std::string Key)
-{
-	auto it = mMapData.find(Key);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<std::string, M_ActivityChipBoxCFGData>& M_ActivityChipBoxCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityChipBoxCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityChipBoxCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityChipBoxCFGData data;
-		data.mKey = element->Attribute("Key");
-		data.mValue = element->IntAttribute("Value");
-		data.mStringValue = element->Attribute("StringValue");
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityChipBoxCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityChipBoxCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityChipBoxCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityChipBoxCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityChipBoxCFGData data;
-		LuaCfgHelper::readString(L, "Key", data.mKey);
-		LuaCfgHelper::readInt(L, "Value", data.mValue);
-		LuaCfgHelper::readString(L, "StringValue", data.mStringValue);
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityChipBoxCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityChipBoxCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityChipBoxCFG* M_ActivityChipBoxCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityChipBoxCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityChipBoxCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 29
GameConfig/Code/Client/M_ActivityChipBoxCFG.h

@@ -1,29 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityChipBoxCFGData
-{
-	//Key
-	std::string mKey;
-	//ÊýÖµ
-	int mValue;
-	//×Ö·û´®
-	std::string mStringValue;
-};
-
-class M_ActivityChipBoxCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityChipBoxCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityChipBoxCFGData* GetData(std::string Key);
-	const std::map<std::string, M_ActivityChipBoxCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityChipBoxCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<std::string, M_ActivityChipBoxCFGData> mMapData;
-};

+ 0 - 109
GameConfig/Code/Client/M_ActivityChipBoxLottery.cpp

@@ -1,109 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityChipBoxLottery.h"
-std::auto_ptr<M_ActivityChipBoxLottery> M_ActivityChipBoxLottery::msSingleton(nullptr);
-
-int M_ActivityChipBoxLottery::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityChipBoxLotteryData* M_ActivityChipBoxLottery::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityChipBoxLotteryData>& M_ActivityChipBoxLottery::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityChipBoxLottery::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityChipBoxLottery.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityChipBoxLotteryData data;
-		data.mID = element->IntAttribute("ID");
-		data.mType = element->IntAttribute("Type");
-		data.mWeight = element->IntAttribute("Weight");
-		data.mDropItem = element->IntAttribute("DropItem");
-		data.mDropCount = element->IntAttribute("DropCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityChipBoxLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityChipBoxLottery::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityChipBoxLottery");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityChipBoxLottery");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityChipBoxLotteryData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Type", data.mType);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "DropItem", data.mDropItem);
-		LuaCfgHelper::readInt(L, "DropCount", data.mDropCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityChipBoxLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityChipBoxLottery::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityChipBoxLottery* M_ActivityChipBoxLottery::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityChipBoxLottery());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityChipBoxLottery::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityChipBoxLottery.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityChipBoxLotteryData
-{
-	//ID
-	int mID;
-	//괜芎잚謹
-	int mType;
-	//홈路
-	int mWeight;
-	//딜쭝돛야
-	int mDropItem;
-	//딜쭝鑒좆
-	int mDropCount;
-};
-
-class M_ActivityChipBoxLottery
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityChipBoxLottery> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityChipBoxLotteryData* GetData(int ID);
-	const std::map<int, M_ActivityChipBoxLotteryData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityChipBoxLottery* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityChipBoxLotteryData> mMapData;
-};

+ 0 - 131
GameConfig/Code/Client/M_ActivityDBFCollectingCFG.cpp

@@ -1,131 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDBFCollectingCFG.h"
-std::auto_ptr<M_ActivityDBFCollectingCFG> M_ActivityDBFCollectingCFG::msSingleton(nullptr);
-
-int M_ActivityDBFCollectingCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDBFCollectingCFGData* M_ActivityDBFCollectingCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDBFCollectingCFGData>& M_ActivityDBFCollectingCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDBFCollectingCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDBFCollectingCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDBFCollectingCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mCollectingType = element->IntAttribute("CollectingType");
-		{
-			const char* CollectingReward = element->Attribute("CollectingReward");
-			std::vector<std::string> vecCollectingReward;
-			boost::split(vecCollectingReward, CollectingReward, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecCollectingReward.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecCollectingReward[i].c_str(), &temp))
-				{
-					data.mCollectingReward.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* CollectingQuantity = element->Attribute("CollectingQuantity");
-			std::vector<std::string> vecCollectingQuantity;
-			boost::split(vecCollectingQuantity, CollectingQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecCollectingQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecCollectingQuantity[i].c_str(), &temp))
-				{
-					data.mCollectingQuantity.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDBFCollectingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFCollectingCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDBFCollectingCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDBFCollectingCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDBFCollectingCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "CollectingType", data.mCollectingType);
-		LuaCfgHelper::readVectorInt(L, "CollectingReward", data.mCollectingReward);
-		LuaCfgHelper::readVectorInt(L, "CollectingQuantity", data.mCollectingQuantity);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDBFCollectingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFCollectingCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDBFCollectingCFG* M_ActivityDBFCollectingCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDBFCollectingCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDBFCollectingCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityDBFCollectingCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDBFCollectingCFGData
-{
-	//任务ID
-	int mID;
-	//集齐类型
-	int mCollectingType;
-	//集齐奖励
-	std::vector<int> mCollectingReward;
-	//集齐奖励数量
-	std::vector<int> mCollectingQuantity;
-};
-
-class M_ActivityDBFCollectingCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDBFCollectingCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDBFCollectingCFGData* GetData(int ID);
-	const std::map<int, M_ActivityDBFCollectingCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDBFCollectingCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDBFCollectingCFGData> mMapData;
-};

+ 0 - 119
GameConfig/Code/Client/M_ActivityDBFHandbookCFG.cpp

@@ -1,119 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDBFHandbookCFG.h"
-std::auto_ptr<M_ActivityDBFHandbookCFG> M_ActivityDBFHandbookCFG::msSingleton(nullptr);
-
-int M_ActivityDBFHandbookCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDBFHandbookCFGData* M_ActivityDBFHandbookCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDBFHandbookCFGData>& M_ActivityDBFHandbookCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDBFHandbookCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDBFHandbookCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDBFHandbookCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mHandbookType = element->IntAttribute("HandbookType");
-		data.mHandbookName = element->Attribute("HandbookName");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mHandbookResource = element->Attribute("HandbookResource");
-		data.mHandbookReward = element->IntAttribute("HandbookReward");
-		data.mHandbookQuantity = element->IntAttribute("HandbookQuantity");
-		data.mRepeatReward = element->IntAttribute("RepeatReward");
-		data.mRepeatQuantity = element->IntAttribute("RepeatQuantity");
-		data.mLotteryWeight = element->IntAttribute("LotteryWeight");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDBFHandbookCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFHandbookCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDBFHandbookCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDBFHandbookCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDBFHandbookCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "HandbookType", data.mHandbookType);
-		LuaCfgHelper::readString(L, "HandbookName", data.mHandbookName);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readString(L, "HandbookResource", data.mHandbookResource);
-		LuaCfgHelper::readInt(L, "HandbookReward", data.mHandbookReward);
-		LuaCfgHelper::readInt(L, "HandbookQuantity", data.mHandbookQuantity);
-		LuaCfgHelper::readInt(L, "RepeatReward", data.mRepeatReward);
-		LuaCfgHelper::readInt(L, "RepeatQuantity", data.mRepeatQuantity);
-		LuaCfgHelper::readInt(L, "LotteryWeight", data.mLotteryWeight);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDBFHandbookCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFHandbookCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDBFHandbookCFG* M_ActivityDBFHandbookCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDBFHandbookCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDBFHandbookCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 43
GameConfig/Code/Client/M_ActivityDBFHandbookCFG.h

@@ -1,43 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDBFHandbookCFGData
-{
-	//编号
-	int mID;
-	//图鉴类型
-	int mHandbookType;
-	//图鉴名称
-	std::string mHandbookName;
-	//道具ID
-	int mItemId;
-	//图鉴资源
-	std::string mHandbookResource;
-	//图鉴奖励
-	int mHandbookReward;
-	//图鉴奖励数量
-	int mHandbookQuantity;
-	//重复图鉴奖励
-	int mRepeatReward;
-	//重复图鉴奖励数量
-	int mRepeatQuantity;
-	//抽奖权重
-	int mLotteryWeight;
-};
-
-class M_ActivityDBFHandbookCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDBFHandbookCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDBFHandbookCFGData* GetData(int ID);
-	const std::map<int, M_ActivityDBFHandbookCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDBFHandbookCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDBFHandbookCFGData> mMapData;
-};

+ 0 - 115
GameConfig/Code/Client/M_ActivityDBFLuckDrawCFG.cpp

@@ -1,115 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDBFLuckDrawCFG.h"
-std::auto_ptr<M_ActivityDBFLuckDrawCFG> M_ActivityDBFLuckDrawCFG::msSingleton(nullptr);
-
-int M_ActivityDBFLuckDrawCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDBFLuckDrawCFGData* M_ActivityDBFLuckDrawCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDBFLuckDrawCFGData>& M_ActivityDBFLuckDrawCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDBFLuckDrawCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDBFLuckDrawCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDBFLuckDrawCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mRaffleConsumption1 = element->IntAttribute("RaffleConsumption1");
-		data.mRaffleConsumption2 = element->IntAttribute("RaffleConsumption2");
-		data.mTriggerBottom = element->IntAttribute("TriggerBottom");
-		data.mBottomGuard1 = element->IntAttribute("BottomGuard1");
-		data.mBottomGuard2 = element->IntAttribute("BottomGuard2");
-		data.mBottomGuard3 = element->IntAttribute("BottomGuard3");
-		data.mConsumeID = element->IntAttribute("ConsumeID");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDBFLuckDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFLuckDrawCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDBFLuckDrawCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDBFLuckDrawCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDBFLuckDrawCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "RaffleConsumption1", data.mRaffleConsumption1);
-		LuaCfgHelper::readInt(L, "RaffleConsumption2", data.mRaffleConsumption2);
-		LuaCfgHelper::readInt(L, "TriggerBottom", data.mTriggerBottom);
-		LuaCfgHelper::readInt(L, "BottomGuard1", data.mBottomGuard1);
-		LuaCfgHelper::readInt(L, "BottomGuard2", data.mBottomGuard2);
-		LuaCfgHelper::readInt(L, "BottomGuard3", data.mBottomGuard3);
-		LuaCfgHelper::readInt(L, "ConsumeID", data.mConsumeID);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDBFLuckDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFLuckDrawCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDBFLuckDrawCFG* M_ActivityDBFLuckDrawCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDBFLuckDrawCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDBFLuckDrawCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityDBFLuckDrawCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDBFLuckDrawCFGData
-{
-	//编号
-	int mID;
-	//生肖抽奖消耗
-	int mRaffleConsumption1;
-	//幸运抽奖消耗
-	int mRaffleConsumption2;
-	//触发1档需要次数
-	int mTriggerBottom;
-	//保底1挡次数
-	int mBottomGuard1;
-	//保底2挡次数
-	int mBottomGuard2;
-	//保底3挡次数
-	int mBottomGuard3;
-	//消耗ID
-	int mConsumeID;
-};
-
-class M_ActivityDBFLuckDrawCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDBFLuckDrawCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDBFLuckDrawCFGData* GetData(int ID);
-	const std::map<int, M_ActivityDBFLuckDrawCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDBFLuckDrawCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDBFLuckDrawCFGData> mMapData;
-};

+ 0 - 139
GameConfig/Code/Client/M_ActivityDBFMissionCFG.cpp

@@ -1,139 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDBFMissionCFG.h"
-std::auto_ptr<M_ActivityDBFMissionCFG> M_ActivityDBFMissionCFG::msSingleton(nullptr);
-
-int M_ActivityDBFMissionCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDBFMissionCFGData* M_ActivityDBFMissionCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDBFMissionCFGData>& M_ActivityDBFMissionCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDBFMissionCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDBFMissionCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDBFMissionCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mName = element->Attribute("Name");
-		data.mCompleteType = element->IntAttribute("CompleteType");
-		data.mCompleteParam = element->IntAttribute("CompleteParam");
-		data.mCompleteCount = element->IntAttribute("CompleteCount");
-		{
-			const char* RewardItem = element->Attribute("RewardItem");
-			std::vector<std::string> vecRewardItem;
-			boost::split(vecRewardItem, RewardItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardItem[i].c_str(), &temp))
-				{
-					data.mRewardItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardQuantity = element->Attribute("RewardQuantity");
-			std::vector<std::string> vecRewardQuantity;
-			boost::split(vecRewardQuantity, RewardQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardQuantity[i].c_str(), &temp))
-				{
-					data.mRewardQuantity.push_back(temp);
-				}
-			}
-		}
-		data.mGoType = element->IntAttribute("GoType");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDBFMissionCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFMissionCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDBFMissionCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDBFMissionCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDBFMissionCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "Name", data.mName);
-		LuaCfgHelper::readInt(L, "CompleteType", data.mCompleteType);
-		LuaCfgHelper::readInt(L, "CompleteParam", data.mCompleteParam);
-		LuaCfgHelper::readInt(L, "CompleteCount", data.mCompleteCount);
-		LuaCfgHelper::readVectorInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readVectorInt(L, "RewardQuantity", data.mRewardQuantity);
-		LuaCfgHelper::readInt(L, "GoType", data.mGoType);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDBFMissionCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFMissionCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDBFMissionCFG* M_ActivityDBFMissionCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDBFMissionCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDBFMissionCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityDBFMissionCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDBFMissionCFGData
-{
-	//任务ID
-	int mID;
-	//名字
-	std::string mName;
-	//完成条件类型
-	int mCompleteType;
-	//特殊参数,填0不生效。对任务捕获指定鱼需要填写
-	int mCompleteParam;
-	//完成计数
-	int mCompleteCount;
-	//奖励物品
-	std::vector<int> mRewardItem;
-	//奖励数量
-	std::vector<int> mRewardQuantity;
-	//前往类型
-	int mGoType;
-};
-
-class M_ActivityDBFMissionCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDBFMissionCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDBFMissionCFGData* GetData(int ID);
-	const std::map<int, M_ActivityDBFMissionCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDBFMissionCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDBFMissionCFGData> mMapData;
-};

+ 0 - 157
GameConfig/Code/Client/M_ActivityDBFSignCFG.cpp

@@ -1,157 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDBFSignCFG.h"
-std::auto_ptr<M_ActivityDBFSignCFG> M_ActivityDBFSignCFG::msSingleton(nullptr);
-
-int M_ActivityDBFSignCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDBFSignCFGData* M_ActivityDBFSignCFG::GetData(int Day)
-{
-	auto it = mMapData.find(Day);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDBFSignCFGData>& M_ActivityDBFSignCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDBFSignCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDBFSignCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDBFSignCFGData data;
-		data.mDay = element->IntAttribute("Day");
-		{
-			const char* RewardItem = element->Attribute("RewardItem");
-			std::vector<std::string> vecRewardItem;
-			boost::split(vecRewardItem, RewardItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardItem[i].c_str(), &temp))
-				{
-					data.mRewardItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardQuantity = element->Attribute("RewardQuantity");
-			std::vector<std::string> vecRewardQuantity;
-			boost::split(vecRewardQuantity, RewardQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardQuantity[i].c_str(), &temp))
-				{
-					data.mRewardQuantity.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Display = element->Attribute("Display");
-			std::vector<std::string> vecDisplay;
-			boost::split(vecDisplay, Display, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecDisplay.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecDisplay[i].c_str(), &temp))
-				{
-					data.mDisplay.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* DisplayQuantity = element->Attribute("DisplayQuantity");
-			std::vector<std::string> vecDisplayQuantity;
-			boost::split(vecDisplayQuantity, DisplayQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecDisplayQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecDisplayQuantity[i].c_str(), &temp))
-				{
-					data.mDisplayQuantity.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDBFSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFSignCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDBFSignCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDBFSignCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDBFSignCFGData data;
-		LuaCfgHelper::readInt(L, "Day", data.mDay);
-		LuaCfgHelper::readVectorInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readVectorInt(L, "RewardQuantity", data.mRewardQuantity);
-		LuaCfgHelper::readVectorInt(L, "Display", data.mDisplay);
-		LuaCfgHelper::readVectorInt(L, "DisplayQuantity", data.mDisplayQuantity);
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDBFSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDBFSignCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDBFSignCFG* M_ActivityDBFSignCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDBFSignCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDBFSignCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityDBFSignCFG.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDBFSignCFGData
-{
-	//天数
-	int mDay;
-	//奖励物品
-	std::vector<int> mRewardItem;
-	//奖励数量
-	std::vector<int> mRewardQuantity;
-	//显示
-	std::vector<int> mDisplay;
-	//显示数量
-	std::vector<int> mDisplayQuantity;
-};
-
-class M_ActivityDBFSignCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDBFSignCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDBFSignCFGData* GetData(int Day);
-	const std::map<int, M_ActivityDBFSignCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDBFSignCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDBFSignCFGData> mMapData;
-};

+ 0 - 157
GameConfig/Code/Client/M_ActivityDayHuntCFG.cpp

@@ -1,157 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDayHuntCFG.h"
-std::auto_ptr<M_ActivityDayHuntCFG> M_ActivityDayHuntCFG::msSingleton(nullptr);
-
-int M_ActivityDayHuntCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDayHuntCFGData* M_ActivityDayHuntCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDayHuntCFGData>& M_ActivityDayHuntCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDayHuntCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDayHuntCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDayHuntCFGData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* Reward = element->Attribute("Reward");
-			std::vector<std::string> vecReward;
-			boost::split(vecReward, Reward, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecReward.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecReward[i].c_str(), &temp))
-				{
-					data.mReward.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ExpectHighest = element->Attribute("ExpectHighest");
-			std::vector<std::string> vecExpectHighest;
-			boost::split(vecExpectHighest, ExpectHighest, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecExpectHighest.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecExpectHighest[i].c_str(), &temp))
-				{
-					data.mExpectHighest.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* DisplayItem = element->Attribute("DisplayItem");
-			std::vector<std::string> vecDisplayItem;
-			boost::split(vecDisplayItem, DisplayItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecDisplayItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecDisplayItem[i].c_str(), &temp))
-				{
-					data.mDisplayItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* DisplayMumber = element->Attribute("DisplayMumber");
-			std::vector<std::string> vecDisplayMumber;
-			boost::split(vecDisplayMumber, DisplayMumber, boost::is_any_of(","));
-			for (unsigned int i = 0; i < vecDisplayMumber.size(); i++)
-			{
-				data.mDisplayMumber.push_back(vecDisplayMumber[i]);
-			}
-		}
-		data.mDisplayResetMumber = element->IntAttribute("DisplayResetMumber");
-		data.mbagId = element->IntAttribute("bagId");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDayHuntCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDayHuntCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDayHuntCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDayHuntCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDayHuntCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "Reward", data.mReward);
-		LuaCfgHelper::readVectorInt(L, "ExpectHighest", data.mExpectHighest);
-		LuaCfgHelper::readVectorInt(L, "DisplayItem", data.mDisplayItem);
-		LuaCfgHelper::readVectorString(L, "DisplayMumber", data.mDisplayMumber);
-		LuaCfgHelper::readInt(L, "DisplayResetMumber", data.mDisplayResetMumber);
-		LuaCfgHelper::readInt(L, "bagId", data.mbagId);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDayHuntCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDayHuntCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDayHuntCFG* M_ActivityDayHuntCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDayHuntCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDayHuntCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 37
GameConfig/Code/Client/M_ActivityDayHuntCFG.h

@@ -1,37 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDayHuntCFGData
-{
-	//编号
-	int mID;
-	//奖励
-	std::vector<int> mReward;
-	//期望最高
-	std::vector<int> mExpectHighest;
-	//前端显示道具
-	std::vector<int> mDisplayItem;
-	//前端显示数量
-	std::vector<std::string> mDisplayMumber;
-	//前端显示重置卡数量
-	int mDisplayResetMumber;
-	//礼包id
-	int mbagId;
-};
-
-class M_ActivityDayHuntCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDayHuntCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDayHuntCFGData* GetData(int ID);
-	const std::map<int, M_ActivityDayHuntCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDayHuntCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDayHuntCFGData> mMapData;
-};

+ 0 - 111
GameConfig/Code/Client/M_ActivityDoubleElevenDiamondGift.cpp

@@ -1,111 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenDiamondGift.h"
-std::auto_ptr<M_ActivityDoubleElevenDiamondGift> M_ActivityDoubleElevenDiamondGift::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenDiamondGift::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenDiamondGiftData* M_ActivityDoubleElevenDiamondGift::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenDiamondGiftData>& M_ActivityDoubleElevenDiamondGift::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenDiamondGift::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenDiamondGift.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenDiamondGiftData data;
-		data.mID = element->IntAttribute("ID");
-		data.mFlushTime = element->IntAttribute("FlushTime");
-		data.mGift1Count = element->IntAttribute("Gift1Count");
-		data.mGift2Count = element->IntAttribute("Gift2Count");
-		data.mGift3Count = element->IntAttribute("Gift3Count");
-		data.mGiftId = element->IntAttribute("GiftId");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenDiamondGift Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenDiamondGift::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenDiamondGift");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenDiamondGift");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenDiamondGiftData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "FlushTime", data.mFlushTime);
-		LuaCfgHelper::readInt(L, "Gift1Count", data.mGift1Count);
-		LuaCfgHelper::readInt(L, "Gift2Count", data.mGift2Count);
-		LuaCfgHelper::readInt(L, "Gift3Count", data.mGift3Count);
-		LuaCfgHelper::readInt(L, "GiftId", data.mGiftId);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenDiamondGift Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenDiamondGift::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenDiamondGift* M_ActivityDoubleElevenDiamondGift::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenDiamondGift());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenDiamondGift::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActivityDoubleElevenDiamondGift.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenDiamondGiftData
-{
-	//ID
-	int mID;
-	//刷新时间
-	int mFlushTime;
-	//礼包1刷新数量
-	int mGift1Count;
-	//礼包2刷新数量
-	int mGift2Count;
-	//礼包3刷新数量
-	int mGift3Count;
-	//礼包ID
-	int mGiftId;
-};
-
-class M_ActivityDoubleElevenDiamondGift
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenDiamondGift> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenDiamondGiftData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenDiamondGiftData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenDiamondGift* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenDiamondGiftData> mMapData;
-};

+ 0 - 113
GameConfig/Code/Client/M_ActivityDoubleElevenLottery.cpp

@@ -1,113 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenLottery.h"
-std::auto_ptr<M_ActivityDoubleElevenLottery> M_ActivityDoubleElevenLottery::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenLottery::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenLotteryData* M_ActivityDoubleElevenLottery::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenLotteryData>& M_ActivityDoubleElevenLottery::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenLottery::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenLottery.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenLotteryData data;
-		data.mID = element->IntAttribute("ID");
-		data.mWeight = element->IntAttribute("Weight");
-		data.mItemID = element->IntAttribute("ItemID");
-		data.mIcon = element->Attribute("Icon");
-		data.mItemCount = element->IntAttribute("ItemCount");
-		data.mPrixWeight = element->IntAttribute("PrixWeight");
-		data.mPrixIdentification = element->IntAttribute("PrixIdentification");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLottery::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenLottery");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenLottery");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenLotteryData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readString(L, "Icon", data.mIcon);
-		LuaCfgHelper::readInt(L, "ItemCount", data.mItemCount);
-		LuaCfgHelper::readInt(L, "PrixWeight", data.mPrixWeight);
-		LuaCfgHelper::readInt(L, "PrixIdentification", data.mPrixIdentification);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLottery::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenLottery* M_ActivityDoubleElevenLottery::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenLottery());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenLottery::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 37
GameConfig/Code/Client/M_ActivityDoubleElevenLottery.h

@@ -1,37 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenLotteryData
-{
-	//ID
-	int mID;
-	//权重
-	int mWeight;
-	//道具ID
-	int mItemID;
-	//ICON
-	std::string mIcon;
-	//道具数量
-	int mItemCount;
-	//实际大奖权重
-	int mPrixWeight;
-	//大奖标识
-	int mPrixIdentification;
-};
-
-class M_ActivityDoubleElevenLottery
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenLottery> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenLotteryData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenLotteryData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenLottery* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenLotteryData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityDoubleElevenLotteryEx.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenLotteryEx.h"
-std::auto_ptr<M_ActivityDoubleElevenLotteryEx> M_ActivityDoubleElevenLotteryEx::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenLotteryEx::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenLotteryExData* M_ActivityDoubleElevenLotteryEx::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenLotteryExData>& M_ActivityDoubleElevenLotteryEx::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenLotteryEx::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenLotteryEx.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenLotteryExData data;
-		data.mID = element->IntAttribute("ID");
-		data.mWeight = element->IntAttribute("Weight");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mItemCount = element->IntAttribute("ItemCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenLotteryEx Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLotteryEx::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenLotteryEx");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenLotteryEx");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenLotteryExData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readInt(L, "ItemCount", data.mItemCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenLotteryEx Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLotteryEx::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenLotteryEx* M_ActivityDoubleElevenLotteryEx::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenLotteryEx());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenLotteryEx::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityDoubleElevenLotteryEx.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenLotteryExData
-{
-	//ID
-	int mID;
-	//홈路
-	int mWeight;
-	//띨棍쉽쟨돛야ID
-	int mItemId;
-	//돛야鑒좆
-	int mItemCount;
-};
-
-class M_ActivityDoubleElevenLotteryEx
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenLotteryEx> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenLotteryExData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenLotteryExData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenLotteryEx* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenLotteryExData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityDoubleElevenLotteryTicketShop.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenLotteryTicketShop.h"
-std::auto_ptr<M_ActivityDoubleElevenLotteryTicketShop> M_ActivityDoubleElevenLotteryTicketShop::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenLotteryTicketShop::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenLotteryTicketShopData* M_ActivityDoubleElevenLotteryTicketShop::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenLotteryTicketShopData>& M_ActivityDoubleElevenLotteryTicketShop::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenLotteryTicketShop::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenLotteryTicketShop.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenLotteryTicketShopData data;
-		data.mID = element->IntAttribute("ID");
-		data.mLotteryCount = element->IntAttribute("LotteryCount");
-		data.mNeedCount = element->IntAttribute("NeedCount");
-		data.mTicketCount = element->IntAttribute("TicketCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenLotteryTicketShop Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLotteryTicketShop::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenLotteryTicketShop");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenLotteryTicketShop");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenLotteryTicketShopData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "LotteryCount", data.mLotteryCount);
-		LuaCfgHelper::readInt(L, "NeedCount", data.mNeedCount);
-		LuaCfgHelper::readInt(L, "TicketCount", data.mTicketCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenLotteryTicketShop Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenLotteryTicketShop::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenLotteryTicketShop* M_ActivityDoubleElevenLotteryTicketShop::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenLotteryTicketShop());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenLotteryTicketShop::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityDoubleElevenLotteryTicketShop.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenLotteryTicketShopData
-{
-	//ID
-	int mID;
-	//抽奖次数
-	int mLotteryCount;
-	//需要钻石
-	int mNeedCount;
-	//奖励抽奖券数量
-	int mTicketCount;
-};
-
-class M_ActivityDoubleElevenLotteryTicketShop
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenLotteryTicketShop> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenLotteryTicketShopData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenLotteryTicketShopData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenLotteryTicketShop* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenLotteryTicketShopData> mMapData;
-};

+ 0 - 113
GameConfig/Code/Client/M_ActivityDoubleElevenMission.cpp

@@ -1,113 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenMission.h"
-std::auto_ptr<M_ActivityDoubleElevenMission> M_ActivityDoubleElevenMission::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenMission::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenMissionData* M_ActivityDoubleElevenMission::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenMissionData>& M_ActivityDoubleElevenMission::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenMission::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenMission.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenMissionData data;
-		data.mID = element->IntAttribute("ID");
-		data.mDesc = element->Attribute("Desc");
-		data.mCompleteType = element->IntAttribute("CompleteType");
-		data.mCompleteParam = element->IntAttribute("CompleteParam");
-		data.mCompleteCount = element->IntAttribute("CompleteCount");
-		data.mItemID = element->IntAttribute("ItemID");
-		data.mItemCount = element->IntAttribute("ItemCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenMission Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenMission::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenMission");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenMission");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenMissionData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "Desc", data.mDesc);
-		LuaCfgHelper::readInt(L, "CompleteType", data.mCompleteType);
-		LuaCfgHelper::readInt(L, "CompleteParam", data.mCompleteParam);
-		LuaCfgHelper::readInt(L, "CompleteCount", data.mCompleteCount);
-		LuaCfgHelper::readInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readInt(L, "ItemCount", data.mItemCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenMission Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenMission::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenMission* M_ActivityDoubleElevenMission::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenMission());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenMission::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 37
GameConfig/Code/Client/M_ActivityDoubleElevenMission.h

@@ -1,37 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenMissionData
-{
-	//任务ID
-	int mID;
-	//任务描述
-	std::string mDesc;
-	//完成条件类型
-	int mCompleteType;
-	//特殊参数,填0不生效。对任务捕获指定鱼需要填写
-	int mCompleteParam;
-	//完成计数
-	int mCompleteCount;
-	//奖励物品
-	int mItemID;
-	//奖励数量
-	int mItemCount;
-};
-
-class M_ActivityDoubleElevenMission
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenMission> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenMissionData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenMissionData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenMission* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenMissionData> mMapData;
-};

+ 0 - 133
GameConfig/Code/Client/M_ActivityDoubleElevenRank.cpp

@@ -1,133 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenRank.h"
-std::auto_ptr<M_ActivityDoubleElevenRank> M_ActivityDoubleElevenRank::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenRank::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenRankData* M_ActivityDoubleElevenRank::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenRankData>& M_ActivityDoubleElevenRank::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenRank::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenRank.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenRankData data;
-		data.mID = element->IntAttribute("ID");
-		data.mStartRank = element->IntAttribute("StartRank");
-		data.mEndRank = element->IntAttribute("EndRank");
-		{
-			const char* ItemID = element->Attribute("ItemID");
-			std::vector<std::string> vecItemID;
-			boost::split(vecItemID, ItemID, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemID.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemID[i].c_str(), &temp))
-				{
-					data.mItemID.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemCount = element->Attribute("ItemCount");
-			std::vector<std::string> vecItemCount;
-			boost::split(vecItemCount, ItemCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemCount[i].c_str(), &temp))
-				{
-					data.mItemCount.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenRank Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenRank::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenRank");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenRank");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenRankData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "StartRank", data.mStartRank);
-		LuaCfgHelper::readInt(L, "EndRank", data.mEndRank);
-		LuaCfgHelper::readVectorInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readVectorInt(L, "ItemCount", data.mItemCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenRank Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenRank::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenRank* M_ActivityDoubleElevenRank::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenRank());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenRank::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityDoubleElevenRank.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenRankData
-{
-	//긍뵀
-	int mID;
-	//역迦탤츰
-	int mStartRank;
-	//써監탤츰
-	int mEndRank;
-	//쉽쟨돛야
-	std::vector<int> mItemID;
-	//쉽쟨鑒좆
-	std::vector<int> mItemCount;
-};
-
-class M_ActivityDoubleElevenRank
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenRank> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenRankData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenRankData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenRank* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenRankData> mMapData;
-};

+ 0 - 133
GameConfig/Code/Client/M_ActivityDoubleElevenRecharge.cpp

@@ -1,133 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDoubleElevenRecharge.h"
-std::auto_ptr<M_ActivityDoubleElevenRecharge> M_ActivityDoubleElevenRecharge::msSingleton(nullptr);
-
-int M_ActivityDoubleElevenRecharge::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDoubleElevenRechargeData* M_ActivityDoubleElevenRecharge::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDoubleElevenRechargeData>& M_ActivityDoubleElevenRecharge::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDoubleElevenRecharge::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDoubleElevenRecharge.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDoubleElevenRechargeData data;
-		data.mID = element->IntAttribute("ID");
-		data.mDesc = element->Attribute("Desc");
-		data.mCondition = element->IntAttribute("Condition");
-		{
-			const char* ItemID = element->Attribute("ItemID");
-			std::vector<std::string> vecItemID;
-			boost::split(vecItemID, ItemID, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemID.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemID[i].c_str(), &temp))
-				{
-					data.mItemID.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemCount = element->Attribute("ItemCount");
-			std::vector<std::string> vecItemCount;
-			boost::split(vecItemCount, ItemCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemCount[i].c_str(), &temp))
-				{
-					data.mItemCount.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDoubleElevenRecharge Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenRecharge::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDoubleElevenRecharge");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDoubleElevenRecharge");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDoubleElevenRechargeData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "Desc", data.mDesc);
-		LuaCfgHelper::readInt(L, "Condition", data.mCondition);
-		LuaCfgHelper::readVectorInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readVectorInt(L, "ItemCount", data.mItemCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDoubleElevenRecharge Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDoubleElevenRecharge::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDoubleElevenRecharge* M_ActivityDoubleElevenRecharge::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDoubleElevenRecharge());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDoubleElevenRecharge::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityDoubleElevenRecharge.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDoubleElevenRechargeData
-{
-	//ID
-	int mID;
-	//췄甘
-	std::string mDesc;
-	//념令쏜띨
-	int mCondition;
-	//돛야ID
-	std::vector<int> mItemID;
-	//돛야鑒좆
-	std::vector<int> mItemCount;
-};
-
-class M_ActivityDoubleElevenRecharge
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDoubleElevenRecharge> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDoubleElevenRechargeData* GetData(int ID);
-	const std::map<int, M_ActivityDoubleElevenRechargeData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDoubleElevenRecharge* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDoubleElevenRechargeData> mMapData;
-};

+ 0 - 111
GameConfig/Code/Client/M_ActivityDrawLottery.cpp

@@ -1,111 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityDrawLottery.h"
-std::auto_ptr<M_ActivityDrawLottery> M_ActivityDrawLottery::msSingleton(nullptr);
-
-int M_ActivityDrawLottery::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityDrawLotteryData* M_ActivityDrawLottery::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityDrawLotteryData>& M_ActivityDrawLottery::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityDrawLottery::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityDrawLottery.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityDrawLotteryData data;
-		data.mID = element->IntAttribute("ID");
-		data.mDrawType = element->IntAttribute("DrawType");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mNumber = element->IntAttribute("Number");
-		data.mWeight = element->IntAttribute("Weight");
-		data.mDisplayLabel = element->IntAttribute("DisplayLabel");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityDrawLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDrawLottery::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityDrawLottery");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityDrawLottery");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityDrawLotteryData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "DrawType", data.mDrawType);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readInt(L, "Number", data.mNumber);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "DisplayLabel", data.mDisplayLabel);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityDrawLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityDrawLottery::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityDrawLottery* M_ActivityDrawLottery::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityDrawLottery());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityDrawLottery::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActivityDrawLottery.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityDrawLotteryData
-{
-	//编号
-	int mID;
-	//抽奖类型
-	int mDrawType;
-	//奖励
-	int mItemId;
-	//数量
-	int mNumber;
-	//权重
-	int mWeight;
-	//显示标签
-	int mDisplayLabel;
-};
-
-class M_ActivityDrawLottery
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityDrawLottery> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityDrawLotteryData* GetData(int ID);
-	const std::map<int, M_ActivityDrawLotteryData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityDrawLottery* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityDrawLotteryData> mMapData;
-};

+ 0 - 131
GameConfig/Code/Client/M_ActivityElevenCollectingCFG.cpp

@@ -1,131 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityElevenCollectingCFG.h"
-std::auto_ptr<M_ActivityElevenCollectingCFG> M_ActivityElevenCollectingCFG::msSingleton(nullptr);
-
-int M_ActivityElevenCollectingCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityElevenCollectingCFGData* M_ActivityElevenCollectingCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityElevenCollectingCFGData>& M_ActivityElevenCollectingCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityElevenCollectingCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityElevenCollectingCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityElevenCollectingCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mCollectingType = element->IntAttribute("CollectingType");
-		{
-			const char* CollectingReward = element->Attribute("CollectingReward");
-			std::vector<std::string> vecCollectingReward;
-			boost::split(vecCollectingReward, CollectingReward, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecCollectingReward.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecCollectingReward[i].c_str(), &temp))
-				{
-					data.mCollectingReward.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* CollectingQuantity = element->Attribute("CollectingQuantity");
-			std::vector<std::string> vecCollectingQuantity;
-			boost::split(vecCollectingQuantity, CollectingQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecCollectingQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecCollectingQuantity[i].c_str(), &temp))
-				{
-					data.mCollectingQuantity.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityElevenCollectingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenCollectingCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityElevenCollectingCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityElevenCollectingCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityElevenCollectingCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "CollectingType", data.mCollectingType);
-		LuaCfgHelper::readVectorInt(L, "CollectingReward", data.mCollectingReward);
-		LuaCfgHelper::readVectorInt(L, "CollectingQuantity", data.mCollectingQuantity);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityElevenCollectingCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenCollectingCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityElevenCollectingCFG* M_ActivityElevenCollectingCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityElevenCollectingCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityElevenCollectingCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityElevenCollectingCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityElevenCollectingCFGData
-{
-	//任务ID
-	int mID;
-	//集齐类型
-	int mCollectingType;
-	//集齐奖励
-	std::vector<int> mCollectingReward;
-	//集齐奖励数量
-	std::vector<int> mCollectingQuantity;
-};
-
-class M_ActivityElevenCollectingCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityElevenCollectingCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityElevenCollectingCFGData* GetData(int ID);
-	const std::map<int, M_ActivityElevenCollectingCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityElevenCollectingCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityElevenCollectingCFGData> mMapData;
-};

+ 0 - 119
GameConfig/Code/Client/M_ActivityElevenHandbookCFG.cpp

@@ -1,119 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityElevenHandbookCFG.h"
-std::auto_ptr<M_ActivityElevenHandbookCFG> M_ActivityElevenHandbookCFG::msSingleton(nullptr);
-
-int M_ActivityElevenHandbookCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityElevenHandbookCFGData* M_ActivityElevenHandbookCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityElevenHandbookCFGData>& M_ActivityElevenHandbookCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityElevenHandbookCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityElevenHandbookCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityElevenHandbookCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mHandbookType = element->IntAttribute("HandbookType");
-		data.mHandbookName = element->Attribute("HandbookName");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mHandbookResource = element->Attribute("HandbookResource");
-		data.mHandbookReward = element->IntAttribute("HandbookReward");
-		data.mHandbookQuantity = element->IntAttribute("HandbookQuantity");
-		data.mRepeatReward = element->IntAttribute("RepeatReward");
-		data.mRepeatQuantity = element->IntAttribute("RepeatQuantity");
-		data.mLotteryWeight = element->IntAttribute("LotteryWeight");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityElevenHandbookCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenHandbookCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityElevenHandbookCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityElevenHandbookCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityElevenHandbookCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "HandbookType", data.mHandbookType);
-		LuaCfgHelper::readString(L, "HandbookName", data.mHandbookName);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readString(L, "HandbookResource", data.mHandbookResource);
-		LuaCfgHelper::readInt(L, "HandbookReward", data.mHandbookReward);
-		LuaCfgHelper::readInt(L, "HandbookQuantity", data.mHandbookQuantity);
-		LuaCfgHelper::readInt(L, "RepeatReward", data.mRepeatReward);
-		LuaCfgHelper::readInt(L, "RepeatQuantity", data.mRepeatQuantity);
-		LuaCfgHelper::readInt(L, "LotteryWeight", data.mLotteryWeight);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityElevenHandbookCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenHandbookCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityElevenHandbookCFG* M_ActivityElevenHandbookCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityElevenHandbookCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityElevenHandbookCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 43
GameConfig/Code/Client/M_ActivityElevenHandbookCFG.h

@@ -1,43 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityElevenHandbookCFGData
-{
-	//编号
-	int mID;
-	//图鉴类型
-	int mHandbookType;
-	//图鉴名称
-	std::string mHandbookName;
-	//道具ID
-	int mItemId;
-	//图鉴资源
-	std::string mHandbookResource;
-	//图鉴奖励
-	int mHandbookReward;
-	//图鉴奖励数量
-	int mHandbookQuantity;
-	//重复图鉴奖励
-	int mRepeatReward;
-	//重复图鉴奖励数量
-	int mRepeatQuantity;
-	//抽奖权重
-	int mLotteryWeight;
-};
-
-class M_ActivityElevenHandbookCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityElevenHandbookCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityElevenHandbookCFGData* GetData(int ID);
-	const std::map<int, M_ActivityElevenHandbookCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityElevenHandbookCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityElevenHandbookCFGData> mMapData;
-};

+ 0 - 115
GameConfig/Code/Client/M_ActivityElevenLuckDrawCFG.cpp

@@ -1,115 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityElevenLuckDrawCFG.h"
-std::auto_ptr<M_ActivityElevenLuckDrawCFG> M_ActivityElevenLuckDrawCFG::msSingleton(nullptr);
-
-int M_ActivityElevenLuckDrawCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityElevenLuckDrawCFGData* M_ActivityElevenLuckDrawCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityElevenLuckDrawCFGData>& M_ActivityElevenLuckDrawCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityElevenLuckDrawCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityElevenLuckDrawCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityElevenLuckDrawCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mRaffleConsumption1 = element->IntAttribute("RaffleConsumption1");
-		data.mRaffleConsumption2 = element->IntAttribute("RaffleConsumption2");
-		data.mTriggerBottom = element->IntAttribute("TriggerBottom");
-		data.mBottomGuard1 = element->IntAttribute("BottomGuard1");
-		data.mBottomGuard2 = element->IntAttribute("BottomGuard2");
-		data.mBottomGuard3 = element->IntAttribute("BottomGuard3");
-		data.mConsumeID = element->IntAttribute("ConsumeID");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityElevenLuckDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenLuckDrawCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityElevenLuckDrawCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityElevenLuckDrawCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityElevenLuckDrawCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "RaffleConsumption1", data.mRaffleConsumption1);
-		LuaCfgHelper::readInt(L, "RaffleConsumption2", data.mRaffleConsumption2);
-		LuaCfgHelper::readInt(L, "TriggerBottom", data.mTriggerBottom);
-		LuaCfgHelper::readInt(L, "BottomGuard1", data.mBottomGuard1);
-		LuaCfgHelper::readInt(L, "BottomGuard2", data.mBottomGuard2);
-		LuaCfgHelper::readInt(L, "BottomGuard3", data.mBottomGuard3);
-		LuaCfgHelper::readInt(L, "ConsumeID", data.mConsumeID);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityElevenLuckDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenLuckDrawCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityElevenLuckDrawCFG* M_ActivityElevenLuckDrawCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityElevenLuckDrawCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityElevenLuckDrawCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityElevenLuckDrawCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityElevenLuckDrawCFGData
-{
-	//编号
-	int mID;
-	//生肖抽奖消耗
-	int mRaffleConsumption1;
-	//幸运抽奖消耗
-	int mRaffleConsumption2;
-	//触发1档需要次数
-	int mTriggerBottom;
-	//保底1挡次数
-	int mBottomGuard1;
-	//保底2挡次数
-	int mBottomGuard2;
-	//保底3挡次数
-	int mBottomGuard3;
-	//消耗ID
-	int mConsumeID;
-};
-
-class M_ActivityElevenLuckDrawCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityElevenLuckDrawCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityElevenLuckDrawCFGData* GetData(int ID);
-	const std::map<int, M_ActivityElevenLuckDrawCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityElevenLuckDrawCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityElevenLuckDrawCFGData> mMapData;
-};

+ 0 - 139
GameConfig/Code/Client/M_ActivityElevenMissionCFG.cpp

@@ -1,139 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityElevenMissionCFG.h"
-std::auto_ptr<M_ActivityElevenMissionCFG> M_ActivityElevenMissionCFG::msSingleton(nullptr);
-
-int M_ActivityElevenMissionCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityElevenMissionCFGData* M_ActivityElevenMissionCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityElevenMissionCFGData>& M_ActivityElevenMissionCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityElevenMissionCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityElevenMissionCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityElevenMissionCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mName = element->Attribute("Name");
-		data.mCompleteType = element->IntAttribute("CompleteType");
-		data.mCompleteParam = element->IntAttribute("CompleteParam");
-		data.mCompleteCount = element->IntAttribute("CompleteCount");
-		{
-			const char* RewardItem = element->Attribute("RewardItem");
-			std::vector<std::string> vecRewardItem;
-			boost::split(vecRewardItem, RewardItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardItem[i].c_str(), &temp))
-				{
-					data.mRewardItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardQuantity = element->Attribute("RewardQuantity");
-			std::vector<std::string> vecRewardQuantity;
-			boost::split(vecRewardQuantity, RewardQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardQuantity[i].c_str(), &temp))
-				{
-					data.mRewardQuantity.push_back(temp);
-				}
-			}
-		}
-		data.mGoType = element->IntAttribute("GoType");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityElevenMissionCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenMissionCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityElevenMissionCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityElevenMissionCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityElevenMissionCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "Name", data.mName);
-		LuaCfgHelper::readInt(L, "CompleteType", data.mCompleteType);
-		LuaCfgHelper::readInt(L, "CompleteParam", data.mCompleteParam);
-		LuaCfgHelper::readInt(L, "CompleteCount", data.mCompleteCount);
-		LuaCfgHelper::readVectorInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readVectorInt(L, "RewardQuantity", data.mRewardQuantity);
-		LuaCfgHelper::readInt(L, "GoType", data.mGoType);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityElevenMissionCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenMissionCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityElevenMissionCFG* M_ActivityElevenMissionCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityElevenMissionCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityElevenMissionCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityElevenMissionCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityElevenMissionCFGData
-{
-	//任务ID
-	int mID;
-	//名字
-	std::string mName;
-	//完成条件类型
-	int mCompleteType;
-	//特殊参数,填0不生效。对任务捕获指定鱼需要填写
-	int mCompleteParam;
-	//完成计数
-	int mCompleteCount;
-	//奖励物品
-	std::vector<int> mRewardItem;
-	//奖励数量
-	std::vector<int> mRewardQuantity;
-	//前往类型
-	int mGoType;
-};
-
-class M_ActivityElevenMissionCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityElevenMissionCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityElevenMissionCFGData* GetData(int ID);
-	const std::map<int, M_ActivityElevenMissionCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityElevenMissionCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityElevenMissionCFGData> mMapData;
-};

+ 0 - 157
GameConfig/Code/Client/M_ActivityElevenSignCFG.cpp

@@ -1,157 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityElevenSignCFG.h"
-std::auto_ptr<M_ActivityElevenSignCFG> M_ActivityElevenSignCFG::msSingleton(nullptr);
-
-int M_ActivityElevenSignCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityElevenSignCFGData* M_ActivityElevenSignCFG::GetData(int Day)
-{
-	auto it = mMapData.find(Day);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityElevenSignCFGData>& M_ActivityElevenSignCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityElevenSignCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityElevenSignCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityElevenSignCFGData data;
-		data.mDay = element->IntAttribute("Day");
-		{
-			const char* RewardItem = element->Attribute("RewardItem");
-			std::vector<std::string> vecRewardItem;
-			boost::split(vecRewardItem, RewardItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardItem[i].c_str(), &temp))
-				{
-					data.mRewardItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* RewardQuantity = element->Attribute("RewardQuantity");
-			std::vector<std::string> vecRewardQuantity;
-			boost::split(vecRewardQuantity, RewardQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRewardQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRewardQuantity[i].c_str(), &temp))
-				{
-					data.mRewardQuantity.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Display = element->Attribute("Display");
-			std::vector<std::string> vecDisplay;
-			boost::split(vecDisplay, Display, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecDisplay.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecDisplay[i].c_str(), &temp))
-				{
-					data.mDisplay.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* DisplayQuantity = element->Attribute("DisplayQuantity");
-			std::vector<std::string> vecDisplayQuantity;
-			boost::split(vecDisplayQuantity, DisplayQuantity, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecDisplayQuantity.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecDisplayQuantity[i].c_str(), &temp))
-				{
-					data.mDisplayQuantity.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityElevenSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenSignCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityElevenSignCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityElevenSignCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityElevenSignCFGData data;
-		LuaCfgHelper::readInt(L, "Day", data.mDay);
-		LuaCfgHelper::readVectorInt(L, "RewardItem", data.mRewardItem);
-		LuaCfgHelper::readVectorInt(L, "RewardQuantity", data.mRewardQuantity);
-		LuaCfgHelper::readVectorInt(L, "Display", data.mDisplay);
-		LuaCfgHelper::readVectorInt(L, "DisplayQuantity", data.mDisplayQuantity);
-		if (mMapData.find(data.mDay) != mMapData.end())std::cout <<"data refind:" << data.mDay << std::endl;
-		CCASSERT(mMapData.find(data.mDay) == mMapData.end(), "data.mDay is exists");
-		mMapData.insert(std::make_pair(data.mDay, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityElevenSignCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityElevenSignCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityElevenSignCFG* M_ActivityElevenSignCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityElevenSignCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityElevenSignCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityElevenSignCFG.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityElevenSignCFGData
-{
-	//天数
-	int mDay;
-	//奖励物品
-	std::vector<int> mRewardItem;
-	//奖励数量
-	std::vector<int> mRewardQuantity;
-	//显示
-	std::vector<int> mDisplay;
-	//显示数量
-	std::vector<int> mDisplayQuantity;
-};
-
-class M_ActivityElevenSignCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityElevenSignCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityElevenSignCFGData* GetData(int Day);
-	const std::map<int, M_ActivityElevenSignCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityElevenSignCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityElevenSignCFGData> mMapData;
-};

+ 0 - 171
GameConfig/Code/Client/M_ActivityFeedBackGiftCFG.cpp

@@ -1,171 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFeedBackGiftCFG.h"
-std::auto_ptr<M_ActivityFeedBackGiftCFG> M_ActivityFeedBackGiftCFG::msSingleton(nullptr);
-
-int M_ActivityFeedBackGiftCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFeedBackGiftCFGData* M_ActivityFeedBackGiftCFG::GetData(int VipLv)
-{
-	auto it = mMapData.find(VipLv);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFeedBackGiftCFGData>& M_ActivityFeedBackGiftCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFeedBackGiftCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFeedBackGiftCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFeedBackGiftCFGData data;
-		data.mVipLv = element->IntAttribute("VipLv");
-		{
-			const char* Gear1 = element->Attribute("Gear1");
-			std::vector<std::string> vecGear1;
-			boost::split(vecGear1, Gear1, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecGear1.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecGear1[i].c_str(), &temp))
-				{
-					data.mGear1.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Gear2 = element->Attribute("Gear2");
-			std::vector<std::string> vecGear2;
-			boost::split(vecGear2, Gear2, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecGear2.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecGear2[i].c_str(), &temp))
-				{
-					data.mGear2.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Gear3 = element->Attribute("Gear3");
-			std::vector<std::string> vecGear3;
-			boost::split(vecGear3, Gear3, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecGear3.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecGear3[i].c_str(), &temp))
-				{
-					data.mGear3.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Gear4 = element->Attribute("Gear4");
-			std::vector<std::string> vecGear4;
-			boost::split(vecGear4, Gear4, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecGear4.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecGear4[i].c_str(), &temp))
-				{
-					data.mGear4.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* Gear5 = element->Attribute("Gear5");
-			std::vector<std::string> vecGear5;
-			boost::split(vecGear5, Gear5, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecGear5.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecGear5[i].c_str(), &temp))
-				{
-					data.mGear5.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mVipLv) != mMapData.end())std::cout <<"data refind:" << data.mVipLv << std::endl;
-		CCASSERT(mMapData.find(data.mVipLv) == mMapData.end(), "data.mVipLv is exists");
-		mMapData.insert(std::make_pair(data.mVipLv, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFeedBackGiftCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFeedBackGiftCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFeedBackGiftCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFeedBackGiftCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFeedBackGiftCFGData data;
-		LuaCfgHelper::readInt(L, "VipLv", data.mVipLv);
-		LuaCfgHelper::readVectorInt(L, "Gear1", data.mGear1);
-		LuaCfgHelper::readVectorInt(L, "Gear2", data.mGear2);
-		LuaCfgHelper::readVectorInt(L, "Gear3", data.mGear3);
-		LuaCfgHelper::readVectorInt(L, "Gear4", data.mGear4);
-		LuaCfgHelper::readVectorInt(L, "Gear5", data.mGear5);
-		if (mMapData.find(data.mVipLv) != mMapData.end())std::cout <<"data refind:" << data.mVipLv << std::endl;
-		CCASSERT(mMapData.find(data.mVipLv) == mMapData.end(), "data.mVipLv is exists");
-		mMapData.insert(std::make_pair(data.mVipLv, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFeedBackGiftCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFeedBackGiftCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFeedBackGiftCFG* M_ActivityFeedBackGiftCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFeedBackGiftCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFeedBackGiftCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActivityFeedBackGiftCFG.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFeedBackGiftCFGData
-{
-	//vip된섬
-	int mVipLv;
-	//도貫1띨棍쉽쟨
-	std::vector<int> mGear1;
-	//도貫2띨棍쉽쟨
-	std::vector<int> mGear2;
-	//도貫3띨棍쉽쟨
-	std::vector<int> mGear3;
-	//도貫4띨棍쉽쟨
-	std::vector<int> mGear4;
-	//도貫5띨棍쉽쟨
-	std::vector<int> mGear5;
-};
-
-class M_ActivityFeedBackGiftCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFeedBackGiftCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFeedBackGiftCFGData* GetData(int VipLv);
-	const std::map<int, M_ActivityFeedBackGiftCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFeedBackGiftCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFeedBackGiftCFGData> mMapData;
-};

+ 0 - 251
GameConfig/Code/Client/M_ActivityFeedBackPrizeCFG.cpp

@@ -1,251 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFeedBackPrizeCFG.h"
-std::auto_ptr<M_ActivityFeedBackPrizeCFG> M_ActivityFeedBackPrizeCFG::msSingleton(nullptr);
-
-int M_ActivityFeedBackPrizeCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFeedBackPrizeCFGData* M_ActivityFeedBackPrizeCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFeedBackPrizeCFGData>& M_ActivityFeedBackPrizeCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFeedBackPrizeCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFeedBackPrizeCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFeedBackPrizeCFGData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* PrizeItem1 = element->Attribute("PrizeItem1");
-			std::vector<std::string> vecPrizeItem1;
-			boost::split(vecPrizeItem1, PrizeItem1, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeItem1.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeItem1[i].c_str(), &temp))
-				{
-					data.mPrizeItem1.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* PrizeCount1 = element->Attribute("PrizeCount1");
-			std::vector<std::string> vecPrizeCount1;
-			boost::split(vecPrizeCount1, PrizeCount1, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeCount1.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeCount1[i].c_str(), &temp))
-				{
-					data.mPrizeCount1.push_back(temp);
-				}
-			}
-		}
-		data.mPrizeQuota1 = element->IntAttribute("PrizeQuota1");
-		{
-			const char* PrizeItem2 = element->Attribute("PrizeItem2");
-			std::vector<std::string> vecPrizeItem2;
-			boost::split(vecPrizeItem2, PrizeItem2, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeItem2.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeItem2[i].c_str(), &temp))
-				{
-					data.mPrizeItem2.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* PrizeCount2 = element->Attribute("PrizeCount2");
-			std::vector<std::string> vecPrizeCount2;
-			boost::split(vecPrizeCount2, PrizeCount2, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeCount2.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeCount2[i].c_str(), &temp))
-				{
-					data.mPrizeCount2.push_back(temp);
-				}
-			}
-		}
-		data.mPrizeQuota2 = element->IntAttribute("PrizeQuota2");
-		{
-			const char* PrizeItem3 = element->Attribute("PrizeItem3");
-			std::vector<std::string> vecPrizeItem3;
-			boost::split(vecPrizeItem3, PrizeItem3, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeItem3.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeItem3[i].c_str(), &temp))
-				{
-					data.mPrizeItem3.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* PrizeCount3 = element->Attribute("PrizeCount3");
-			std::vector<std::string> vecPrizeCount3;
-			boost::split(vecPrizeCount3, PrizeCount3, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeCount3.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeCount3[i].c_str(), &temp))
-				{
-					data.mPrizeCount3.push_back(temp);
-				}
-			}
-		}
-		data.mPrizeQuota3 = element->IntAttribute("PrizeQuota3");
-		{
-			const char* PrizeItem4 = element->Attribute("PrizeItem4");
-			std::vector<std::string> vecPrizeItem4;
-			boost::split(vecPrizeItem4, PrizeItem4, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeItem4.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeItem4[i].c_str(), &temp))
-				{
-					data.mPrizeItem4.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* PrizeCount4 = element->Attribute("PrizeCount4");
-			std::vector<std::string> vecPrizeCount4;
-			boost::split(vecPrizeCount4, PrizeCount4, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeCount4.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeCount4[i].c_str(), &temp))
-				{
-					data.mPrizeCount4.push_back(temp);
-				}
-			}
-		}
-		data.mPrizeQuota4 = element->IntAttribute("PrizeQuota4");
-		{
-			const char* PrizeItem5 = element->Attribute("PrizeItem5");
-			std::vector<std::string> vecPrizeItem5;
-			boost::split(vecPrizeItem5, PrizeItem5, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeItem5.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeItem5[i].c_str(), &temp))
-				{
-					data.mPrizeItem5.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* PrizeCount5 = element->Attribute("PrizeCount5");
-			std::vector<std::string> vecPrizeCount5;
-			boost::split(vecPrizeCount5, PrizeCount5, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecPrizeCount5.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecPrizeCount5[i].c_str(), &temp))
-				{
-					data.mPrizeCount5.push_back(temp);
-				}
-			}
-		}
-		data.mPrizeQuota5 = element->IntAttribute("PrizeQuota5");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFeedBackPrizeCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFeedBackPrizeCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFeedBackPrizeCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFeedBackPrizeCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFeedBackPrizeCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "PrizeItem1", data.mPrizeItem1);
-		LuaCfgHelper::readVectorInt(L, "PrizeCount1", data.mPrizeCount1);
-		LuaCfgHelper::readInt(L, "PrizeQuota1", data.mPrizeQuota1);
-		LuaCfgHelper::readVectorInt(L, "PrizeItem2", data.mPrizeItem2);
-		LuaCfgHelper::readVectorInt(L, "PrizeCount2", data.mPrizeCount2);
-		LuaCfgHelper::readInt(L, "PrizeQuota2", data.mPrizeQuota2);
-		LuaCfgHelper::readVectorInt(L, "PrizeItem3", data.mPrizeItem3);
-		LuaCfgHelper::readVectorInt(L, "PrizeCount3", data.mPrizeCount3);
-		LuaCfgHelper::readInt(L, "PrizeQuota3", data.mPrizeQuota3);
-		LuaCfgHelper::readVectorInt(L, "PrizeItem4", data.mPrizeItem4);
-		LuaCfgHelper::readVectorInt(L, "PrizeCount4", data.mPrizeCount4);
-		LuaCfgHelper::readInt(L, "PrizeQuota4", data.mPrizeQuota4);
-		LuaCfgHelper::readVectorInt(L, "PrizeItem5", data.mPrizeItem5);
-		LuaCfgHelper::readVectorInt(L, "PrizeCount5", data.mPrizeCount5);
-		LuaCfgHelper::readInt(L, "PrizeQuota5", data.mPrizeQuota5);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFeedBackPrizeCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFeedBackPrizeCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFeedBackPrizeCFG* M_ActivityFeedBackPrizeCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFeedBackPrizeCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFeedBackPrizeCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 55
GameConfig/Code/Client/M_ActivityFeedBackPrizeCFG.h

@@ -1,55 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFeedBackPrizeCFGData
-{
-	//档位
-	int mID;
-	//奖品道具ID
-	std::vector<int> mPrizeItem1;
-	//奖品道具数量
-	std::vector<int> mPrizeCount1;
-	//奖励人数
-	int mPrizeQuota1;
-	//奖品道具ID
-	std::vector<int> mPrizeItem2;
-	//奖品道具数量
-	std::vector<int> mPrizeCount2;
-	//奖励人数
-	int mPrizeQuota2;
-	//奖品道具ID
-	std::vector<int> mPrizeItem3;
-	//奖品道具数量
-	std::vector<int> mPrizeCount3;
-	//奖励人数
-	int mPrizeQuota3;
-	//奖品道具ID
-	std::vector<int> mPrizeItem4;
-	//奖品道具数量
-	std::vector<int> mPrizeCount4;
-	//奖励人数
-	int mPrizeQuota4;
-	//奖品道具ID
-	std::vector<int> mPrizeItem5;
-	//奖品道具数量
-	std::vector<int> mPrizeCount5;
-	//奖励人数
-	int mPrizeQuota5;
-};
-
-class M_ActivityFeedBackPrizeCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFeedBackPrizeCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFeedBackPrizeCFGData* GetData(int ID);
-	const std::map<int, M_ActivityFeedBackPrizeCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFeedBackPrizeCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFeedBackPrizeCFGData> mMapData;
-};

+ 0 - 105
GameConfig/Code/Client/M_ActivityFishingCeleBaseInfo.cpp

@@ -1,105 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleBaseInfo.h"
-std::auto_ptr<M_ActivityFishingCeleBaseInfo> M_ActivityFishingCeleBaseInfo::msSingleton(nullptr);
-
-int M_ActivityFishingCeleBaseInfo::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleBaseInfoData* M_ActivityFishingCeleBaseInfo::GetData(std::string Key)
-{
-	auto it = mMapData.find(Key);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<std::string, M_ActivityFishingCeleBaseInfoData>& M_ActivityFishingCeleBaseInfo::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleBaseInfo::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleBaseInfo.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleBaseInfoData data;
-		data.mKey = element->Attribute("Key");
-		data.mValue = element->IntAttribute("Value");
-		data.mStringValue = element->Attribute("StringValue");
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleBaseInfo Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleBaseInfo::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleBaseInfo");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleBaseInfo");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleBaseInfoData data;
-		LuaCfgHelper::readString(L, "Key", data.mKey);
-		LuaCfgHelper::readInt(L, "Value", data.mValue);
-		LuaCfgHelper::readString(L, "StringValue", data.mStringValue);
-		if (mMapData.find(data.mKey) != mMapData.end())std::cout <<"data refind:" << data.mKey << std::endl;
-		CCASSERT(mMapData.find(data.mKey) == mMapData.end(), "data.mKey is exists");
-		mMapData.insert(std::make_pair(data.mKey, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleBaseInfo Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleBaseInfo::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleBaseInfo* M_ActivityFishingCeleBaseInfo::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleBaseInfo());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleBaseInfo::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 29
GameConfig/Code/Client/M_ActivityFishingCeleBaseInfo.h

@@ -1,29 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleBaseInfoData
-{
-	//Key
-	std::string mKey;
-	//ÊýÖµ
-	int mValue;
-	//×Ö·û´®
-	std::string mStringValue;
-};
-
-class M_ActivityFishingCeleBaseInfo
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleBaseInfo> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleBaseInfoData* GetData(std::string Key);
-	const std::map<std::string, M_ActivityFishingCeleBaseInfoData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleBaseInfo* GetSingleton();
-	static void Release();
-private:
-	std::map<std::string, M_ActivityFishingCeleBaseInfoData> mMapData;
-};

+ 0 - 125
GameConfig/Code/Client/M_ActivityFishingCeleExchangeCFG.cpp

@@ -1,125 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleExchangeCFG.h"
-std::auto_ptr<M_ActivityFishingCeleExchangeCFG> M_ActivityFishingCeleExchangeCFG::msSingleton(nullptr);
-
-int M_ActivityFishingCeleExchangeCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleExchangeCFGData* M_ActivityFishingCeleExchangeCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleExchangeCFGData>& M_ActivityFishingCeleExchangeCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleExchangeCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleExchangeCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleExchangeCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mType = element->IntAttribute("Type");
-		data.mNeedItem = element->IntAttribute("NeedItem");
-		data.mNeedCount = element->IntAttribute("NeedCount");
-		data.mDiscountCount = element->IntAttribute("DiscountCount");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mItemCount = element->IntAttribute("ItemCount");
-		data.mLimit = element->IntAttribute("Limit");
-		data.mProbItem = element->IntAttribute("ProbItem");
-		data.mProbCount = element->IntAttribute("ProbCount");
-		data.mProb = element->IntAttribute("Prob");
-		data.mGiftDiscount = element->IntAttribute("GiftDiscount");
-		data.mLvLimit = element->IntAttribute("LvLimit");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleExchangeCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleExchangeCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleExchangeCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleExchangeCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleExchangeCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Type", data.mType);
-		LuaCfgHelper::readInt(L, "NeedItem", data.mNeedItem);
-		LuaCfgHelper::readInt(L, "NeedCount", data.mNeedCount);
-		LuaCfgHelper::readInt(L, "DiscountCount", data.mDiscountCount);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readInt(L, "ItemCount", data.mItemCount);
-		LuaCfgHelper::readInt(L, "Limit", data.mLimit);
-		LuaCfgHelper::readInt(L, "ProbItem", data.mProbItem);
-		LuaCfgHelper::readInt(L, "ProbCount", data.mProbCount);
-		LuaCfgHelper::readInt(L, "Prob", data.mProb);
-		LuaCfgHelper::readInt(L, "GiftDiscount", data.mGiftDiscount);
-		LuaCfgHelper::readInt(L, "LvLimit", data.mLvLimit);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleExchangeCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleExchangeCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleExchangeCFG* M_ActivityFishingCeleExchangeCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleExchangeCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleExchangeCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 49
GameConfig/Code/Client/M_ActivityFishingCeleExchangeCFG.h

@@ -1,49 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleExchangeCFGData
-{
-	//编号
-	int mID;
-	//功能标签
-	int mType;
-	//需要道具
-	int mNeedItem;
-	//需要数量
-	int mNeedCount;
-	//折扣后数量
-	int mDiscountCount;
-	//道具ID
-	int mItemId;
-	//道具数量
-	int mItemCount;
-	//限兑次数
-	int mLimit;
-	//概率道具ID
-	int mProbItem;
-	//概率道具数量
-	int mProbCount;
-	//概率(百分比)
-	int mProb;
-	//礼包折扣(百分比)
-	int mGiftDiscount;
-	//阶限制
-	int mLvLimit;
-};
-
-class M_ActivityFishingCeleExchangeCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleExchangeCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleExchangeCFGData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleExchangeCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleExchangeCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleExchangeCFGData> mMapData;
-};

+ 0 - 131
GameConfig/Code/Client/M_ActivityFishingCeleGiftLottery.cpp

@@ -1,131 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleGiftLottery.h"
-std::auto_ptr<M_ActivityFishingCeleGiftLottery> M_ActivityFishingCeleGiftLottery::msSingleton(nullptr);
-
-int M_ActivityFishingCeleGiftLottery::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleGiftLotteryData* M_ActivityFishingCeleGiftLottery::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleGiftLotteryData>& M_ActivityFishingCeleGiftLottery::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleGiftLottery::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleGiftLottery.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleGiftLotteryData data;
-		data.mID = element->IntAttribute("ID");
-		data.mLotteryCount = element->IntAttribute("LotteryCount");
-		{
-			const char* rewardItem = element->Attribute("rewardItem");
-			std::vector<std::string> vecrewardItem;
-			boost::split(vecrewardItem, rewardItem, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecrewardItem.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecrewardItem[i].c_str(), &temp))
-				{
-					data.mrewardItem.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* rewardCount = element->Attribute("rewardCount");
-			std::vector<std::string> vecrewardCount;
-			boost::split(vecrewardCount, rewardCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecrewardCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecrewardCount[i].c_str(), &temp))
-				{
-					data.mrewardCount.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleGiftLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftLottery::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleGiftLottery");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleGiftLottery");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleGiftLotteryData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "LotteryCount", data.mLotteryCount);
-		LuaCfgHelper::readVectorInt(L, "rewardItem", data.mrewardItem);
-		LuaCfgHelper::readVectorInt(L, "rewardCount", data.mrewardCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleGiftLottery Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftLottery::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleGiftLottery* M_ActivityFishingCeleGiftLottery::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleGiftLottery());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleGiftLottery::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityFishingCeleGiftLottery.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleGiftLotteryData
-{
-	//抽奖等级
-	int mID;
-	//集齐次数
-	int mLotteryCount;
-	//集齐奖励
-	std::vector<int> mrewardItem;
-	//集齐奖励数量
-	std::vector<int> mrewardCount;
-};
-
-class M_ActivityFishingCeleGiftLottery
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleGiftLottery> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleGiftLotteryData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleGiftLotteryData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleGiftLottery* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleGiftLotteryData> mMapData;
-};

+ 0 - 111
GameConfig/Code/Client/M_ActivityFishingCeleGiftLotteryMap.cpp

@@ -1,111 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleGiftLotteryMap.h"
-std::auto_ptr<M_ActivityFishingCeleGiftLotteryMap> M_ActivityFishingCeleGiftLotteryMap::msSingleton(nullptr);
-
-int M_ActivityFishingCeleGiftLotteryMap::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleGiftLotteryMapData* M_ActivityFishingCeleGiftLotteryMap::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleGiftLotteryMapData>& M_ActivityFishingCeleGiftLotteryMap::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleGiftLotteryMap::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleGiftLotteryMap.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleGiftLotteryMapData data;
-		data.mID = element->IntAttribute("ID");
-		data.mType = element->IntAttribute("Type");
-		data.mFreeWeight = element->IntAttribute("FreeWeight");
-		data.mAdvWeight = element->IntAttribute("AdvWeight");
-		data.mAdvNeedItem = element->IntAttribute("AdvNeedItem");
-		data.mGiftId = element->IntAttribute("GiftId");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleGiftLotteryMap Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftLotteryMap::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleGiftLotteryMap");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleGiftLotteryMap");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleGiftLotteryMapData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Type", data.mType);
-		LuaCfgHelper::readInt(L, "FreeWeight", data.mFreeWeight);
-		LuaCfgHelper::readInt(L, "AdvWeight", data.mAdvWeight);
-		LuaCfgHelper::readInt(L, "AdvNeedItem", data.mAdvNeedItem);
-		LuaCfgHelper::readInt(L, "GiftId", data.mGiftId);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleGiftLotteryMap Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftLotteryMap::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleGiftLotteryMap* M_ActivityFishingCeleGiftLotteryMap::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleGiftLotteryMap());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleGiftLotteryMap::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActivityFishingCeleGiftLotteryMap.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleGiftLotteryMapData
-{
-	//ID
-	int mID;
-	//初级/中级/高级
-	int mType;
-	//免费权重
-	int mFreeWeight;
-	//高级权重
-	int mAdvWeight;
-	//高级抽奖需道具
-	int mAdvNeedItem;
-	//抽奖项礼包
-	int mGiftId;
-};
-
-class M_ActivityFishingCeleGiftLotteryMap
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleGiftLotteryMap> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleGiftLotteryMapData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleGiftLotteryMapData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleGiftLotteryMap* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleGiftLotteryMapData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityFishingCeleGiftRecharge.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleGiftRecharge.h"
-std::auto_ptr<M_ActivityFishingCeleGiftRecharge> M_ActivityFishingCeleGiftRecharge::msSingleton(nullptr);
-
-int M_ActivityFishingCeleGiftRecharge::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleGiftRechargeData* M_ActivityFishingCeleGiftRecharge::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleGiftRechargeData>& M_ActivityFishingCeleGiftRecharge::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleGiftRecharge::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleGiftRecharge.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleGiftRechargeData data;
-		data.mID = element->IntAttribute("ID");
-		data.mGiftID = element->IntAttribute("GiftID");
-		data.mneedItem = element->IntAttribute("needItem");
-		data.mneedCount = element->IntAttribute("needCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleGiftRecharge Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftRecharge::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleGiftRecharge");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleGiftRecharge");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleGiftRechargeData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "GiftID", data.mGiftID);
-		LuaCfgHelper::readInt(L, "needItem", data.mneedItem);
-		LuaCfgHelper::readInt(L, "needCount", data.mneedCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleGiftRecharge Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleGiftRecharge::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleGiftRecharge* M_ActivityFishingCeleGiftRecharge::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleGiftRecharge());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleGiftRecharge::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityFishingCeleGiftRecharge.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleGiftRechargeData
-{
-	//ID
-	int mID;
-	//对应礼包ID
-	int mGiftID;
-	//需要道具ID
-	int mneedItem;
-	//需要道具数量
-	int mneedCount;
-};
-
-class M_ActivityFishingCeleGiftRecharge
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleGiftRecharge> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleGiftRechargeData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleGiftRechargeData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleGiftRecharge* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleGiftRechargeData> mMapData;
-};

+ 0 - 157
GameConfig/Code/Client/M_ActivityFishingCeleLotteryMap.cpp

@@ -1,157 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleLotteryMap.h"
-std::auto_ptr<M_ActivityFishingCeleLotteryMap> M_ActivityFishingCeleLotteryMap::msSingleton(nullptr);
-
-int M_ActivityFishingCeleLotteryMap::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleLotteryMapData* M_ActivityFishingCeleLotteryMap::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleLotteryMapData>& M_ActivityFishingCeleLotteryMap::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleLotteryMap::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleLotteryMap.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleLotteryMapData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* Weight = element->Attribute("Weight");
-			std::vector<std::string> vecWeight;
-			boost::split(vecWeight, Weight, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecWeight.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecWeight[i].c_str(), &temp))
-				{
-					data.mWeight.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemId = element->Attribute("ItemId");
-			std::vector<std::string> vecItemId;
-			boost::split(vecItemId, ItemId, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemId.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemId[i].c_str(), &temp))
-				{
-					data.mItemId.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemCount = element->Attribute("ItemCount");
-			std::vector<std::string> vecItemCount;
-			boost::split(vecItemCount, ItemCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemCount[i].c_str(), &temp))
-				{
-					data.mItemCount.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* WeightShow = element->Attribute("WeightShow");
-			std::vector<std::string> vecWeightShow;
-			boost::split(vecWeightShow, WeightShow, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecWeightShow.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecWeightShow[i].c_str(), &temp))
-				{
-					data.mWeightShow.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleLotteryMap Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleLotteryMap::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleLotteryMap");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleLotteryMap");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleLotteryMapData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readVectorInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readVectorInt(L, "ItemCount", data.mItemCount);
-		LuaCfgHelper::readVectorInt(L, "WeightShow", data.mWeightShow);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleLotteryMap Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleLotteryMap::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleLotteryMap* M_ActivityFishingCeleLotteryMap::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleLotteryMap());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleLotteryMap::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityFishingCeleLotteryMap.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleLotteryMapData
-{
-	//ID
-	int mID;
-	//홈路(6쌓)
-	std::vector<int> mWeight;
-	//녜쉽淃돛야
-	std::vector<int> mItemId;
-	//녜쉽淃돛야鑒좆
-	std::vector<int> mItemCount;
-	//홈路(6쌓)
-	std::vector<int> mWeightShow;
-};
-
-class M_ActivityFishingCeleLotteryMap
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleLotteryMap> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleLotteryMapData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleLotteryMapData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleLotteryMap* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleLotteryMapData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityFishingCeleLotteryTicketShop.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleLotteryTicketShop.h"
-std::auto_ptr<M_ActivityFishingCeleLotteryTicketShop> M_ActivityFishingCeleLotteryTicketShop::msSingleton(nullptr);
-
-int M_ActivityFishingCeleLotteryTicketShop::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleLotteryTicketShopData* M_ActivityFishingCeleLotteryTicketShop::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleLotteryTicketShopData>& M_ActivityFishingCeleLotteryTicketShop::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleLotteryTicketShop::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleLotteryTicketShop.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleLotteryTicketShopData data;
-		data.mID = element->IntAttribute("ID");
-		data.mLotteryCount = element->IntAttribute("LotteryCount");
-		data.mNeedCount = element->IntAttribute("NeedCount");
-		data.mTicketCount = element->IntAttribute("TicketCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleLotteryTicketShop Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleLotteryTicketShop::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleLotteryTicketShop");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleLotteryTicketShop");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleLotteryTicketShopData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "LotteryCount", data.mLotteryCount);
-		LuaCfgHelper::readInt(L, "NeedCount", data.mNeedCount);
-		LuaCfgHelper::readInt(L, "TicketCount", data.mTicketCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleLotteryTicketShop Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleLotteryTicketShop::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleLotteryTicketShop* M_ActivityFishingCeleLotteryTicketShop::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleLotteryTicketShop());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleLotteryTicketShop::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityFishingCeleLotteryTicketShop.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleLotteryTicketShopData
-{
-	//ID
-	int mID;
-	//抽奖次数
-	int mLotteryCount;
-	//需要钻石
-	int mNeedCount;
-	//奖励抽奖券数量
-	int mTicketCount;
-};
-
-class M_ActivityFishingCeleLotteryTicketShop
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleLotteryTicketShop> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleLotteryTicketShopData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleLotteryTicketShopData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleLotteryTicketShop* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleLotteryTicketShopData> mMapData;
-};

+ 0 - 133
GameConfig/Code/Client/M_ActivityFishingCeleRank.cpp

@@ -1,133 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleRank.h"
-std::auto_ptr<M_ActivityFishingCeleRank> M_ActivityFishingCeleRank::msSingleton(nullptr);
-
-int M_ActivityFishingCeleRank::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleRankData* M_ActivityFishingCeleRank::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleRankData>& M_ActivityFishingCeleRank::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleRank::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleRank.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleRankData data;
-		data.mID = element->IntAttribute("ID");
-		data.mStartRank = element->IntAttribute("StartRank");
-		data.mEndRank = element->IntAttribute("EndRank");
-		{
-			const char* ItemID = element->Attribute("ItemID");
-			std::vector<std::string> vecItemID;
-			boost::split(vecItemID, ItemID, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemID.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemID[i].c_str(), &temp))
-				{
-					data.mItemID.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ItemCount = element->Attribute("ItemCount");
-			std::vector<std::string> vecItemCount;
-			boost::split(vecItemCount, ItemCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecItemCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecItemCount[i].c_str(), &temp))
-				{
-					data.mItemCount.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleRank Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleRank::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleRank");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleRank");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleRankData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "StartRank", data.mStartRank);
-		LuaCfgHelper::readInt(L, "EndRank", data.mEndRank);
-		LuaCfgHelper::readVectorInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readVectorInt(L, "ItemCount", data.mItemCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleRank Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleRank::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleRank* M_ActivityFishingCeleRank::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleRank());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleRank::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 33
GameConfig/Code/Client/M_ActivityFishingCeleRank.h

@@ -1,33 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleRankData
-{
-	//编号
-	int mID;
-	//开始排名
-	int mStartRank;
-	//结束排名
-	int mEndRank;
-	//奖励道具
-	std::vector<int> mItemID;
-	//奖励数量
-	std::vector<int> mItemCount;
-};
-
-class M_ActivityFishingCeleRank
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleRank> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleRankData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleRankData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleRank* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleRankData> mMapData;
-};

+ 0 - 131
GameConfig/Code/Client/M_ActivityFishingCeleStage.cpp

@@ -1,131 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFishingCeleStage.h"
-std::auto_ptr<M_ActivityFishingCeleStage> M_ActivityFishingCeleStage::msSingleton(nullptr);
-
-int M_ActivityFishingCeleStage::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFishingCeleStageData* M_ActivityFishingCeleStage::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFishingCeleStageData>& M_ActivityFishingCeleStage::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFishingCeleStage::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFishingCeleStage.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFishingCeleStageData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* ActiveId = element->Attribute("ActiveId");
-			std::vector<std::string> vecActiveId;
-			boost::split(vecActiveId, ActiveId, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecActiveId.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecActiveId[i].c_str(), &temp))
-				{
-					data.mActiveId.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* ActiveCount = element->Attribute("ActiveCount");
-			std::vector<std::string> vecActiveCount;
-			boost::split(vecActiveCount, ActiveCount, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecActiveCount.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecActiveCount[i].c_str(), &temp))
-				{
-					data.mActiveCount.push_back(temp);
-				}
-			}
-		}
-		data.mSubAllowCount = element->IntAttribute("SubAllowCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFishingCeleStage Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleStage::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFishingCeleStage");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFishingCeleStage");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFishingCeleStageData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "ActiveId", data.mActiveId);
-		LuaCfgHelper::readVectorInt(L, "ActiveCount", data.mActiveCount);
-		LuaCfgHelper::readInt(L, "SubAllowCount", data.mSubAllowCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFishingCeleStage Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFishingCeleStage::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFishingCeleStage* M_ActivityFishingCeleStage::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFishingCeleStage());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFishingCeleStage::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityFishingCeleStage.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFishingCeleStageData
-{
-	//阶数
-	int mID;
-	//激活奖励
-	std::vector<int> mActiveId;
-	//激活奖励数量
-	std::vector<int> mActiveCount;
-	//低保次数
-	int mSubAllowCount;
-};
-
-class M_ActivityFishingCeleStage
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFishingCeleStage> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFishingCeleStageData* GetData(int ID);
-	const std::map<int, M_ActivityFishingCeleStageData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFishingCeleStage* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFishingCeleStageData> mMapData;
-};

+ 0 - 111
GameConfig/Code/Client/M_ActivityFortuenShopCFG.cpp

@@ -1,111 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFortuenShopCFG.h"
-std::auto_ptr<M_ActivityFortuenShopCFG> M_ActivityFortuenShopCFG::msSingleton(nullptr);
-
-int M_ActivityFortuenShopCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFortuenShopCFGData* M_ActivityFortuenShopCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFortuenShopCFGData>& M_ActivityFortuenShopCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFortuenShopCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFortuenShopCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFortuenShopCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mItemName = element->Attribute("ItemName");
-		data.mItemId = element->IntAttribute("ItemId");
-		data.mItemCont = element->IntAttribute("ItemCont");
-		data.mExchangeId = element->IntAttribute("ExchangeId");
-		data.mExchangeCount = element->IntAttribute("ExchangeCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFortuenShopCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFortuenShopCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFortuenShopCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFortuenShopCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFortuenShopCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readString(L, "ItemName", data.mItemName);
-		LuaCfgHelper::readInt(L, "ItemId", data.mItemId);
-		LuaCfgHelper::readInt(L, "ItemCont", data.mItemCont);
-		LuaCfgHelper::readInt(L, "ExchangeId", data.mExchangeId);
-		LuaCfgHelper::readInt(L, "ExchangeCount", data.mExchangeCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFortuenShopCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFortuenShopCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFortuenShopCFG* M_ActivityFortuenShopCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFortuenShopCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFortuenShopCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 35
GameConfig/Code/Client/M_ActivityFortuenShopCFG.h

@@ -1,35 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFortuenShopCFGData
-{
-	//긍뵀
-	int mID;
-	//돛야츰냔
-	std::string mItemName;
-	//돛야id
-	int mItemId;
-	//돛야鑒좆
-	int mItemCont;
-	//뚝뻣杰矜Id
-	int mExchangeId;
-	//뚝뻣杰矜鑒좆
-	int mExchangeCount;
-};
-
-class M_ActivityFortuenShopCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFortuenShopCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFortuenShopCFGData* GetData(int ID);
-	const std::map<int, M_ActivityFortuenShopCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFortuenShopCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFortuenShopCFGData> mMapData;
-};

+ 0 - 151
GameConfig/Code/Client/M_ActivityFortuenTaskCFG.cpp

@@ -1,151 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityFortuenTaskCFG.h"
-std::auto_ptr<M_ActivityFortuenTaskCFG> M_ActivityFortuenTaskCFG::msSingleton(nullptr);
-
-int M_ActivityFortuenTaskCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityFortuenTaskCFGData* M_ActivityFortuenTaskCFG::GetData(int Id)
-{
-	auto it = mMapData.find(Id);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityFortuenTaskCFGData>& M_ActivityFortuenTaskCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityFortuenTaskCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityFortuenTaskCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityFortuenTaskCFGData data;
-		data.mId = element->IntAttribute("Id");
-		data.mDesc = element->Attribute("Desc");
-		data.mCompleteType = element->IntAttribute("CompleteType");
-		{
-			const char* CompleteParam = element->Attribute("CompleteParam");
-			std::vector<std::string> vecCompleteParam;
-			boost::split(vecCompleteParam, CompleteParam, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecCompleteParam.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecCompleteParam[i].c_str(), &temp))
-				{
-					data.mCompleteParam.push_back(temp);
-				}
-			}
-		}
-		data.mCompleteCount = element->IntAttribute("CompleteCount");
-		data.mDays = element->IntAttribute("Days");
-		{
-			const char* AwardItemIDs = element->Attribute("AwardItemIDs");
-			std::vector<std::string> vecAwardItemIDs;
-			boost::split(vecAwardItemIDs, AwardItemIDs, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecAwardItemIDs.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecAwardItemIDs[i].c_str(), &temp))
-				{
-					data.mAwardItemIDs.push_back(temp);
-				}
-			}
-		}
-		{
-			const char* AwardItemCounts = element->Attribute("AwardItemCounts");
-			std::vector<std::string> vecAwardItemCounts;
-			boost::split(vecAwardItemCounts, AwardItemCounts, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecAwardItemCounts.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecAwardItemCounts[i].c_str(), &temp))
-				{
-					data.mAwardItemCounts.push_back(temp);
-				}
-			}
-		}
-		if (mMapData.find(data.mId) != mMapData.end())std::cout <<"data refind:" << data.mId << std::endl;
-		CCASSERT(mMapData.find(data.mId) == mMapData.end(), "data.mId is exists");
-		mMapData.insert(std::make_pair(data.mId, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityFortuenTaskCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFortuenTaskCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityFortuenTaskCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityFortuenTaskCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityFortuenTaskCFGData data;
-		LuaCfgHelper::readInt(L, "Id", data.mId);
-		LuaCfgHelper::readString(L, "Desc", data.mDesc);
-		LuaCfgHelper::readInt(L, "CompleteType", data.mCompleteType);
-		LuaCfgHelper::readVectorInt(L, "CompleteParam", data.mCompleteParam);
-		LuaCfgHelper::readInt(L, "CompleteCount", data.mCompleteCount);
-		LuaCfgHelper::readInt(L, "Days", data.mDays);
-		LuaCfgHelper::readVectorInt(L, "AwardItemIDs", data.mAwardItemIDs);
-		LuaCfgHelper::readVectorInt(L, "AwardItemCounts", data.mAwardItemCounts);
-		if (mMapData.find(data.mId) != mMapData.end())std::cout <<"data refind:" << data.mId << std::endl;
-		CCASSERT(mMapData.find(data.mId) == mMapData.end(), "data.mId is exists");
-		mMapData.insert(std::make_pair(data.mId, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityFortuenTaskCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityFortuenTaskCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityFortuenTaskCFG* M_ActivityFortuenTaskCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityFortuenTaskCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityFortuenTaskCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 39
GameConfig/Code/Client/M_ActivityFortuenTaskCFG.h

@@ -1,39 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityFortuenTaskCFGData
-{
-	//任务ID
-	int mId;
-	//任务描述
-	std::string mDesc;
-	//完成条件类型
-	int mCompleteType;
-	//特殊参数,填0不生效。对任务捕获指定鱼需要填写
-	std::vector<int> mCompleteParam;
-	//完成计数
-	int mCompleteCount;
-	//达到天数
-	int mDays;
-	//奖励物品ID
-	std::vector<int> mAwardItemIDs;
-	//奖励物品数量
-	std::vector<int> mAwardItemCounts;
-};
-
-class M_ActivityFortuenTaskCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityFortuenTaskCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityFortuenTaskCFGData* GetData(int Id);
-	const std::map<int, M_ActivityFortuenTaskCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityFortuenTaskCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityFortuenTaskCFGData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityGetRichCFG.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityGetRichCFG.h"
-std::auto_ptr<M_ActivityGetRichCFG> M_ActivityGetRichCFG::msSingleton(nullptr);
-
-int M_ActivityGetRichCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityGetRichCFGData* M_ActivityGetRichCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityGetRichCFGData>& M_ActivityGetRichCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityGetRichCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityGetRichCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityGetRichCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mWeight = element->IntAttribute("Weight");
-		data.mRate = element->IntAttribute("Rate");
-		data.mGold = element->IntAttribute("Gold");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityGetRichCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGetRichCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityGetRichCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityGetRichCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityGetRichCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "Rate", data.mRate);
-		LuaCfgHelper::readInt(L, "Gold", data.mGold);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityGetRichCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGetRichCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityGetRichCFG* M_ActivityGetRichCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityGetRichCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityGetRichCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityGetRichCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityGetRichCFGData
-{
-	//񅧏
-	int mID;
-	//È¨ÖØ
-	int mWeight;
-	//±¶ÂÊ
-	int mRate;
-	//½±Àø½ð±Ò
-	int mGold;
-};
-
-class M_ActivityGetRichCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityGetRichCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityGetRichCFGData* GetData(int ID);
-	const std::map<int, M_ActivityGetRichCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityGetRichCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityGetRichCFGData> mMapData;
-};

+ 0 - 105
GameConfig/Code/Client/M_ActivityGetRichDrawCFG.cpp

@@ -1,105 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityGetRichDrawCFG.h"
-std::auto_ptr<M_ActivityGetRichDrawCFG> M_ActivityGetRichDrawCFG::msSingleton(nullptr);
-
-int M_ActivityGetRichDrawCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityGetRichDrawCFGData* M_ActivityGetRichDrawCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityGetRichDrawCFGData>& M_ActivityGetRichDrawCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityGetRichDrawCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityGetRichDrawCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityGetRichDrawCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mFullPrice = element->IntAttribute("FullPrice");
-		data.mDrawCount = element->IntAttribute("DrawCount");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityGetRichDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGetRichDrawCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityGetRichDrawCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityGetRichDrawCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityGetRichDrawCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "FullPrice", data.mFullPrice);
-		LuaCfgHelper::readInt(L, "DrawCount", data.mDrawCount);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityGetRichDrawCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGetRichDrawCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityGetRichDrawCFG* M_ActivityGetRichDrawCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityGetRichDrawCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityGetRichDrawCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 29
GameConfig/Code/Client/M_ActivityGetRichDrawCFG.h

@@ -1,29 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityGetRichDrawCFGData
-{
-	//编号
-	int mID;
-	//累充价格
-	int mFullPrice;
-	//增加抽奖次数
-	int mDrawCount;
-};
-
-class M_ActivityGetRichDrawCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityGetRichDrawCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityGetRichDrawCFGData* GetData(int ID);
-	const std::map<int, M_ActivityGetRichDrawCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityGetRichDrawCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityGetRichDrawCFGData> mMapData;
-};

+ 0 - 119
GameConfig/Code/Client/M_ActivityGrandPrixCFG.cpp

@@ -1,119 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityGrandPrixCFG.h"
-std::auto_ptr<M_ActivityGrandPrixCFG> M_ActivityGrandPrixCFG::msSingleton(nullptr);
-
-int M_ActivityGrandPrixCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityGrandPrixCFGData* M_ActivityGrandPrixCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityGrandPrixCFGData>& M_ActivityGrandPrixCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityGrandPrixCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityGrandPrixCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityGrandPrixCFGData data;
-		data.mID = element->IntAttribute("ID");
-		{
-			const char* RechangId = element->Attribute("RechangId");
-			std::vector<std::string> vecRechangId;
-			boost::split(vecRechangId, RechangId, boost::is_any_of(","));
-			int temp;
-			for (unsigned int i = 0; i < vecRechangId.size(); i++)
-			{
-				if (tinyxml2::XMLUtil::ToInt(vecRechangId[i].c_str(), &temp))
-				{
-					data.mRechangId.push_back(temp);
-				}
-			}
-		}
-		data.mWeight = element->IntAttribute("Weight");
-		data.mMultiple = element->IntAttribute("Multiple");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityGrandPrixCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGrandPrixCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityGrandPrixCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityGrandPrixCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityGrandPrixCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readVectorInt(L, "RechangId", data.mRechangId);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		LuaCfgHelper::readInt(L, "Multiple", data.mMultiple);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityGrandPrixCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityGrandPrixCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityGrandPrixCFG* M_ActivityGrandPrixCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityGrandPrixCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityGrandPrixCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityGrandPrixCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityGrandPrixCFGData
-{
-	//񅧏
-	int mID;
-	//Àñ°üID
-	std::vector<int> mRechangId;
-	//È¨ÖØ
-	int mWeight;
-	//±¶ÂÊ
-	int mMultiple;
-};
-
-class M_ActivityGrandPrixCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityGrandPrixCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityGrandPrixCFGData* GetData(int ID);
-	const std::map<int, M_ActivityGrandPrixCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityGrandPrixCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityGrandPrixCFGData> mMapData;
-};

+ 0 - 121
GameConfig/Code/Client/M_ActivityHappySummerBlindBoxCFG.cpp

@@ -1,121 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityHappySummerBlindBoxCFG.h"
-std::auto_ptr<M_ActivityHappySummerBlindBoxCFG> M_ActivityHappySummerBlindBoxCFG::msSingleton(nullptr);
-
-int M_ActivityHappySummerBlindBoxCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityHappySummerBlindBoxCFGData* M_ActivityHappySummerBlindBoxCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityHappySummerBlindBoxCFGData>& M_ActivityHappySummerBlindBoxCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityHappySummerBlindBoxCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityHappySummerBlindBoxCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityHappySummerBlindBoxCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mItemID = element->IntAttribute("ItemID");
-		data.mCount = element->IntAttribute("Count");
-		data.mRemainder = element->IntAttribute("Remainder");
-		data.mBIgPrice = element->IntAttribute("BIgPrice");
-		data.mWeight1 = element->IntAttribute("Weight1");
-		data.mWeight2 = element->IntAttribute("Weight2");
-		data.mWeight3 = element->IntAttribute("Weight3");
-		data.mWeight4 = element->IntAttribute("Weight4");
-		data.mWeight5 = element->IntAttribute("Weight5");
-		data.mWeight6 = element->IntAttribute("Weight6");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityHappySummerBlindBoxCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityHappySummerBlindBoxCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityHappySummerBlindBoxCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityHappySummerBlindBoxCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityHappySummerBlindBoxCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "ItemID", data.mItemID);
-		LuaCfgHelper::readInt(L, "Count", data.mCount);
-		LuaCfgHelper::readInt(L, "Remainder", data.mRemainder);
-		LuaCfgHelper::readInt(L, "BIgPrice", data.mBIgPrice);
-		LuaCfgHelper::readInt(L, "Weight1", data.mWeight1);
-		LuaCfgHelper::readInt(L, "Weight2", data.mWeight2);
-		LuaCfgHelper::readInt(L, "Weight3", data.mWeight3);
-		LuaCfgHelper::readInt(L, "Weight4", data.mWeight4);
-		LuaCfgHelper::readInt(L, "Weight5", data.mWeight5);
-		LuaCfgHelper::readInt(L, "Weight6", data.mWeight6);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityHappySummerBlindBoxCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityHappySummerBlindBoxCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityHappySummerBlindBoxCFG* M_ActivityHappySummerBlindBoxCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityHappySummerBlindBoxCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityHappySummerBlindBoxCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 45
GameConfig/Code/Client/M_ActivityHappySummerBlindBoxCFG.h

@@ -1,45 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityHappySummerBlindBoxCFGData
-{
-	//ID
-	int mID;
-	//道具ID
-	int mItemID;
-	//道具数量
-	int mCount;
-	//剩余次数
-	int mRemainder;
-	//大奖(1,2,3,4,5)
-	int mBIgPrice;
-	//权重1(60-51)
-	int mWeight1;
-	//权重2(50-41)
-	int mWeight2;
-	//权重3(40-31)
-	int mWeight3;
-	//权重4(30-21)
-	int mWeight4;
-	//权重5(20-11)
-	int mWeight5;
-	//权重6(10-1)
-	int mWeight6;
-};
-
-class M_ActivityHappySummerBlindBoxCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityHappySummerBlindBoxCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityHappySummerBlindBoxCFGData* GetData(int ID);
-	const std::map<int, M_ActivityHappySummerBlindBoxCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityHappySummerBlindBoxCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityHappySummerBlindBoxCFGData> mMapData;
-};

+ 0 - 107
GameConfig/Code/Client/M_ActivityHappySummerLuckyTurnCFG.cpp

@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "tinyxml2/tinyxml2.h"
-#include "LuaCfgHelper.h"
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include "M_ActivityHappySummerLuckyTurnCFG.h"
-std::auto_ptr<M_ActivityHappySummerLuckyTurnCFG> M_ActivityHappySummerLuckyTurnCFG::msSingleton(nullptr);
-
-int M_ActivityHappySummerLuckyTurnCFG::GetCount()
-{
-	return (int)mMapData.size();
-}
-
-const M_ActivityHappySummerLuckyTurnCFGData* M_ActivityHappySummerLuckyTurnCFG::GetData(int ID)
-{
-	auto it = mMapData.find(ID);
-	if (it != mMapData.end())
-	{
-		return &it->second;
-	}
-	return NULL;
-}
-
-const std::map<int, M_ActivityHappySummerLuckyTurnCFGData>& M_ActivityHappySummerLuckyTurnCFG::GetMapData()
-{
-	return mMapData;
-}
-
-void M_ActivityHappySummerLuckyTurnCFG::Load()
-{
-	tinyxml2::XMLDocument xmlDoc;
-	std::string content = FileUtils::getInstance()->getStringFromFile("Config/M_ActivityHappySummerLuckyTurnCFG.xml");
-	auto result = xmlDoc.Parse(content.c_str(), content.length());
-	if (result != tinyxml2::XML_SUCCESS)
-	{
-		CCLOGERROR("Result:%d", result);
-		CCASSERT(false, "result != tinyxml2::XML_SUCCESS");
-		return;
-	}
-	auto root = xmlDoc.RootElement();
-	if (root == NULL)
-	{
-		CCASSERT(false, "root == NULL");
-		return;
-	}
-	auto element = root->FirstChildElement("Data");
-	while (element != NULL)
-	{
-		M_ActivityHappySummerLuckyTurnCFGData data;
-		data.mID = element->IntAttribute("ID");
-		data.mItem = element->IntAttribute("Item");
-		data.mCount = element->IntAttribute("Count");
-		data.mWeight = element->IntAttribute("Weight");
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		element = element->NextSiblingElement();
-	}
-	CCLOG("M_ActivityHappySummerLuckyTurnCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityHappySummerLuckyTurnCFG::LoadLua()
-{
-	LuaEngine::getInstance()->executeScriptFile("config/M_ActivityHappySummerLuckyTurnCFG");
-	lua_State* L = LuaEngine::getInstance()->getLuaStack()->getLuaState();
-	lua_getglobal(L, "M_ActivityHappySummerLuckyTurnCFG");
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushstring(L, "datas");
-	lua_gettable(L, -2);
-	CCASSERT(lua_istable(L, -1) == 1, "is not table");
-	lua_pushnil(L);
-	while(lua_next(L, 2))
-	{
-		CCASSERT(lua_istable(L, -1) == 1, "is not table");
-		M_ActivityHappySummerLuckyTurnCFGData data;
-		LuaCfgHelper::readInt(L, "ID", data.mID);
-		LuaCfgHelper::readInt(L, "Item", data.mItem);
-		LuaCfgHelper::readInt(L, "Count", data.mCount);
-		LuaCfgHelper::readInt(L, "Weight", data.mWeight);
-		if (mMapData.find(data.mID) != mMapData.end())std::cout <<"data refind:" << data.mID << std::endl;
-		CCASSERT(mMapData.find(data.mID) == mMapData.end(), "data.mID is exists");
-		mMapData.insert(std::make_pair(data.mID, data));
-		lua_pop(L, 1);
-	}
-	lua_settop(L, 0);
-	CCLOG("M_ActivityHappySummerLuckyTurnCFG Loaded. Load Data:%u", mMapData.size());
-}
-
-void M_ActivityHappySummerLuckyTurnCFG::Reload()
-{
-	mMapData.clear();
-	Load();
-}
-
-M_ActivityHappySummerLuckyTurnCFG* M_ActivityHappySummerLuckyTurnCFG::GetSingleton()
-{
-	if (msSingleton.get() == nullptr)
-	{
-		msSingleton.reset(new M_ActivityHappySummerLuckyTurnCFG());
-	}
-	return msSingleton.get();
-}
-
-void M_ActivityHappySummerLuckyTurnCFG::Release()
-{
-	msSingleton.reset(nullptr);
-}

+ 0 - 31
GameConfig/Code/Client/M_ActivityHappySummerLuckyTurnCFG.h

@@ -1,31 +0,0 @@
-#pragma once
-#include <map>
-struct M_ActivityHappySummerLuckyTurnCFGData
-{
-	//񅧏
-	int mID;
-	//µÀ¾ß
-	int mItem;
-	//ÊýÁ¿
-	int mCount;
-	//È¨ÖØ
-	int mWeight;
-};
-
-class M_ActivityHappySummerLuckyTurnCFG
-{
-public:
-private:
-	static std::auto_ptr<M_ActivityHappySummerLuckyTurnCFG> msSingleton;
-public:
-	int GetCount();
-	const M_ActivityHappySummerLuckyTurnCFGData* GetData(int ID);
-	const std::map<int, M_ActivityHappySummerLuckyTurnCFGData>& GetMapData();
-	void Load();
-	void LoadLua();
-	void Reload();
-	static M_ActivityHappySummerLuckyTurnCFG* GetSingleton();
-	static void Release();
-private:
-	std::map<int, M_ActivityHappySummerLuckyTurnCFGData> mMapData;
-};

Some files were not shown because too many files changed in this diff