Ver código fonte

更新配置。

huangjinghao 1 mês atrás
pai
commit
f7f6682919

+ 1 - 1
GameConfig/CFG.check

@@ -1,4 +1,4 @@
 D:\git\newWork\FishConfig\GameConfig\M_i18n.xls:-192557145
-D:\git\newWork\FishConfig\GameConfig\M_Global_Config.xls:1026559635
+D:\git\newWork\FishConfig\GameConfig\M_Global_Config.xls:73136324
 D:\git\newWork\FishConfig\GameConfig\SensitiveWordCFG.xls:-583314849
 D:\git\newWork\FishConfig\GameConfig\M_test.xls:209833058

+ 2 - 0
GameConfig/Code/Client/M_Global_Config.cpp

@@ -48,6 +48,7 @@ void M_Global_Config::Load()
 	{
 		M_Global_ConfigData data;
 		data.mKey = element->Attribute("Key");
+		data.mDesc = element->Attribute("Desc");
 		data.mIntValue = element->IntAttribute("IntValue");
 		{
 			const char* IntListValue = element->Attribute("IntListValue");
@@ -96,6 +97,7 @@ void M_Global_Config::LoadLua()
 		CCASSERT(lua_istable(L, -1) == 1, "is not table");
 		M_Global_ConfigData data;
 		LuaCfgHelper::readString(L, "Key", data.mKey);
+		LuaCfgHelper::readString(L, "Desc", data.mDesc);
 		LuaCfgHelper::readInt(L, "IntValue", data.mIntValue);
 		LuaCfgHelper::readVectorInt(L, "IntListValue", data.mIntListValue);
 		LuaCfgHelper::readString(L, "StrValue", data.mStrValue);

+ 2 - 0
GameConfig/Code/Client/M_Global_Config.h

@@ -4,6 +4,8 @@ struct M_Global_ConfigData
 {
 	//Key
 	std::string mKey;
+	//±¸×¢
+	std::string mDesc;
 	//ÊýÖµ
 	int mIntValue;
 	//ÊýÖµÁбí

+ 1 - 0
GameConfig/Code/Server/M_Global_Config.cpp

@@ -70,6 +70,7 @@ void M_Global_Config::Load(const std::string& path)
 	{
 		M_Global_ConfigData data;
 		data.mKey = element->Attribute("Key");
+		data.mDesc = element->Attribute("Desc");
 		data.mIntValue = element->IntAttribute("IntValue");
 		{
 			const char* IntListValue = element->Attribute("IntListValue");

+ 2 - 0
GameConfig/Code/Server/M_Global_Config.h

@@ -5,6 +5,8 @@ struct M_Global_ConfigData
 {
 	//Key
 	std::string mKey;
+	//±¸×¢
+	std::string mDesc;
 	//ÊýÖµ
 	int mIntValue;
 	//ÊýÖµÁбí

+ 4 - 2
GameConfig/Lua/M_Global_Config.lua

@@ -9,8 +9,10 @@ end
 
 function M_Global_Config:init()
 	self.datas = {}
-	self.datas["TestKey1"] = {Key = "TestKey1", IntValue = 1, IntListValue = {2,3}, StrValue = "", StrListValue = {"lbt","lbbt"}, BoolValue = true}
-	self.datas["TestKey2"] = {Key = "TestKey2", IntValue = 2, IntListValue = {}, StrValue = "lbt", StrListValue = {}, BoolValue = false}
+	self.datas["TestKey1"] = {Key = "TestKey1", Desc = "XX字段", IntValue = 1, IntListValue = {2,3}, StrValue = "", StrListValue = {"lbt","lbbt"}, BoolValue = true}
+	self.datas["TestKey2"] = {Key = "TestKey2", Desc = "XX说明", IntValue = 2, IntListValue = {}, StrValue = "lbt", StrListValue = {}, BoolValue = false}
+	self.datas["dropGL"] = {Key = "dropGL", Desc = "道县id8 随机强化石打开获取权重,权重", IntValue = nil, IntListValue = {10,20,50,30}, StrValue = "", StrListValue = {}, BoolValue = nil}
+	self.datas["dropID"] = {Key = "dropID", Desc = "道县id8 随机强化石打开获取道具ID,道具ID", IntValue = nil, IntListValue = {11,22,15,13}, StrValue = "", StrListValue = {}, BoolValue = nil}
 end
 
 M_Global_Config:init()

BIN
GameConfig/M_Global_Config.xls


+ 4 - 2
GameConfig/Xml/M_Global_Config.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data Key="TestKey1" IntValue="1" IntListValue="2,3" StrValue="" StrListValue="lbt,lbbt" BoolValue="true" />
-	<Data Key="TestKey2" IntValue="2" IntListValue="" StrValue="lbt" StrListValue="" BoolValue="false" />
+	<Data Key="TestKey1" Desc="XX字段" IntValue="1" IntListValue="2,3" StrValue="" StrListValue="lbt,lbbt" BoolValue="true" />
+	<Data Key="TestKey2" Desc="XX说明" IntValue="2" IntListValue="" StrValue="lbt" StrListValue="" BoolValue="false" />
+	<Data Key="dropGL" Desc="道县id8 随机强化石打开获取权重,权重" IntValue="" IntListValue="10,20,50,30" StrValue="" StrListValue="" BoolValue="" />
+	<Data Key="dropID" Desc="道县id8 随机强化石打开获取道具ID,道具ID" IntValue="" IntListValue="11,22,15,13" StrValue="" StrListValue="" BoolValue="" />
 </Root>

+ 6 - 2
GameConfig/json/M_Global_Config.json

@@ -1,5 +1,9 @@
-{"TestKey1":{"Key":"TestKey1","IntValue":1,"IntListValue":[2,3],"StrValue":"","StrListValue":["lbt","lbbt"],"BoolValue":true}
+{"TestKey1":{"Key":"TestKey1","Desc":"XX字段","IntValue":1,"IntListValue":[2,3],"StrValue":"","StrListValue":["lbt","lbbt"],"BoolValue":true}
 
-,"TestKey2":{"Key":"TestKey2","IntValue":2,"IntListValue":[],"StrValue":"lbt","StrListValue":[],"BoolValue":false}
+,"TestKey2":{"Key":"TestKey2","Desc":"XX说明","IntValue":2,"IntListValue":[],"StrValue":"lbt","StrListValue":[],"BoolValue":false}
+
+,"dropGL":{"Key":"dropGL","Desc":"道县id8 随机强化石打开获取权重,权重","IntValue":0,"IntListValue":[10,20,50,30],"StrValue":"","StrListValue":[],"BoolValue":false}
+
+,"dropID":{"Key":"dropID","Desc":"道县id8 随机强化石打开获取道具ID,道具ID","IntValue":0,"IntListValue":[11,22,15,13],"StrValue":"","StrListValue":[],"BoolValue":false}
 
 }

+ 8 - 4
GameConfig/ts/M_Global_Config.ts

@@ -1,12 +1,16 @@
-// Key:Key, IntValue:数值, IntListValue:数值列表, StrValue:字符串, StrListValue:字符串列表, BoolValue:布尔值参数
+// Key:Key, Desc:备注, IntValue:数值, IntListValue:数值列表, StrValue:字符串, StrListValue:字符串列表, BoolValue:布尔值参数
 
 export default class M_Global_Config {
   private static data =
-      {"TestKey1":{"Key":"TestKey1","IntValue":1,"IntListValue":[2,3],"StrValue":"","StrListValue":["lbt","lbbt"],"BoolValue":true}
+      {"TestKey1":{"Key":"TestKey1","Desc":"XX字段","IntValue":1,"IntListValue":[2,3],"StrValue":"","StrListValue":["lbt","lbbt"],"BoolValue":true}
 
-      ,"TestKey2":{"Key":"TestKey2","IntValue":2,"IntListValue":[],"StrValue":"lbt","StrListValue":[],"BoolValue":false}
+      ,"TestKey2":{"Key":"TestKey2","Desc":"XX说明","IntValue":2,"IntListValue":[],"StrValue":"lbt","StrListValue":[],"BoolValue":false}
 
-      }// Key:Key, IntValue:数值, IntListValue:数值列表, StrValue:字符串, StrListValue:字符串列表, BoolValue:布尔值参数
+      ,"dropGL":{"Key":"dropGL","Desc":"道县id8 随机强化石打开获取权重,权重","IntValue":0,"IntListValue":[10,20,50,30],"StrValue":"","StrListValue":[],"BoolValue":false}
+
+      ,"dropID":{"Key":"dropID","Desc":"道县id8 随机强化石打开获取道具ID,道具ID","IntValue":0,"IntListValue":[11,22,15,13],"StrValue":"","StrListValue":[],"BoolValue":false}
+
+      }// Key:Key, Desc:备注, IntValue:数值, IntListValue:数值列表, StrValue:字符串, StrListValue:字符串列表, BoolValue:布尔值参数
 
 
     static getData(key: any): any {