Merge branch 'dev_spine' of https://git.wdd817.link/puxuan/c1_unity into dev_spine

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-ò¦
+Þ®
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -492,7 +492,18 @@ proClaimed:
 rewards (2.cspb.RewardRrewards"D
 ArenaBountyBoughtNtf
 season
 
(Rseason
-level 
(Rlevel"f
+level 
(Rlevel"6
+TeamSyncMatchReq
+type
 
(	Rtype
+id 
(Rid"<
+TeamSyncMatchRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode"ˆ

+TeamSyncMatchNtf
+
+battle_url
 
(	R	battleUrl(
+player 
(2.cspb.TeamPlayerRplayer
+seed 
(Rseed
+room_id 
(	RroomId"f
 
BossRushGrade
 normal
 
(Rnormal
 superior 
(Rsuperior!
@@ -1002,7 +1013,26 @@ HeroEquips4
 value 
(Rvalue:8
"*
 Recovery
 id
 
(Rid
-ts 
(Rts"
+ts 
(Rts"½
+RankBaseInfo
+id
 
(	Rid
+name 
(	Rname
+level 
(Rlevel
+avatar 
(Ravatar!
+avatar_frame 
(RavatarFrame!
+last_version 
(	RlastVersion
+weapon 
(Rweapon
+skin 
(Rskin
+gender	 
(Rgender!
+nameplate_id
+ 
(RnameplateId.
+nameplate_create_at 
(RnameplateCreateAt"\
+
+TeamPlayer
+robot
 
(Rrobot
+id 
(	Rid
+name 
(	Rname
+level 
(Rlevel"
 CDKeyUseReq
 key
 
(	Rkey"_
 CDKeyUseRsp(
@@ -1310,15 +1340,15 @@ pay_counts (2.cspb.Stat.PayCountsEntryR	payCounts
 key
 
(Rkey
 value 
(Rvalue:8
"
 Request
-id
 
(Rid"¸

+id
 
(Rid"±

 AuthReq
 type
 
(	Rtype
 id 
(	Rid
 token 
(	Rtoken1
 client_info 
(2.cspb.ClientInfoR
-clientInfo"
-sync 
(2.cspb.SyncDataRsync
-	reconnect 
(R	reconnect"ý

+clientInfo
+	reconnect 
(R	reconnect
+	server_id 
(RserverId"Ç
 AuthRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode
 id 
(	Rid
@@ -1328,8 +1358,17 @@ clientInfo"
 	google_id 
(	RgoogleId
 apple_id 
(	RappleId
 facebook_id 
(	R
-facebookId
-banned	 
(Rbanned"C
+facebookId
+vk_id
 
(	RvkId
+banned	 
(Rbanned
+	server_id
+ 
(RserverId;
+
+player_ids (2.cspb.AuthRsp.PlayerIdsEntryR	playerIds
+	create_at 
(RcreateAt<
+PlayerIdsEntry
+key
 
(Rkey
+value 
(	Rvalue:8
"C
 BindReq
 type
 
(	Rtype
 id 
(	Rid
@@ -1780,7 +1819,17 @@ tourn_wave 
(2.cspb.TournWaveR	tournWave"
 id
 
(Rid"p
  TournWaveBountyClaimByDiamondRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode"
-costs (2.cspb.RewardRcosts*“
+costs (2.cspb.RewardRcosts*o
+
BattleMsgType
+	HEARTBEAT
+JOIN

+JOIN_FAILED	
+LEAVE
+SYNC
+CHAT	
+EMOJI
+
+FRAMES*¬
 ErrCode
 SUCCESS
 
@@ -1792,7 +1841,8 @@ tourn_wave 
(2.cspb.TournWaveR	tournWave"
 DUPLICATE_BIND

 ACCOUNT_NOT_EXISTS
 VERSION_IS_NOT_FOUND
-INVALID_CLIENT
+INVALID_CLIENT
+COUNTRY_NOT_ALLOWED
 INVALID_PARAMSd
 CFG_IS_NOT_FOUNDe
 ITEM_IS_NOT_ENOUGHf

Tools/proto/proto.py

@@ -13,7 +13,9 @@ TAB = "    "
 lua_list = []
 lua_list.append("local ProtoMsgType = {\n")
 
-with open(sys.argv[1] + "\msgid.def", "r") as f:
+full_path_os = os.path.join(sys.argv[1], "msgid.def")
+
+with open(full_path_os, "r") as f:
 	data = f.readlines()
 
 	lua_list.append(TAB + "FromMsgId = {\n")