Просмотр исходного кода

game下修改为C#变量命名风格

tanghai 14 лет назад
Родитель
Сommit
9fecc39e5e

+ 13 - 14
Cpp/Game/BehaviorTree/BehaviorTree.cc

@@ -7,31 +7,30 @@
 
 namespace Egametang {
 
-BehaviorTree::BehaviorTree(NodeFactories& factories, const BehaviorTreeConf& tree_conf):
+BehaviorTree::BehaviorTree(NodeFactories& factories, const BehaviorTreeConf& treeConf):
 		node(NULL)
 {
-	type = tree_conf.type();
+	type = treeConf.type();
 
-	const BehaviorNodeConf& node_conf = tree_conf.node();
-	if (tree_conf.has_node())
+	if (treeConf.has_node())
 	{
-		const BehaviorNodeConf& node_conf = tree_conf.node();
-		BuildTree(factories, node_conf, node);
+		const BehaviorNodeConf& nodeConf = treeConf.node();
+		BuildTree(factories, nodeConf, node);
 	}
 }
 
 void BehaviorTree::BuildTree(
-		NodeFactories& factories, const BehaviorNodeConf& node_conf,
+		NodeFactories& factories, const BehaviorNodeConf& nodeConf,
 		BehaviorNode*& node)
 {
-	int32 type = node_conf.type();
-	node = factories.GetInstance(node_conf);
-	for (int i = 0; i < node_conf.node_size(); ++i)
+	int32 type = nodeConf.type();
+	node = factories.GetInstance(nodeConf);
+	for (int i = 0; i < nodeConf.node_size(); ++i)
 	{
-		const BehaviorNodeConf& logic_node_conf = node_conf.node(i);
-		BehaviorNode* logic_node = NULL;
-		BuildTree(factories, logic_node_conf, logic_node);
-		node->AddChildNode(logic_node);
+		const BehaviorNodeConf& logicNodeConf = nodeConf.node(i);
+		BehaviorNode* logicNode = NULL;
+		BuildTree(factories, logicNodeConf, logicNode);
+		node->AddChildNode(logicNode);
 	}
 }
 

+ 2 - 2
Cpp/Game/BehaviorTree/BehaviorTree.h

@@ -15,11 +15,11 @@ private:
 	int type;
 	BehaviorNode* node;
 
-	void BuildTree(NodeFactories& factories, const BehaviorNodeConf& node_conf,
+	void BuildTree(NodeFactories& factories, const BehaviorNodeConf& nodeConf,
 			BehaviorNode*& node);
 
 public:
-	BehaviorTree(NodeFactories& factories, const BehaviorTreeConf& tree_conf);
+	BehaviorTree(NodeFactories& factories, const BehaviorTreeConf& treeConf);
 
 	~BehaviorTree();
 

+ 2 - 2
Cpp/Game/BehaviorTree/BuffType.cc

@@ -6,7 +6,7 @@
 namespace Egametang {
 
 BuffType::BuffType(int32 type, int32 buff_type):
-		BehaviorNode(type), buff_type(buff_type)
+		BehaviorNode(type), buffType(buff_type)
 {
 }
 
@@ -17,7 +17,7 @@ BuffType::~BuffType()
 bool BuffType::Run(ContexIf* contex)
 {
 	Buff* buff = contex->GetBuff();
-	return buff->buff_type == buff_type;
+	return buff->buffType == buffType;
 }
 
 std::string BuffType::ToString()

+ 1 - 1
Cpp/Game/BehaviorTree/BuffType.h

@@ -13,7 +13,7 @@ class ContexIf;
 class BuffType: public BehaviorNode
 {
 private:
-	int32 buff_type;
+	int32 buffType;
 
 public:
 	BuffType(int32 type, int buff_type);

+ 1 - 1
Cpp/Game/BehaviorTree/GameEventsTest.cc

@@ -61,7 +61,7 @@ TEST_F(GameEventsTest, Vampire)
 	ASSERT_EQ(2000, caster.health);
 	ASSERT_EQ(2000, victim.health);
 
-	buff.buff_type = 2;
+	buff.buffType = 2;
 	game_events.Excute(ON_HIT, &contex);
 	ASSERT_EQ(2100, caster.health);
 	ASSERT_EQ(1900, victim.health);

+ 2 - 2
Cpp/Game/BehaviorTree/SpellBuff.h

@@ -19,10 +19,10 @@ public:
 class Buff
 {
 public:
-	int buff_type;
+	int buffType;
 
 public:
-	Buff(): buff_type(0)
+	Buff(): buffType(0)
 	{
 	}
 };

+ 4 - 4
Cpp/Platform/Rpc/MethodInfo.h

@@ -14,11 +14,11 @@ struct MethodInfo
 	const google::protobuf::Message* requestPrototype;
 	const google::protobuf::Message* responsePrototype;
 
-	MethodInfo(RpcServicePtr service, const google::protobuf::MethodDescriptor* method_descriptor):
-		service(service), methodDescriptor(method_descriptor)
+	MethodInfo(RpcServicePtr service, const google::protobuf::MethodDescriptor* methodDescriptor):
+		service(service), methodDescriptor(methodDescriptor)
 	{
-		requestPrototype = &service->GetRequestPrototype(method_descriptor);
-		responsePrototype = &service->GetResponsePrototype(method_descriptor);
+		requestPrototype = &service->GetRequestPrototype(methodDescriptor);
+		responsePrototype = &service->GetResponsePrototype(methodDescriptor);
 	}
 };