优化-规范化命名

NingLeixueR · NingLeixueR · commit 41b94d62e5c0 · 2024-12-19T12:17:16.000+08:00
优化-规范化命名
diff --git a/public/cpp/actor/actor_base/nguid.cpp b/public/cpp/actor/actor_base/nguid.cpp
@@ -9,14 +9,19 @@ namespace ngl
 		return (i64_actorid)lguid;
 	}
 
+	int16_t nlogactor::m_localnum = 0;
+
 	nlogactor::nlogactor(ENUM_ACTOR avalue1, ELOG_TYPE avalue2) :
 		m_value32(0)
 	{
 		m_value16[0] = avalue1;
 		if (avalue2 == ELOG_TYPE::ELOG_LOCAL)
 		{
-			static int16_t lnum = (ttab_servers::tab()->m_type * 100 + ttab_servers::tab()->m_tcount);
-			m_value16[1] = 0x8000 | lnum;
+			if (m_localnum == 0)
+			{
+				m_localnum = (ttab_servers::tab()->m_type * 100 + ttab_servers::tab()->m_tcount);
+			}
+			m_value16[1] = 0x8000 | m_localnum;
 		}
 		else
 		{
diff --git a/public/cpp/actor/actor_base/nguid.h b/public/cpp/actor/actor_base/nguid.h
@@ -326,6 +326,8 @@ namespace ngl
 		int32_t m_value32;
 		int16_t m_value16[2];	//ENUM_ACTOR aactortype, ELOG_TYPE alogtype
 
+		static int16_t m_localnum;
+
 		explicit nlogactor(int32_t avalue) :
 			m_value32(avalue)
 		{}
diff --git a/public/cpp/actor/actor_logic/game/actor_role.h b/public/cpp/actor/actor_logic/game/actor_role.h
@@ -80,7 +80,7 @@ namespace ngl
 		//# �����ת������
 		ecross forward_type(const pbnet::PROBUFF_NET_CHAT& adata)
 		{
-			int lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			if (lnow < m_info.notalkutc())
 			{
 				auto pro = std::make_shared<pbnet::PROBUFF_NET_ERROR>();
diff --git a/public/cpp/logic/public/public/brief/briefdb.h b/public/cpp/logic/public/public/brief/briefdb.h
@@ -56,7 +56,7 @@ namespace ngl
 			for (const std::pair<const nguid, data_modified<pbdb::db_brief>>& pair : data())
 			{
 				const pbdb::db_brief& lbrief = pair.second.getconst();
-				std::format(
+				(*lstream) << std::format(
 					"++++++++++++++++++++++\n"
 					"+m_id={}\n"
 					"+m_lv={}\n"
diff --git a/public/cpp/logic/public/public/calendar/calendar.h b/public/cpp/logic/public/public/calendar/calendar.h
@@ -71,7 +71,7 @@ namespace ngl
 
 			auto lstream = log_error();
 			(*lstream) << "actor_calendar###loaddb_finish" << std::endl;
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			for (std::pair<const nguid, data_modified<pbdb::db_calendar> >& item : *lmap)
 			{
 				(*lstream) << std::format("calendar[{}]", item.first.id()) << std::endl;
diff --git a/public/cpp/logic/public/public/mail/mail.h b/public/cpp/logic/public/public/mail/mail.h
@@ -107,7 +107,7 @@ namespace ngl
 			int32_t& lid = maxid(aroleid);
 			lmail.set_m_id(++lid);
 			lmail.set_m_tid(atid);
-			lmail.set_m_createutc(localtime::gettime());
+			lmail.set_m_createutc((int32_t)localtime::gettime());
 			lmail.set_m_draw(false);
 			lmail.set_m_read(false);
 			lmail.set_m_prams(aparm);
diff --git a/public/cpp/logic/public/public/notice/notice.h b/public/cpp/logic/public/public/notice/notice.h
@@ -70,7 +70,7 @@ namespace ngl
 		{
 			static int32_t lasttime = 0;
 			// ʮ����ˢ��һ��
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			if (lasttime == 0 || lnow > (lasttime + (10 * localtime::MINUTES_SECOND)))
 			{
 				lasttime = lnow;
diff --git a/public/cpp/logic/public/public/ranklist/ranklist.h b/public/cpp/logic/public/public/ranklist/ranklist.h
@@ -40,7 +40,7 @@ namespace ngl
 			}
 			else
 			{
-				m_time[atype] = localtime::gettime();
+				m_time[atype] = (int32_t)localtime::gettime();
 			}
 		}
 
@@ -204,7 +204,7 @@ namespace ngl
 			{
 				if (litem.equal_value(atype, itor->second) == false)
 				{
-					litem.m_time[atype] = localtime::gettime();
+					litem.m_time[atype] = (int32_t)localtime::gettime();
 					pbdb::db_ranklist* lpdata = get(abrief.m_id());
 					litem.change(atype, *lpdata);
 					return true;
diff --git a/public/cpp/logic/public/role/attribute/attribute_value.h b/public/cpp/logic/public/role/attribute/attribute_value.h
@@ -84,7 +84,7 @@ namespace ngl
 			m_fightscore = 0;
 			for (const auto& [key, value] : m_fight)
 			{
-				m_fightscore += fight(key, value);
+				m_fightscore += fight(key, (double)value);
 			}
 			return m_fightscore;
 		}
@@ -130,25 +130,25 @@ namespace ngl
 		// ��������
 		void set_attr(EnumAttribute atype, double avalues)
 		{
-			m_attr[atype] = avalues;
+			m_attr[atype] = (int64_t)avalues;
 		}
 
 		// ���ӱ�����������
 		void set_rattr(EnumAttribute atype, double avalues)
 		{
-			m_rattr[atype] = avalues;
+			m_rattr[atype] = (float)avalues;
 		}
 
 		// ���������������
 		void set_father_rattr(EnumModule amodule, EnumAttribute atype, double avalues)
 		{
-			m_crattr[amodule][atype] = avalues;
+			m_crattr[amodule][atype] = (float)avalues;
 		}
 
 		// ��ȡ����
 		double get_attr(EnumAttribute atype)
 		{
-			return m_attr[atype];
+			return (double)m_attr[atype];
 		}
 
 		// ��ȡ������������
diff --git a/public/cpp/logic/public/template_tab/ttab_calendar.h b/public/cpp/logic/public/template_tab/ttab_calendar.h
@@ -143,21 +143,21 @@ namespace ngl
 
 		static void init_week(int aid, std::vector<tweek>& aweek)
 		{
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			std::vector<int32_t> lvec;
 			int32_t lid = 0;
 			for (auto& item : aweek)
 			{
-				int lweekdaystart = localtime::getweekday(item.m_weekstart == localtime::WEEK_DAY ? 0: item.m_weekstart, 0, 0, 0);
-				int lweekdayfinish = localtime::getweekday(item.m_weekfinish == localtime::WEEK_DAY ? 0 : item.m_weekfinish, 0, 0, 0);
+				int32_t lweekdaystart = (int32_t)localtime::getweekday(item.m_weekstart == localtime::WEEK_DAY ? 0: item.m_weekstart, 0, 0, 0);
+				int32_t lweekdayfinish = (int32_t)localtime::getweekday(item.m_weekfinish == localtime::WEEK_DAY ? 0 : item.m_weekfinish, 0, 0, 0);
 
 				std::pair<bool, int32_t> lpairopen = daysecond(item.m_opentime.c_str());
 				std::pair<bool, int32_t> lpairclose = daysecond(item.m_closetime.c_str());
 				if (lpairclose.first && lpairopen.first)
 				{
 					assert(lpairclose.second > lpairopen.second);
-					int lbeg = lweekdaystart + lpairopen.second;
-					int lend = lweekdayfinish + lpairclose.second;
+					int32_t lbeg = lweekdaystart + lpairopen.second;
+					int32_t lend = lweekdayfinish + lpairclose.second;
 					assert(lend > lbeg);
 					if (lnow > lend)
 					{
@@ -172,7 +172,7 @@ namespace ngl
 
 		static void init_serveropen(int aid, std::vector<tserveropen>& atserveropen)
 		{
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			int32_t lopentime = sysconfig::open_servertime();
 			int32_t lid = 0;
 			for (auto& item : atserveropen)
@@ -198,11 +198,11 @@ namespace ngl
 
 		static void init_tregularslot(int aid, std::vector<tregularslot>& atregularslot)
 		{
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			for (auto& item : atregularslot)
 			{
-				int32_t lbeg = localtime::str2time(item.m_opentime.c_str(), "%Y-%m-%d %H:%M:%S");
-				int32_t lclose = localtime::str2time(item.m_closetime.c_str(), "%Y-%m-%d %H:%M:%S");
+				int32_t lbeg = (int32_t)localtime::str2time(item.m_opentime.c_str(), "%Y-%m-%d %H:%M:%S");
+				int32_t lclose = (int32_t)localtime::str2time(item.m_closetime.c_str(), "%Y-%m-%d %H:%M:%S");
 				if (lnow > lclose)
 					continue;
 				m_data[aid].add(lbeg, lclose);
@@ -223,7 +223,7 @@ namespace ngl
 			data* lpdata = tools::findmap(m_data, aid);
 			if (lpdata == nullptr)
 				return false;
-			int32_t lnow = localtime::gettime();
+			int32_t lnow = (int32_t)localtime::gettime();
 			for (int64_t item : lpdata->m_utc)
 			{
 				if (lnow >= data::beg(item) && lnow <= data::end(item))
diff --git a/public/cpp/tools/serialize/serialize.h b/public/cpp/tools/serialize/serialize.h
@@ -429,7 +429,7 @@ namespace ngl
 		template <typename T>
 		inline bool push_stlsize(const T& astl)
 		{
-			int16_t lsize = astl.size();
+			int16_t lsize = (int16_t)astl.size();
 			return push(lsize);
 		}
 
diff --git a/server/node/core/server_main.h b/server/node/core/server_main.h
@@ -46,7 +46,7 @@ void init_DB_ROLE(const char* aname, int beg)
 		lrolebase->set_m_lv(i);
 		lrolebase->set_m_moneygold(i + 1000);
 		lrolebase->set_m_moneysilver(i + 2000);
-		lrolebase->set_m_createutc(ngl::localtime::gettime());
+		lrolebase->set_m_createutc((int32_t)ngl::localtime::gettime());
 		ngl::actor_dbtab<pbdb::ENUM_DB_BRIEF, pbdb::db_brief>::save(0, *lrolebase);
 
 		ngl::actor_dbtab<pbdb::ENUM_DB_ROLE, pbdb::db_role>::save(0, ltemp);
@@ -169,8 +169,8 @@ void init_DB_NOTICE()
 			continue;
 
 		ltemp.set_m_notice(lvec[i]);
-		ltemp.set_m_starttime(time(NULL));
-		ltemp.set_m_finishtime(time(NULL) + 36000);
+		ltemp.set_m_starttime((int32_t)time(NULL));
+		ltemp.set_m_finishtime((int32_t)time(NULL) + 36000);
 		ngl::actor_dbtab<pbdb::ENUM_DB_NOTICE, pbdb::db_notice>::save(0, ltemp);
 	}
 }
@@ -179,7 +179,7 @@ void init_DB_KEYVAL()
 {
 	pbdb::db_keyvalue ltemp;
 	ltemp.set_m_id(pbdb::db_keyvalue_ekv_none);
-	int lnow = ngl::localtime::gettime();
+	int32_t lnow = (int32_t)ngl::localtime::gettime();
 	std::string ltempstr = std::format("{}*{}", lnow, ngl::localtime::time2str(lnow, "%y/%m/%d %H:%M:%S"));
 	ltemp.set_m_value(ltempstr);
 	ngl::actor_dbtab<pbdb::ENUM_DB_KEYVALUE, pbdb::db_keyvalue>::save(0, ltemp);
@@ -192,7 +192,7 @@ void init_DB_FAMILY()
 		pbdb::db_family ltemp;
 
 		ltemp.set_m_id(ngl::nguid::make(ngl::ACTOR_FAMILY, tab_self_area, i));
-		ltemp.set_m_createutc(ngl::localtime::gettime());
+		ltemp.set_m_createutc((int32_t)ngl::localtime::gettime());
 		ltemp.set_m_exp(100);
 		ltemp.set_m_lv(1);
 
@@ -202,10 +202,10 @@ void init_DB_FAMILY()
 		ngl::actor_dbtab<pbdb::ENUM_DB_FAMILY, pbdb::db_family>::save(0, ltemp);
 
 		pbdb::db_familyer ltempfamilyer;
-		ltempfamilyer.set_m_joinutc(ngl::localtime::gettime());
+		ltempfamilyer.set_m_joinutc((int32_t)ngl::localtime::gettime());
 		ltempfamilyer.set_m_id(ngl::nguid::make(ngl::ACTOR_ROLE, tab_self_area, i));
 		ltempfamilyer.set_m_position(pbdb::db_familyer_eposition_leader);
-		ltempfamilyer.set_m_lastsignutc(ngl::localtime::gettime());
+		ltempfamilyer.set_m_lastsignutc((int32_t)ngl::localtime::gettime());
 		ngl::actor_dbtab<pbdb::ENUM_DB_FAMILYER, pbdb::db_familyer>::save(0, ltempfamilyer);
 	}
 }
@@ -217,7 +217,7 @@ void init_DB_RANKLIST()
 		pbdb::db_ranklist ltemp;
 		ltemp.set_m_id(ngl::nguid::make(ngl::ACTOR_ROLE, tab_self_area, i));
 		pbdb::rankitem lrankitem;
-		lrankitem.set_m_time(ngl::localtime::gettime());
+		lrankitem.set_m_time((int32_t)ngl::localtime::gettime());
 		lrankitem.set_m_value(i);
 		(*ltemp.mutable_m_items())[(int)pbdb::eranklist::lv] = lrankitem;
 		ngl::actor_dbtab<pbdb::ENUM_DB_RANKLIST, pbdb::db_ranklist>::save(0, ltemp);

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,19 @@ namespace ngl`
`9`	`9`	`return (i64_actorid)lguid;`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ int16_t nlogactor::m_localnum = 0;`
	`13`	`+`
`12`	`14`	`nlogactor::nlogactor(ENUM_ACTOR avalue1, ELOG_TYPE avalue2) :`
`13`	`15`	`m_value32(0)`
`14`	`16`	`{`
`15`	`17`	`m_value16[0] = avalue1;`
`16`	`18`	`if (avalue2 == ELOG_TYPE::ELOG_LOCAL)`
`17`	`19`	`{`
`18`		`- static int16_t lnum = (ttab_servers::tab()->m_type * 100 + ttab_servers::tab()->m_tcount);`
`19`		`- m_value16[1] = 0x8000 \| lnum;`
	`20`	`+ if (m_localnum == 0)`
	`21`	`+ {`
	`22`	`+ m_localnum = (ttab_servers::tab()->m_type * 100 + ttab_servers::tab()->m_tcount);`
	`23`	`+ }`
	`24`	`+ m_value16[1] = 0x8000 \| m_localnum;`
`20`	`25`	`}`
`21`	`26`	`else`
`22`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ namespace ngl`
`80`	`80`	`//# 聊天的转发类型`
`81`	`81`	`ecross forward_type(const pbnet::PROBUFF_NET_CHAT& adata)`
`82`	`82`	`{`
`83`		`- int lnow = localtime::gettime();`
	`83`	`+ int32_t lnow = (int32_t)localtime::gettime();`
`84`	`84`	`if (lnow < m_info.notalkutc())`
`85`	`85`	`{`
`86`	`86`	`auto pro = std::make_shared<pbnet::PROBUFF_NET_ERROR>();`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace ngl`
`56`	`56`	`for (const std::pair<const nguid, data_modified<pbdb::db_brief>>& pair : data())`
`57`	`57`	`{`
`58`	`58`	`const pbdb::db_brief& lbrief = pair.second.getconst();`
`59`		`- std::format(`
	`59`	`+ (*lstream) << std::format(`
`60`	`60`	`"++++++++++++++++++++++\n"`
`61`	`61`	`"+m_id={}\n"`
`62`	`62`	`"+m_lv={}\n"`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ namespace ngl`
`71`	`71`
`72`	`72`	`auto lstream = log_error();`
`73`	`73`	`(*lstream) << "actor_calendar###loaddb_finish" << std::endl;`
`74`		`- int32_t lnow = localtime::gettime();`
	`74`	`+ int32_t lnow = (int32_t)localtime::gettime();`
`75`	`75`	`for (std::pair<const nguid, data_modified<pbdb::db_calendar> >& item : *lmap)`
`76`	`76`	`{`
`77`	`77`	`(*lstream) << std::format("calendar[{}]", item.first.id()) << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ namespace ngl`
`70`	`70`	`{`
`71`	`71`	`static int32_t lasttime = 0;`
`72`	`72`	`// Ê®·ÖÖÓË¢ÐÂÒ»´Î`
`73`		`- int32_t lnow = localtime::gettime();`
	`73`	`+ int32_t lnow = (int32_t)localtime::gettime();`
`74`	`74`	`if (lasttime == 0 \|\| lnow > (lasttime + (10 * localtime::MINUTES_SECOND)))`
`75`	`75`	`{`
`76`	`76`	`lasttime = lnow;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace ngl`
`40`	`40`	`}`
`41`	`41`	`else`
`42`	`42`	`{`
`43`		`- m_time[atype] = localtime::gettime();`
	`43`	`+ m_time[atype] = (int32_t)localtime::gettime();`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -204,7 +204,7 @@ namespace ngl`
`204`	`204`	`{`
`205`	`205`	`if (litem.equal_value(atype, itor->second) == false)`
`206`	`206`	`{`
`207`		`- litem.m_time[atype] = localtime::gettime();`
	`207`	`+ litem.m_time[atype] = (int32_t)localtime::gettime();`
`208`	`208`	`pbdb::db_ranklist* lpdata = get(abrief.m_id());`
`209`	`209`	`litem.change(atype, *lpdata);`
`210`	`210`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ namespace ngl`
`84`	`84`	`m_fightscore = 0;`
`85`	`85`	`for (const auto& [key, value] : m_fight)`
`86`	`86`	`{`
`87`		`- m_fightscore += fight(key, value);`
	`87`	`+ m_fightscore += fight(key, (double)value);`
`88`	`88`	`}`
`89`	`89`	`return m_fightscore;`
`90`	`90`	`}`
`@@ -130,25 +130,25 @@ namespace ngl`
`130`	`130`	`// 添加属性`
`131`	`131`	`void set_attr(EnumAttribute atype, double avalues)`
`132`	`132`	`{`
`133`		`- m_attr[atype] = avalues;`
	`133`	`+ m_attr[atype] = (int64_t)avalues;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// 添加比例属性属性`
`137`	`137`	`void set_rattr(EnumAttribute atype, double avalues)`
`138`	`138`	`{`
`139`		`- m_rattr[atype] = avalues;`
	`139`	`+ m_rattr[atype] = (float)avalues;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// 给父结点添加属性`
`143`	`143`	`void set_father_rattr(EnumModule amodule, EnumAttribute atype, double avalues)`
`144`	`144`	`{`
`145`		`- m_crattr[amodule][atype] = avalues;`
	`145`	`+ m_crattr[amodule][atype] = (float)avalues;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`// 获取属性`
`149`	`149`	`double get_attr(EnumAttribute atype)`
`150`	`150`	`{`
`151`		`- return m_attr[atype];`
	`151`	`+ return (double)m_attr[atype];`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// 获取比例属性属性`