Merge branch 'develop' into sdk

src/server/conf/charge/charge_cfg.go

@@ -251,7 +251,7 @@ func GetSpecialShopGrade(Money float64, Type int) int {
 			return v.id
 		}
 	}
-	return l[0].id
+	return l[len(l)-1].id
 }
 
 func GetUnlockShopLv() int {

src/server/unit_test/charge_test.go

@@ -0,0 +1,10 @@
+package unit
+
+import "testing"
+
+func TestChargeRes(t *testing.T) {
+	player := getTestPlayer(t)
+	ChargeMod := player.GetChargeMod()
+	ChargeMod.ZeroUpdate(player.GetChessMod().GetEmitList())
+	player.ChargeBackData()
+}

src/server/unit_test/conf/server.json

@@ -2,15 +2,15 @@
 	"AppID": 0,
 	"LogLevel": "debug", 
 	"LogPath": "./log",
-	"TCPAddr": ":3602",
+	"TCPAddr": ":3601",
 	"WSAddr": ":3567",
 	"RPCAddr": ":50051",
-	"MySqlAddr": "112.124.54.243",
+	"MySqlAddr": "mysql",
 	"MySqlPort": "3306",
 	"MySqlUsr": "root",
-	"MySqlPwd": "-pDvPOK7dp1obN8e6hxSqYl9L4FaTCJDpN60B6I8Vg==",
+	"MySqlPwd": "IOagNEq3C84c-20CmHEin5iODVc=",
 	"MaxConnNum": 20000,
-	"DbName": "pet_home_1",
+	"DbName": "merge_pet_1",
 	"HttpPort": ":8081",
 	"AppPath": "./app",
 	"TELOGDIR" : "./log/teLog/",
@@ -24,18 +24,18 @@
 	"ServerName": "Merge_Pet",
 	"ServerStatus" : 1,
 	"ServerCenter" : 0,
-	"GameConfPath": "D:/Github/pet_home_server/src/server/gamedata/config/",
+	"GameConfPath": "/Github/pet_home_server/src/server/gamedata/config/",
 
 	"ListenAddr":":9002",
 	"CenterAddr": "127.0.0.1:7000",
 	"RemoteAddr":"127.0.0.1:9002",
 	
-	"RedisAddr":"112.124.54.243",          
+	"RedisAddr":"127.0.0.1",          
 	"RedisPort" :"6379",             
 	"RedisPwd"  :"",
 
-	"RedisWriteAddr":"112.124.54.243:6379",
-	"RedisReadAddrs":"112.124.54.243:6379",
+	"RedisWriteAddr":"redis:6379",
+	"RedisReadAddrs":"redis:6379",
 	"RedisMasterName":"mymaster",     
 	"RedisConnType":"Direct",