Updated TouchEventsManager to support input from Keyboard as well as an additional atk btn.

battle_srv/models/room.go

@@ -345,13 +345,6 @@ func (pR *Room) ConvertToLastUsedRenderFrameId(inputFrameId int32, inputDelayFra
 	return ((inputFrameId << pR.InputScaleFrames) + inputDelayFrames + (1 << pR.InputScaleFrames) - 1)
 }
 
-func (pR *Room) EncodeUpsyncCmd(upsyncCmd *InputFrameUpsync) uint64 {
-	var ret uint64 = 0
-	// There're 13 possible directions, occupying the first 4 bits, no need to shift
-	ret += uint64(upsyncCmd.EncodedDir)
-	return ret
-}
-
 func (pR *Room) RenderFrameBufferString() string {
 	return fmt.Sprintf("{renderFrameId: %d, stRenderFrameId: %d, edRenderFrameId: %d, lastAllConfirmedRenderFrameId: %d}", pR.RenderFrameId, pR.RenderFrameBuffer.StFrameId, pR.RenderFrameBuffer.EdFrameId, pR.CurDynamicsRenderFrameId)
 }
@@ -1073,7 +1066,7 @@ func (pR *Room) prefabInputFrameDownsync(inputFrameId int32) *InputFrameDownsync
 			ConfirmedList: uint64(0),
 		}
 	} else {
-		tmp := pR.InputsBuffer.GetByFrameId(inputFrameId - 1)
+		tmp := pR.InputsBuffer.GetByFrameId(inputFrameId - 1) // There's no need for the backend to find the "lastAllConfirmed inputs" for prefabbing, either "BackendDynamicsEnabled" is true or false
 		if nil == tmp {
 			panic(fmt.Sprintf("Error prefabbing inputFrameDownsync: roomId=%v, InputsBuffer=%v", pR.Id, pR.InputsBufferString(false)))
 		}
@@ -1114,7 +1107,7 @@ func (pR *Room) markConfirmationIfApplicable() {
 			}
 			inputFrameUpsync := tmp.(*InputFrameUpsync)
 			indiceInJoinIndexBooleanArr := uint32(player.JoinIndex - 1)
-			inputFrameDownsync.InputList[indiceInJoinIndexBooleanArr] = pR.EncodeUpsyncCmd(inputFrameUpsync)
+			inputFrameDownsync.InputList[indiceInJoinIndexBooleanArr] = inputFrameUpsync.Encoded 
 			inputFrameDownsync.ConfirmedList |= (1 << indiceInJoinIndexBooleanArr)
 		}
 
@@ -1239,9 +1232,8 @@ func (pR *Room) applyInputFrameDownsyncDynamicsOnSingleRenderFrame(delayedInputF
 			joinIndex := player.JoinIndex
 			effPushbacks[joinIndex-1].X, effPushbacks[joinIndex-1].Y = float64(0), float64(0)
 			currPlayerDownsync := currRenderFrame.Players[playerId]
-			encodedInput := inputList[joinIndex-1]
+			decodedInput := pR.decodeInput(inputList[joinIndex-1])
-			decodedInput := DIRECTION_DECODER[encodedInput]
+			proposedVirtualGridDx, proposedVirtualGridDy := (decodedInput.Dx + decodedInput.Dx*currPlayerDownsync.Speed), (decodedInput.Dy + decodedInput.Dy*currPlayerDownsync.Speed)
-			proposedVirtualGridDx, proposedVirtualGridDy := (decodedInput[0] + decodedInput[0]*currPlayerDownsync.Speed), (decodedInput[1] + decodedInput[1]*currPlayerDownsync.Speed)
 			newVx, newVy := (currPlayerDownsync.VirtualGridX + proposedVirtualGridDx), (currPlayerDownsync.VirtualGridY + proposedVirtualGridDy)
 			// Reset playerCollider position from the "virtual grid position"
 			collisionPlayerIndex := COLLISION_PLAYER_INDEX_PREFIX + joinIndex
@@ -1251,10 +1243,10 @@ func (pR *Room) applyInputFrameDownsyncDynamicsOnSingleRenderFrame(delayedInputF
 			// Update in the collision system
 			playerCollider.Update()
 
-			if 0 < encodedInput {
+			if 0 != decodedInput.Dx || 0 != decodedInput.Dy {
 				Logger.Debug(fmt.Sprintf("Checking collision for playerId=%v: virtual (%d, %d) -> (%d, %d), now playerShape=%v", playerId, currPlayerDownsync.VirtualGridX, currPlayerDownsync.VirtualGridY, newVx, newVy, ConvexPolygonStr(playerCollider.Shape.(*resolv.ConvexPolygon))))
-				nextRenderFramePlayers[playerId].Dir.Dx = decodedInput[0]
+				nextRenderFramePlayers[playerId].Dir.Dx = decodedInput.Dx
-				nextRenderFramePlayers[playerId].Dir.Dy = decodedInput[1]
+				nextRenderFramePlayers[playerId].Dir.Dy = decodedInput.Dy
 			}
 		}
 
@@ -1295,6 +1287,16 @@ func (pR *Room) applyInputFrameDownsyncDynamicsOnSingleRenderFrame(delayedInputF
 	return toRet
 }
 
+func (pR *Room) decodeInput(encodedInput uint64) *InputFrameDecoded {
+    encodedDirection := (encodedInput & 0xf)
+    btnALevel := int32((encodedInput >> 4) & 1)
+    return &InputFrameDecoded{
+      Dx: DIRECTION_DECODER[encodedDirection][0],
+      Dy: DIRECTION_DECODER[encodedDirection][1],
+      BtnALevel: btnALevel,
+    }
+}
+
 func (pR *Room) inputFrameIdDebuggable(inputFrameId int32) bool {
 	return 0 == (inputFrameId % 10)
 }

battle_srv/protos/room_downsync_frame.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.7.1
+// 	protoc        v3.21.4
 // source: room_downsync_frame.proto
 
 package protos
@@ -442,19 +442,82 @@ func (x *PlayerDownsyncMeta) GetColliderRadius() float64 {
 	return 0
 }
 
+type InputFrameDecoded struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Dx        int32 `protobuf:"varint,1,opt,name=dx,proto3" json:"dx,omitempty"`
+	Dy        int32 `protobuf:"varint,2,opt,name=dy,proto3" json:"dy,omitempty"`
+	BtnALevel int32 `protobuf:"varint,3,opt,name=btnALevel,proto3" json:"btnALevel,omitempty"`
+}
+
+func (x *InputFrameDecoded) Reset() {
+	*x = InputFrameDecoded{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_room_downsync_frame_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *InputFrameDecoded) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*InputFrameDecoded) ProtoMessage() {}
+
+func (x *InputFrameDecoded) ProtoReflect() protoreflect.Message {
+	mi := &file_room_downsync_frame_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use InputFrameDecoded.ProtoReflect.Descriptor instead.
+func (*InputFrameDecoded) Descriptor() ([]byte, []int) {
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *InputFrameDecoded) GetDx() int32 {
+	if x != nil {
+		return x.Dx
+	}
+	return 0
+}
+
+func (x *InputFrameDecoded) GetDy() int32 {
+	if x != nil {
+		return x.Dy
+	}
+	return 0
+}
+
+func (x *InputFrameDecoded) GetBtnALevel() int32 {
+	if x != nil {
+		return x.BtnALevel
+	}
+	return 0
+}
+
 type InputFrameUpsync struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	InputFrameId int32  `protobuf:"varint,1,opt,name=inputFrameId,proto3" json:"inputFrameId,omitempty"`
-	EncodedDir   int32 `protobuf:"varint,6,opt,name=encodedDir,proto3" json:"encodedDir,omitempty"`
+	Encoded      uint64 `protobuf:"varint,2,opt,name=encoded,proto3" json:"encoded,omitempty"`
 }
 
 func (x *InputFrameUpsync) Reset() {
 	*x = InputFrameUpsync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[3]
+		mi := &file_room_downsync_frame_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -467,7 +530,7 @@ func (x *InputFrameUpsync) String() string {
 func (*InputFrameUpsync) ProtoMessage() {}
 
 func (x *InputFrameUpsync) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[3]
+	mi := &file_room_downsync_frame_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -480,7 +543,7 @@ func (x *InputFrameUpsync) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InputFrameUpsync.ProtoReflect.Descriptor instead.
 func (*InputFrameUpsync) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{3}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *InputFrameUpsync) GetInputFrameId() int32 {
@@ -490,9 +553,9 @@ func (x *InputFrameUpsync) GetInputFrameId() int32 {
 	return 0
 }
 
-func (x *InputFrameUpsync) GetEncodedDir() int32 {
+func (x *InputFrameUpsync) GetEncoded() uint64 {
 	if x != nil {
-		return x.EncodedDir
+		return x.Encoded
 	}
 	return 0
 }
@@ -510,7 +573,7 @@ type InputFrameDownsync struct {
 func (x *InputFrameDownsync) Reset() {
 	*x = InputFrameDownsync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[4]
+		mi := &file_room_downsync_frame_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -523,7 +586,7 @@ func (x *InputFrameDownsync) String() string {
 func (*InputFrameDownsync) ProtoMessage() {}
 
 func (x *InputFrameDownsync) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[4]
+	mi := &file_room_downsync_frame_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -536,7 +599,7 @@ func (x *InputFrameDownsync) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InputFrameDownsync.ProtoReflect.Descriptor instead.
 func (*InputFrameDownsync) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{4}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *InputFrameDownsync) GetInputFrameId() int32 {
@@ -571,7 +634,7 @@ type HeartbeatUpsync struct {
 func (x *HeartbeatUpsync) Reset() {
 	*x = HeartbeatUpsync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[5]
+		mi := &file_room_downsync_frame_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -584,7 +647,7 @@ func (x *HeartbeatUpsync) String() string {
 func (*HeartbeatUpsync) ProtoMessage() {}
 
 func (x *HeartbeatUpsync) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[5]
+	mi := &file_room_downsync_frame_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -597,7 +660,7 @@ func (x *HeartbeatUpsync) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeartbeatUpsync.ProtoReflect.Descriptor instead.
 func (*HeartbeatUpsync) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{5}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *HeartbeatUpsync) GetClientTimestamp() int64 {
@@ -621,7 +684,7 @@ type RoomDownsyncFrame struct {
 func (x *RoomDownsyncFrame) Reset() {
 	*x = RoomDownsyncFrame{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[6]
+		mi := &file_room_downsync_frame_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -634,7 +697,7 @@ func (x *RoomDownsyncFrame) String() string {
 func (*RoomDownsyncFrame) ProtoMessage() {}
 
 func (x *RoomDownsyncFrame) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[6]
+	mi := &file_room_downsync_frame_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -647,7 +710,7 @@ func (x *RoomDownsyncFrame) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RoomDownsyncFrame.ProtoReflect.Descriptor instead.
 func (*RoomDownsyncFrame) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{6}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *RoomDownsyncFrame) GetId() int32 {
@@ -696,7 +759,7 @@ type WsReq struct {
 func (x *WsReq) Reset() {
 	*x = WsReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[7]
+		mi := &file_room_downsync_frame_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -709,7 +772,7 @@ func (x *WsReq) String() string {
 func (*WsReq) ProtoMessage() {}
 
 func (x *WsReq) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[7]
+	mi := &file_room_downsync_frame_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -722,7 +785,7 @@ func (x *WsReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WsReq.ProtoReflect.Descriptor instead.
 func (*WsReq) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{7}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *WsReq) GetMsgId() int32 {
@@ -797,7 +860,7 @@ type WsResp struct {
 func (x *WsResp) Reset() {
 	*x = WsResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_room_downsync_frame_proto_msgTypes[8]
+		mi := &file_room_downsync_frame_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -810,7 +873,7 @@ func (x *WsResp) String() string {
 func (*WsResp) ProtoMessage() {}
 
 func (x *WsResp) ProtoReflect() protoreflect.Message {
-	mi := &file_room_downsync_frame_proto_msgTypes[8]
+	mi := &file_room_downsync_frame_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -823,7 +886,7 @@ func (x *WsResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WsResp.ProtoReflect.Descriptor instead.
 func (*WsResp) Descriptor() ([]byte, []int) {
-	return file_room_downsync_frame_proto_rawDescGZIP(), []int{8}
+	return file_room_downsync_frame_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *WsResp) GetRet() int32 {
@@ -992,87 +1055,92 @@ var file_room_downsync_frame_proto_rawDesc = []byte{
 	0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x6c, 0x69,
 	0x64, 0x65, 0x72, 0x52, 0x61, 0x64, 0x69, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52,
 	0x0e, 0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x52, 0x61, 0x64, 0x69, 0x75, 0x73, 0x22,
-	0x56, 0x0a, 0x10, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73,
+	0x51, 0x0a, 0x11, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x65, 0x63,
-	0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d,
+	0x6f, 0x64, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x64, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74,
+	0x52, 0x02, 0x64, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x6e, 0x63, 0x6f, 0x64,
+	0x52, 0x02, 0x64, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76, 0x65,
-	0x65, 0x64, 0x44, 0x69, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x6e, 0x63,
+	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76,
-	0x6f, 0x64, 0x65, 0x64, 0x44, 0x69, 0x72, 0x22, 0x7c, 0x0a, 0x12, 0x49, 0x6e, 0x70, 0x75, 0x74,
+	0x65, 0x6c, 0x22, 0x50, 0x0a, 0x10, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a,
+	0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46,
-	0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x69, 0x6e,
-	0x01, 0x28, 0x05, 0x52, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49,
+	0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e,
-	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02,
+	0x63, 0x6f, 0x64, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x65, 0x6e, 0x63,
-	0x20, 0x03, 0x28, 0x04, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12,
+	0x6f, 0x64, 0x65, 0x64, 0x22, 0x7c, 0x0a, 0x12, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
-	0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74,
+	0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65,
+	0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x64, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x3b, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65,
+	0x52, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1c,
-	0x61, 0x74, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65,
+	0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d,
-	0x03, 0x52, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20,
-	0x6d, 0x70, 0x22, 0x8b, 0x03, 0x0a, 0x11, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73,
+	0x01, 0x28, 0x04, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69,
-	0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x73, 0x74, 0x22, 0x3b, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79,
+	0x70, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54,
-	0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f,
-	0x6f, 0x73, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46,
+	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
-	0x72, 0x61, 0x6d, 0x65, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x8b, 0x03, 0x0a, 0x11, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63,
-	0x79, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f,
+	0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01,
+	0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
-	0x28, 0x03, 0x52, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e,
-	0x6f, 0x73, 0x12, 0x4c, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61,
+	0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+	0x65, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
-	0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61,
+	0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x6d, 0x65, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x45, 0x6e,
+	0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x74, 0x72, 0x79, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73,
+	0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12,
-	0x1a, 0x52, 0x0a, 0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x4c, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x18, 0x04,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x52, 0x6f,
-	0x65, 0x79, 0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x2e,
-	0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x72, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x0b, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x1a, 0x52, 0x0a,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5a, 0x0a, 0x10, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65,
+	0x0c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x74, 0x61, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a, 0x05, 0x76, 0x61,
+	0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f,
-	0x6f, 0x73, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e,
+	0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x63, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x01, 0x1a, 0x5a, 0x0a, 0x10, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x73,
-	0x22, 0xb8, 0x02, 0x0a, 0x05, 0x57, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64,
+	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x30, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e,
-	0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x4d, 0x65,
-	0x61, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x1c,
+	0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb8, 0x02,
-	0x0a, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0a, 0x05, 0x57, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64,
-	0x05, 0x52, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20,
+	0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x01, 0x28, 0x05, 0x52, 0x0d, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65,
+	0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74,
-	0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6a,
-	0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12,
+	0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
+	0x6a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x63, 0x6b,
-	0x49, 0x64, 0x12, 0x4e, 0x0a, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
+	0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
-	0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x03, 0x28,
+	0x52, 0x0d, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12,
-	0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74,
+	0x2e, 0x0a, 0x12, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x15, 0x69, 0x6e, 0x70,
+	0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x61, 0x63, 0x6b,
-	0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74,
+	0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12,
-	0x63, 0x68, 0x12, 0x27, 0x0a, 0x02, 0x68, 0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
+	0x4e, 0x0a, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61,
+	0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
-	0x74, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x02, 0x68, 0x62, 0x22, 0x89, 0x02, 0x0a, 0x06,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
-	0x57, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20,
+	0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x65, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x63, 0x68, 0x6f,
+	0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x65, 0x64, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x65,
+	0x27, 0x0a, 0x02, 0x68, 0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x72,
-	0x63, 0x68, 0x6f, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63,
+	0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55, 0x70,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x2b, 0x0a, 0x03,
+	0x73, 0x79, 0x6e, 0x63, 0x52, 0x02, 0x68, 0x62, 0x22, 0x89, 0x02, 0x0a, 0x06, 0x57, 0x73, 0x52,
-	0x72, 0x64, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x6f, 0x73, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46,
+	0x52, 0x03, 0x72, 0x65, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x63, 0x68, 0x6f, 0x65, 0x64, 0x4d,
-	0x72, 0x61, 0x6d, 0x65, 0x52, 0x03, 0x72, 0x64, 0x66, 0x12, 0x54, 0x0a, 0x17, 0x69, 0x6e, 0x70,
+	0x73, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x65, 0x63, 0x68, 0x6f,
-	0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42,
+	0x65, 0x64, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74, 0x18, 0x03,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x64, 0x66,
-	0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e,
-	0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
+	0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d,
-	0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x65, 0x52, 0x03, 0x72, 0x64, 0x66, 0x12, 0x54, 0x0a, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46,
-	0x36, 0x0a, 0x08, 0x62, 0x63, 0x69, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63,
-	0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x68, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
-	0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x62,
+	0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73,
-	0x63, 0x69, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x79, 0x6e, 0x63, 0x52, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44,
-	0x65, 0x5f, 0x73, 0x72, 0x76, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x36, 0x0a, 0x08,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x62, 0x63, 0x69, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x62, 0x63, 0x69, 0x46,
+	0x72, 0x61, 0x6d, 0x65, 0x42, 0x13, 0x5a, 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73,
+	0x72, 0x76, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -1087,38 +1155,39 @@ func file_room_downsync_frame_proto_rawDescGZIP() []byte {
 	return file_room_downsync_frame_proto_rawDescData
 }
 
-var file_room_downsync_frame_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_room_downsync_frame_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_room_downsync_frame_proto_goTypes = []interface{}{
 	(*BattleColliderInfo)(nil),         // 0: protos.BattleColliderInfo
 	(*PlayerDownsync)(nil),             // 1: protos.PlayerDownsync
 	(*PlayerDownsyncMeta)(nil),         // 2: protos.PlayerDownsyncMeta
-	(*InputFrameUpsync)(nil),           // 3: protos.InputFrameUpsync
+	(*InputFrameDecoded)(nil),          // 3: protos.InputFrameDecoded
-	(*InputFrameDownsync)(nil),         // 4: protos.InputFrameDownsync
+	(*InputFrameUpsync)(nil),           // 4: protos.InputFrameUpsync
-	(*HeartbeatUpsync)(nil),            // 5: protos.HeartbeatUpsync
+	(*InputFrameDownsync)(nil),         // 5: protos.InputFrameDownsync
-	(*RoomDownsyncFrame)(nil),          // 6: protos.RoomDownsyncFrame
+	(*HeartbeatUpsync)(nil),            // 6: protos.HeartbeatUpsync
-	(*WsReq)(nil),                      // 7: protos.WsReq
+	(*RoomDownsyncFrame)(nil),          // 7: protos.RoomDownsyncFrame
-	(*WsResp)(nil),                     // 8: protos.WsResp
+	(*WsReq)(nil),                      // 8: protos.WsReq
-	nil,                                // 9: protos.BattleColliderInfo.StrToVec2DListMapEntry
+	(*WsResp)(nil),                     // 9: protos.WsResp
-	nil,                                // 10: protos.BattleColliderInfo.StrToPolygon2DListMapEntry
+	nil,                                // 10: protos.BattleColliderInfo.StrToVec2DListMapEntry
-	nil,                                // 11: protos.RoomDownsyncFrame.PlayersEntry
+	nil,                                // 11: protos.BattleColliderInfo.StrToPolygon2DListMapEntry
-	nil,                                // 12: protos.RoomDownsyncFrame.PlayerMetasEntry
+	nil,                                // 12: protos.RoomDownsyncFrame.PlayersEntry
-	(*sharedprotos.Direction)(nil),     // 13: sharedprotos.Direction
+	nil,                                // 13: protos.RoomDownsyncFrame.PlayerMetasEntry
-	(*sharedprotos.Vec2DList)(nil),     // 14: sharedprotos.Vec2DList
+	(*sharedprotos.Direction)(nil),     // 14: sharedprotos.Direction
-	(*sharedprotos.Polygon2DList)(nil), // 15: sharedprotos.Polygon2DList
+	(*sharedprotos.Vec2DList)(nil),     // 15: sharedprotos.Vec2DList
+	(*sharedprotos.Polygon2DList)(nil), // 16: sharedprotos.Polygon2DList
 }
 var file_room_downsync_frame_proto_depIdxs = []int32{
-	9,  // 0: protos.BattleColliderInfo.strToVec2DListMap:type_name -> protos.BattleColliderInfo.StrToVec2DListMapEntry
+	10, // 0: protos.BattleColliderInfo.strToVec2DListMap:type_name -> protos.BattleColliderInfo.StrToVec2DListMapEntry
-	10, // 1: protos.BattleColliderInfo.strToPolygon2DListMap:type_name -> protos.BattleColliderInfo.StrToPolygon2DListMapEntry
+	11, // 1: protos.BattleColliderInfo.strToPolygon2DListMap:type_name -> protos.BattleColliderInfo.StrToPolygon2DListMapEntry
-	13, // 2: protos.PlayerDownsync.dir:type_name -> sharedprotos.Direction
+	14, // 2: protos.PlayerDownsync.dir:type_name -> sharedprotos.Direction
-	11, // 3: protos.RoomDownsyncFrame.players:type_name -> protos.RoomDownsyncFrame.PlayersEntry
+	12, // 3: protos.RoomDownsyncFrame.players:type_name -> protos.RoomDownsyncFrame.PlayersEntry
-	12, // 4: protos.RoomDownsyncFrame.playerMetas:type_name -> protos.RoomDownsyncFrame.PlayerMetasEntry
+	13, // 4: protos.RoomDownsyncFrame.playerMetas:type_name -> protos.RoomDownsyncFrame.PlayerMetasEntry
-	3,  // 5: protos.WsReq.inputFrameUpsyncBatch:type_name -> protos.InputFrameUpsync
+	4,  // 5: protos.WsReq.inputFrameUpsyncBatch:type_name -> protos.InputFrameUpsync
-	5,  // 6: protos.WsReq.hb:type_name -> protos.HeartbeatUpsync
+	6,  // 6: protos.WsReq.hb:type_name -> protos.HeartbeatUpsync
-	6,  // 7: protos.WsResp.rdf:type_name -> protos.RoomDownsyncFrame
+	7,  // 7: protos.WsResp.rdf:type_name -> protos.RoomDownsyncFrame
-	4,  // 8: protos.WsResp.inputFrameDownsyncBatch:type_name -> protos.InputFrameDownsync
+	5,  // 8: protos.WsResp.inputFrameDownsyncBatch:type_name -> protos.InputFrameDownsync
 	0,  // 9: protos.WsResp.bciFrame:type_name -> protos.BattleColliderInfo
-	14, // 10: protos.BattleColliderInfo.StrToVec2DListMapEntry.value:type_name -> sharedprotos.Vec2DList
+	15, // 10: protos.BattleColliderInfo.StrToVec2DListMapEntry.value:type_name -> sharedprotos.Vec2DList
-	15, // 11: protos.BattleColliderInfo.StrToPolygon2DListMapEntry.value:type_name -> sharedprotos.Polygon2DList
+	16, // 11: protos.BattleColliderInfo.StrToPolygon2DListMapEntry.value:type_name -> sharedprotos.Polygon2DList
 	1,  // 12: protos.RoomDownsyncFrame.PlayersEntry.value:type_name -> protos.PlayerDownsync
 	2,  // 13: protos.RoomDownsyncFrame.PlayerMetasEntry.value:type_name -> protos.PlayerDownsyncMeta
 	14, // [14:14] is the sub-list for method output_type
@@ -1171,7 +1240,7 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InputFrameUpsync); i {
+			switch v := v.(*InputFrameDecoded); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1183,7 +1252,7 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InputFrameDownsync); i {
+			switch v := v.(*InputFrameUpsync); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1195,7 +1264,7 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeartbeatUpsync); i {
+			switch v := v.(*InputFrameDownsync); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1207,7 +1276,7 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RoomDownsyncFrame); i {
+			switch v := v.(*HeartbeatUpsync); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1219,7 +1288,7 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WsReq); i {
+			switch v := v.(*RoomDownsyncFrame); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1231,6 +1300,18 @@ func file_room_downsync_frame_proto_init() {
 			}
 		}
 		file_room_downsync_frame_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WsReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_room_downsync_frame_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WsResp); i {
 			case 0:
 				return &v.state
@@ -1249,7 +1330,7 @@ func file_room_downsync_frame_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_room_downsync_frame_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   13,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

dnmshared/sharedprotos/geometry.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.7.1
+// 	protoc        v3.21.4
 // source: geometry.proto
 
 package sharedprotos

dragonBonesAnimProjects/library/SoldierElf_tex.json.meta

@@ -1,7 +0,0 @@
-{
-  "ver": "1.0.0",
-  "uuid": "04d25c46-a15a-4390-89fd-7fdb22de884f",
-  "atlasJson": "{\"width\":128,\"imagePath\":\"SoldierElf_tex.png\",\"height\":128,\"name\":\"SoldierElf\",\"SubTexture\":[{\"frameHeight\":45,\"y\":1,\"frameX\":0,\"width\":34,\"frameY\":0,\"height\":44,\"name\":\"cape\",\"frameWidth\":34,\"x\":70},{\"width\":10,\"y\":107,\"height\":14,\"name\":\"shouder_l\",\"x\":74},{\"width\":11,\"y\":107,\"height\":14,\"name\":\"forearm_l\",\"x\":61},{\"width\":15,\"y\":93,\"height\":16,\"name\":\"hand_l\",\"x\":1},{\"width\":30,\"y\":61,\"height\":30,\"name\":\"weapon_hand_l\",\"x\":1},{\"width\":8,\"y\":101,\"height\":11,\"name\":\"thigh_l\",\"x\":86},{\"width\":12,\"y\":93,\"height\":17,\"name\":\"calf_l\",\"x\":18},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_l\",\"x\":39},{\"width\":28,\"y\":61,\"height\":31,\"name\":\"pelvis\",\"x\":33},{\"width\":8,\"y\":88,\"height\":11,\"name\":\"thigh_r\",\"x\":77},{\"width\":12,\"y\":88,\"height\":17,\"name\":\"calf_r\",\"x\":63},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_r\",\"x\":17},{\"width\":13,\"y\":94,\"height\":12,\"name\":\"shouder_r\",\"x\":45},{\"width\":67,\"y\":1,\"height\":58,\"name\":\"chest\",\"x\":1},{\"width\":11,\"y\":94,\"height\":17,\"name\":\"forearm_r\",\"x\":32},{\"width\":14,\"y\":111,\"height\":13,\"name\":\"hand_r\",\"x\":1},{\"frameHeight\":39,\"y\":47,\"frameX\":-2,\"width\":34,\"frameY\":0,\"height\":39,\"name\":\"we_bl_4_f_1\",\"frameWidth\":36,\"x\":70}]}",
-  "texture": "4a3aabb1-75b6-40ec-b107-241164a8ec23",
-  "subMetas": {}
-}

dragonBonesAnimProjects/library/SoldierFireGhost.json

@@ -0,0 +1 @@
+{"imagePath":"Soldier_02_tex.png","width":128,"name":"Soldier_02","SubTexture":[{"x":53,"y":44,"width":23,"name":"biu","height":22},{"x":76,"y":68,"width":9,"name":"rightArm","height":14},{"y":35,"frameY":0,"height":32,"frameWidth":29,"frameX":-1,"frameHeight":32,"width":27,"name":"yinmoqe00","x":89},{"x":53,"y":1,"width":34,"name":"body","height":41},{"x":78,"y":44,"width":9,"name":"rightShoulder","height":13},{"y":50,"frameY":0,"height":18,"frameWidth":19,"frameX":0,"frameHeight":18,"width":19,"name":"rightFrontArm","x":23},{"x":23,"y":70,"width":14,"name":"rightHand","height":14},{"y":68,"frameY":0,"height":12,"frameWidth":12,"frameX":0,"frameHeight":12,"width":12,"name":"leftArm","x":62},{"x":1,"y":73,"width":13,"name":"leftShoulder","height":12},{"x":1,"y":50,"width":20,"name":"leftFrontArm","height":21},{"x":89,"y":1,"width":33,"name":"head","height":32},{"x":1,"y":1,"width":50,"name":"head2","height":47},{"x":44,"y":68,"width":16,"name":"leftHand","height":14},{"y":59,"frameY":-2,"height":4,"frameWidth":8,"frameX":-1,"frameHeight":8,"width":4,"name":"huomiao01","x":78}],"height":128}

frontend/assets/resources/animation/SoldierElf/SoldierElf_tex.json

@@ -1 +1 @@
-{"width":128,"imagePath":"SoldierElf_tex.png","height":128,"name":"SoldierElf","SubTexture":[{"frameHeight":45,"y":1,"frameX":0,"width":34,"frameY":0,"height":44,"name":"cape","frameWidth":34,"x":70},{"width":10,"y":107,"height":14,"name":"shouder_l","x":74},{"width":11,"y":107,"height":14,"name":"forearm_l","x":61},{"width":15,"y":93,"height":16,"name":"hand_l","x":1},{"width":30,"y":61,"height":30,"name":"weapon_hand_l","x":1},{"width":8,"y":101,"height":11,"name":"thigh_l","x":86},{"width":12,"y":93,"height":17,"name":"calf_l","x":18},{"width":20,"y":113,"height":8,"name":"foot_l","x":39},{"width":28,"y":61,"height":31,"name":"pelvis","x":33},{"width":8,"y":88,"height":11,"name":"thigh_r","x":77},{"width":12,"y":88,"height":17,"name":"calf_r","x":63},{"width":20,"y":113,"height":8,"name":"foot_r","x":17},{"width":13,"y":94,"height":12,"name":"shouder_r","x":45},{"width":67,"y":1,"height":58,"name":"chest","x":1},{"width":11,"y":94,"height":17,"name":"forearm_r","x":32},{"width":14,"y":111,"height":13,"name":"hand_r","x":1},{"frameHeight":39,"y":47,"frameX":-2,"width":34,"frameY":0,"height":39,"name":"we_bl_4_f_1","frameWidth":36,"x":70}]}
+{"width":128,"SubTexture":[{"frameWidth":34,"y":1,"frameHeight":45,"width":34,"frameX":0,"height":44,"name":"cape","frameY":0,"x":70},{"width":10,"y":107,"height":14,"name":"shouder_l","x":74},{"width":11,"y":107,"height":14,"name":"forearm_l","x":61},{"width":15,"y":93,"height":16,"name":"hand_l","x":1},{"width":30,"y":61,"height":30,"name":"weapon_hand_l","x":1},{"width":8,"y":88,"height":11,"name":"thigh_l","x":77},{"width":12,"y":93,"height":17,"name":"calf_l","x":18},{"width":20,"y":113,"height":8,"name":"foot_l","x":39},{"width":28,"y":61,"height":31,"name":"pelvis","x":33},{"width":8,"y":101,"height":11,"name":"thigh_r","x":86},{"width":12,"y":88,"height":17,"name":"calf_r","x":63},{"width":20,"y":113,"height":8,"name":"foot_r","x":17},{"width":13,"y":94,"height":12,"name":"shouder_r","x":45},{"width":67,"y":1,"height":58,"name":"chest","x":1},{"width":11,"y":94,"height":17,"name":"forearm_r","x":32},{"width":14,"y":111,"height":13,"name":"hand_r","x":1},{"frameWidth":36,"y":47,"frameHeight":39,"width":34,"frameX":-2,"height":39,"name":"we_bl_4_f_1","frameY":0,"x":70}],"height":128,"name":"SoldierElf","imagePath":"SoldierElf_tex.png"}

frontend/assets/resources/animation/SoldierElf/SoldierElf_tex.json.meta

@@ -1,7 +1,7 @@
 {
   "ver": "1.0.0",
   "uuid": "24d7bb8f-577c-4e5d-b730-56613ca8685d",
-  "atlasJson": "{\"width\":128,\"imagePath\":\"SoldierElf_tex.png\",\"height\":128,\"name\":\"SoldierElf\",\"SubTexture\":[{\"frameHeight\":45,\"y\":1,\"frameX\":0,\"width\":34,\"frameY\":0,\"height\":44,\"name\":\"cape\",\"frameWidth\":34,\"x\":70},{\"width\":10,\"y\":107,\"height\":14,\"name\":\"shouder_l\",\"x\":74},{\"width\":11,\"y\":107,\"height\":14,\"name\":\"forearm_l\",\"x\":61},{\"width\":15,\"y\":93,\"height\":16,\"name\":\"hand_l\",\"x\":1},{\"width\":30,\"y\":61,\"height\":30,\"name\":\"weapon_hand_l\",\"x\":1},{\"width\":8,\"y\":101,\"height\":11,\"name\":\"thigh_l\",\"x\":86},{\"width\":12,\"y\":93,\"height\":17,\"name\":\"calf_l\",\"x\":18},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_l\",\"x\":39},{\"width\":28,\"y\":61,\"height\":31,\"name\":\"pelvis\",\"x\":33},{\"width\":8,\"y\":88,\"height\":11,\"name\":\"thigh_r\",\"x\":77},{\"width\":12,\"y\":88,\"height\":17,\"name\":\"calf_r\",\"x\":63},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_r\",\"x\":17},{\"width\":13,\"y\":94,\"height\":12,\"name\":\"shouder_r\",\"x\":45},{\"width\":67,\"y\":1,\"height\":58,\"name\":\"chest\",\"x\":1},{\"width\":11,\"y\":94,\"height\":17,\"name\":\"forearm_r\",\"x\":32},{\"width\":14,\"y\":111,\"height\":13,\"name\":\"hand_r\",\"x\":1},{\"frameHeight\":39,\"y\":47,\"frameX\":-2,\"width\":34,\"frameY\":0,\"height\":39,\"name\":\"we_bl_4_f_1\",\"frameWidth\":36,\"x\":70}]}",
+  "atlasJson": "{\"width\":128,\"SubTexture\":[{\"frameWidth\":34,\"y\":1,\"frameHeight\":45,\"width\":34,\"frameX\":0,\"height\":44,\"name\":\"cape\",\"frameY\":0,\"x\":70},{\"width\":10,\"y\":107,\"height\":14,\"name\":\"shouder_l\",\"x\":74},{\"width\":11,\"y\":107,\"height\":14,\"name\":\"forearm_l\",\"x\":61},{\"width\":15,\"y\":93,\"height\":16,\"name\":\"hand_l\",\"x\":1},{\"width\":30,\"y\":61,\"height\":30,\"name\":\"weapon_hand_l\",\"x\":1},{\"width\":8,\"y\":88,\"height\":11,\"name\":\"thigh_l\",\"x\":77},{\"width\":12,\"y\":93,\"height\":17,\"name\":\"calf_l\",\"x\":18},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_l\",\"x\":39},{\"width\":28,\"y\":61,\"height\":31,\"name\":\"pelvis\",\"x\":33},{\"width\":8,\"y\":101,\"height\":11,\"name\":\"thigh_r\",\"x\":86},{\"width\":12,\"y\":88,\"height\":17,\"name\":\"calf_r\",\"x\":63},{\"width\":20,\"y\":113,\"height\":8,\"name\":\"foot_r\",\"x\":17},{\"width\":13,\"y\":94,\"height\":12,\"name\":\"shouder_r\",\"x\":45},{\"width\":67,\"y\":1,\"height\":58,\"name\":\"chest\",\"x\":1},{\"width\":11,\"y\":94,\"height\":17,\"name\":\"forearm_r\",\"x\":32},{\"width\":14,\"y\":111,\"height\":13,\"name\":\"hand_r\",\"x\":1},{\"frameWidth\":36,\"y\":47,\"frameHeight\":39,\"width\":34,\"frameX\":-2,\"height\":39,\"name\":\"we_bl_4_f_1\",\"frameY\":0,\"x\":70}],\"height\":128,\"name\":\"SoldierElf\",\"imagePath\":\"SoldierElf_tex.png\"}",
   "texture": "050fb016-1a1f-4341-8367-283bfeddc4a8",
   "subMetas": {}
 }

frontend/assets/resources/animation/SoldierFireGhost.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "f1176719-d1d6-4af5-89c6-ddff16ab85fd",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.json

@@ -0,0 +1 @@
+{"width":128,"SubTexture":[{"frameWidth":23,"y":44,"frameHeight":22,"width":22,"frameX":-1,"height":22,"name":"biu","frameY":0,"x":53},{"width":9,"y":68,"height":14,"name":"rightArm","x":76},{"frameWidth":29,"y":35,"frameHeight":32,"width":26,"frameX":-1,"height":32,"name":"yinmoqe00","frameY":0,"x":89},{"width":34,"y":1,"height":41,"name":"body","x":53},{"width":9,"y":44,"height":13,"name":"rightShoulder","x":77},{"width":19,"y":50,"height":18,"name":"rightFrontArm","x":23},{"width":14,"y":70,"height":14,"name":"rightHand","x":23},{"width":12,"y":68,"height":12,"name":"leftArm","x":62},{"width":13,"y":73,"height":12,"name":"leftShoulder","x":1},{"width":20,"y":50,"height":21,"name":"leftFrontArm","x":1},{"width":33,"y":1,"height":32,"name":"head","x":89},{"width":50,"y":1,"height":47,"name":"head2","x":1},{"width":16,"y":68,"height":14,"name":"leftHand","x":44},{"frameWidth":8,"y":59,"frameHeight":8,"width":4,"frameX":-1,"height":4,"name":"huomiao01","frameY":-2,"x":77}],"height":128,"name":"SoldierFireGhost","imagePath":"SoldierFireGhost_tex.png"}

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.json.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.0",
+  "uuid": "4a9187d5-a9ad-4464-a03c-d2f3cc277051",
+  "atlasJson": "{\"width\":128,\"SubTexture\":[{\"frameWidth\":23,\"y\":44,\"frameHeight\":22,\"width\":22,\"frameX\":-1,\"height\":22,\"name\":\"biu\",\"frameY\":0,\"x\":53},{\"width\":9,\"y\":68,\"height\":14,\"name\":\"rightArm\",\"x\":76},{\"frameWidth\":29,\"y\":35,\"frameHeight\":32,\"width\":26,\"frameX\":-1,\"height\":32,\"name\":\"yinmoqe00\",\"frameY\":0,\"x\":89},{\"width\":34,\"y\":1,\"height\":41,\"name\":\"body\",\"x\":53},{\"width\":9,\"y\":44,\"height\":13,\"name\":\"rightShoulder\",\"x\":77},{\"width\":19,\"y\":50,\"height\":18,\"name\":\"rightFrontArm\",\"x\":23},{\"width\":14,\"y\":70,\"height\":14,\"name\":\"rightHand\",\"x\":23},{\"width\":12,\"y\":68,\"height\":12,\"name\":\"leftArm\",\"x\":62},{\"width\":13,\"y\":73,\"height\":12,\"name\":\"leftShoulder\",\"x\":1},{\"width\":20,\"y\":50,\"height\":21,\"name\":\"leftFrontArm\",\"x\":1},{\"width\":33,\"y\":1,\"height\":32,\"name\":\"head\",\"x\":89},{\"width\":50,\"y\":1,\"height\":47,\"name\":\"head2\",\"x\":1},{\"width\":16,\"y\":68,\"height\":14,\"name\":\"leftHand\",\"x\":44},{\"frameWidth\":8,\"y\":59,\"frameHeight\":8,\"width\":4,\"frameX\":-1,\"height\":4,\"name\":\"huomiao01\",\"frameY\":-2,\"x\":77}],\"height\":128,\"name\":\"SoldierFireGhost\",\"imagePath\":\"SoldierFireGhost_tex.png\"}",
+  "texture": "700d963b-2192-4219-a066-8be5b3db7453",
+  "subMetas": {}
+}

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "4a3aabb1-75b6-40ec-b107-241164a8ec23",
+  "uuid": "700d963b-2192-4219-a066-8be5b3db7453",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -9,19 +9,19 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "SoldierElf_tex": {
+    "SoldierFireGhost_tex": {
       "ver": "1.0.4",
-      "uuid": "a969fc2f-5d11-4ac6-90e1-235b1e119802",
+      "uuid": "8ef8a6b3-0bac-4cf1-bba0-ab090f4d9e52",
-      "rawTextureUuid": "4a3aabb1-75b6-40ec-b107-241164a8ec23",
+      "rawTextureUuid": "700d963b-2192-4219-a066-8be5b3db7453",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -11.5,
+      "offsetX": -2.5,
-      "offsetY": 1.5,
+      "offsetY": 21,
       "trimX": 1,
       "trimY": 1,
-      "width": 103,
+      "width": 121,
-      "height": 123,
+      "height": 84,
       "rawWidth": 128,
       "rawHeight": 128,
       "borderTop": 0,

frontend/assets/resources/map/dungeon/map.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="8">
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="12">
  <tileset firstgid="1" source="tiles0.tsx"/>
  <tileset firstgid="65" source="tiles1.tsx"/>
  <layer id="1" name="Ground" width="64" height="64">
@@ -61,5 +61,29 @@
    </properties>
    <polyline points="0,0 -191.667,0.666667 -191.667,17.3333 -0.715174,17.3333"/>
   </object>
+  <object id="8" x="-9.33333" y="-13.3333">
+   <properties>
+    <property name="boundary_type" value="barrier"/>
+   </properties>
+   <polyline points="0,0 0,18.6667 1041.33,21.3333 1041.33,-1.33333"/>
+  </object>
+  <object id="9" x="-9.33333" y="1014.67">
+   <properties>
+    <property name="boundary_type" value="barrier"/>
+   </properties>
+   <polyline points="0,0 0,18.6667 1041.33,21.3333 1041.33,-1.33333"/>
+  </object>
+  <object id="10" x="-14" y="-40">
+   <properties>
+    <property name="boundary_type" value="barrier"/>
+   </properties>
+   <polyline points="0,0 4,1110 24,1110 24,-8"/>
+  </object>
+  <object id="11" x="1014" y="-42">
+   <properties>
+    <property name="boundary_type" value="barrier"/>
+   </properties>
+   <polyline points="0,0 4,1110 24,1110 24,-8"/>
+  </object>
  </objectgroup>
 </map>

frontend/assets/resources/pbfiles/room_downsync_frame.proto

@@ -53,9 +53,15 @@ message PlayerDownsyncMeta {
   double colliderRadius = 6;
 }
 
+message InputFrameDecoded {
+  int32 dx = 1;
+  int32 dy = 2;
+  int32 btnALevel = 3;
+}
+
 message InputFrameUpsync {
   int32 inputFrameId = 1;
-  int32 encodedDir = 6;
+  uint64 encoded = 2;
 }
 
 message InputFrameDownsync {

frontend/assets/resources/prefabs/ControlledCharacter.prefab

@@ -33,14 +33,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 19
       },
       {
-        "__id__": 15
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -484,15 +484,82 @@
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
+    "_children": [
-    "_active": true,
-    "_components": [
       {
         "__id__": 12
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "SoldierElf",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 11
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -546,7 +613,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -581,6 +648,132 @@
     "_N$enableBatch": false,
     "_id": ""
   },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
+    },
+    "fileId": "3fs20Yd8dIO68/1Wx2oVLh",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "SoldierFireGhost",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 11
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "dragonBones.ArmatureDisplay",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_armatureName": "SoldierFireGhost",
+    "_animationName": "Idle1",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "playTimes": -1,
+    "premultipliedAlpha": false,
+    "_armatureKey": "36230012-8df3-4e85-afad-76ec47d0e4d7#4a9187d5-a9ad-4464-a03c-d2f3cc277051",
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_playing": false,
+    "_armatureCache": null,
+    "_N$dragonAsset": {
+      "__uuid__": "36230012-8df3-4e85-afad-76ec47d0e4d7"
+    },
+    "_N$dragonAtlasAsset": {
+      "__uuid__": "4a9187d5-a9ad-4464-a03c-d2f3cc277051"
+    },
+    "_N$_defaultArmatureIndex": 0,
+    "_N$_animationIndex": 8,
+    "_N$_defaultCacheMode": 0,
+    "_N$timeScale": 1,
+    "_N$debugBones": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
+    },
+    "fileId": "a8ZUEyoP1Ec5azSkL7Z/9h",
+    "sync": false
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

frontend/assets/scenes/default_map.fire

@@ -80,20 +80,20 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 33
+      },
       {
         "__id__": 34
       },
       {
         "__id__": 35
-      },
-      {
-        "__id__": 36
-      },
-      {
-        "__id__": 37
-      },
-      {
-        "__id__": 38
       }
     ],
     "_prefab": null,
@@ -234,7 +234,7 @@
         "__id__": 7
       },
       {
-        "__id__": 33
+        "__id__": 30
       }
     ],
     "_prefab": null,
@@ -323,7 +323,7 @@
       "__id__": 17
     },
     "countdownLabel": {
-      "__id__": 26
+      "__id__": 23
     },
     "resultPanelPrefab": {
       "__uuid__": "c4cfe3bd-c59e-4d5b-95cb-c933b120e184"
@@ -354,13 +354,13 @@
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 29
       }
     ],
     "_prefab": null,
@@ -422,14 +422,11 @@
       {
         "__id__": 12
       },
-      {
-        "__id__": 22
-      },
       {
         "__id__": 8
       },
       {
-        "__id__": 25
+        "__id__": 22
       }
     ],
     "_active": true,
@@ -525,7 +522,7 @@
       "array": [
         0,
         0,
-        210.4441731196186,
+        239.32248305180272,
         0,
         0,
         0,
@@ -1027,111 +1024,6 @@
     "_N$affectedByScale": false,
     "_id": "f6GkgYwn9JvKLqbGG1zmeD"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "KeyboardControlsMount",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 9
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 23
-      },
-      {
-        "__id__": 24
-      }
-    ],
-    "_prefab": null,
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        -341.33333,
-        -640,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0.66667,
-        0.66667,
-        0.66667
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": "e6nL+1zEhLmLSaT8R/9UgD"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 22
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "",
-    "_N$string": "",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": "9cS5BRd+NKJIvGQiojJtIs"
-  },
-  {
-    "__type__": "4561aFzv9JPZLe6iIzODk2d",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 22
-    },
-    "_enabled": true,
-    "_id": "5ahzSYC8pCCLVPCBYyCRfZ"
-  },
   {
     "__type__": "cc.Node",
     "_name": "CountdownSeconds",
@@ -1143,7 +1035,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 23
       }
     ],
     "_prefab": null,
@@ -1199,7 +1091,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -1233,16 +1125,16 @@
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 25
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 27
       },
       {
-        "__id__": 31
+        "__id__": 28
       }
     ],
     "_prefab": null,
@@ -1298,13 +1190,13 @@
     "_name": "Joystick",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 27
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 26
       }
     ],
     "_prefab": null,
@@ -1360,7 +1252,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1394,7 +1286,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1428,7 +1320,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 24
     },
     "_enabled": true,
     "alignMode": 0,
@@ -1590,11 +1482,12 @@
     "zoomingListenerNode": {
       "__id__": 5
     },
+    "actionBtnListenerNode": null,
     "stickhead": {
-      "__id__": 28
+      "__id__": 25
     },
     "base": {
-      "__id__": 27
+      "__id__": 24
     },
     "joyStickEps": 0.1,
     "magicLeanLowerBound": 0.414,

frontend/assets/scenes/login.fire

@@ -440,7 +440,7 @@
       "array": [
         0,
         0,
-        210.4441731196186,
+        239.32248305180272,
         0,
         0,
         0,

frontend/assets/scenes/offline_map_1.fire

@@ -77,20 +77,20 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
       {
         "__id__": 22
       },
       {
         "__id__": 23
-      },
-      {
-        "__id__": 24
-      },
-      {
-        "__id__": 25
-      },
-      {
-        "__id__": 26
       }
     ],
     "_prefab": null,
@@ -262,8 +262,6 @@
     "controlledCharacterPrefab": {
       "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
     },
-    "player1Prefab": null,
-    "player2Prefab": null,
     "joystickInputControllerNode": {
       "__id__": 7
     },
@@ -279,9 +277,6 @@
     "forceBigEndianFloatingNumDecoding": false,
     "renderFrameIdLagTolerance": 4,
     "jigglingEps1D": 0.001,
-    "keyboardInputControllerNode": {
-      "__id__": 11
-    },
     "_id": "4b+kZ46VhC0LCBixXEK2dk"
   },
   {
@@ -293,13 +288,13 @@
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 18
       }
     ],
     "_prefab": null,
@@ -358,14 +353,11 @@
       "__id__": 9
     },
     "_children": [
-      {
-        "__id__": 11
-      },
       {
         "__id__": 7
       },
       {
-        "__id__": 14
+        "__id__": 11
       }
     ],
     "_active": true,
@@ -461,7 +453,7 @@
       "array": [
         0,
         0,
-        210.4441731196186,
+        239.32248305180272,
         0,
         0,
         0,
@@ -520,111 +512,6 @@
     "_alignWithScreen": true,
     "_id": "50qiPTLS9NhbPa+JZU0jOP"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "KeyboardControlsMount",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 8
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 13
-      }
-    ],
-    "_prefab": null,
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        -341.33333,
-        -640,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0.66667,
-        0.66667,
-        0.66667
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": "e6nL+1zEhLmLSaT8R/9UgD"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "",
-    "_N$string": "",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": "9cS5BRd+NKJIvGQiojJtIs"
-  },
-  {
-    "__type__": "4561aFzv9JPZLe6iIzODk2d",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_id": "5ahzSYC8pCCLVPCBYyCRfZ"
-  },
   {
     "__type__": "cc.Node",
     "_name": "CountdownSeconds",
@@ -636,7 +523,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 12
       }
     ],
     "_prefab": null,
@@ -692,7 +579,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -726,16 +613,16 @@
     },
     "_children": [
       {
-        "__id__": 17
+        "__id__": 14
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 16
       },
       {
-        "__id__": 20
+        "__id__": 17
       }
     ],
     "_prefab": null,
@@ -791,13 +678,13 @@
     "_name": "Joystick",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 16
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 15
       }
     ],
     "_prefab": null,
@@ -853,7 +740,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -887,7 +774,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -921,7 +808,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 13
     },
     "_enabled": true,
     "alignMode": 0,
@@ -1056,10 +943,10 @@
       "__id__": 3
     },
     "stickhead": {
-      "__id__": 17
+      "__id__": 14
     },
     "base": {
-      "__id__": 16
+      "__id__": 13
     },
     "joyStickEps": 0.1,
     "magicLeanLowerBound": 0.414,

frontend/assets/scripts/AttackingCharacter.js

@@ -16,13 +16,20 @@ cc.Class({
   },
 
   ctor() {
+    this.speciesName = null;
+  },
+
+  setSpecies(speciesName) {
+    this.speciesName = speciesName;
+    this.effAnimNode = this.animNode.getChildByName(this.speciesName);
+    this.animComp = this.effAnimNode.getComponent(dragonBones.ArmatureDisplay);
+    this.animComp.playAnimation(ATK_CHARACTER_STATE.Idle1[1]);
+    this.effAnimNode.active = true;
   },
 
   onLoad() {
     BaseCharacter.prototype.onLoad.call(this);
     this.characterState = ATK_CHARACTER_STATE.Idle1[0];
-    this.animComp = this.animNode.getComponent(dragonBones.ArmatureDisplay);
-    this.animComp.playAnimation(ATK_CHARACTER_STATE.Idle1[1]);
   },
 
   scheduleNewDirection(newScheduledDirection, forceAnimSwitch) {

frontend/assets/scripts/KeyboardControls.js

@@ -1,69 +0,0 @@
-cc.Class({
-  extends: cc.Component,
-
-  properties: {},
-
-  setInputControls: function() {
-    const self = this;
-    // add keyboard event listener
-    // When there is a key being pressed down, judge if it's the designated directional button and set up acceleration in the corresponding direction
-    cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, function(event) {
-      switch (event.keyCode) {
-        case cc.macro.KEY.w:
-          self.activeDirection.dPjY = +1.0;
-          break;
-        case cc.macro.KEY.s:
-          self.activeDirection.dPjY = -1.0;
-          break;
-        case cc.macro.KEY.a:
-          self.activeDirection.dPjX = -2.0;
-          break;
-        case cc.macro.KEY.d:
-          self.activeDirection.dPjX = +2.0;
-          break;
-        default:
-          break;
-      }
-    }, self.node);
-
-    // when releasing the button, stop acceleration in this direction
-    cc.systemEvent.on(cc.SystemEvent.EventType.KEY_UP, function(event) {
-      switch (event.keyCode) {
-        case cc.macro.KEY.w:
-          if (+1.0 == self.activeDirection.dPjY) {
-            self.activeDirection.dPjY = 0.0;
-          }
-          break;
-        case cc.macro.KEY.s:
-          if (-1.0 == self.activeDirection.dPjY) {
-            self.activeDirection.dPjY = 0.0;
-          }
-          break;
-        case cc.macro.KEY.a:
-          if (-2.0 == self.activeDirection.dPjX) {
-            self.activeDirection.dPjX = 0.0;
-          }
-          break;
-        case cc.macro.KEY.d:
-          if (+2.0 == self.activeDirection.dPjX) {
-            self.activeDirection.dPjX = 0.0;
-          }
-          break;
-        default:
-          break;
-      }
-    }, self.node);
-  },
-
-  // LIFE-CYCLE CALLBACKS:
-
-  onLoad() {
-    // Properties deliberately hidden from GUI panel.
-    this.activeDirection = {
-      dPjY: 0.0,
-      dPjX: 0.0
-    };
-    this.setInputControls();
-  }
-});
-

frontend/assets/scripts/KeyboardControls.js.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.5",
-  "uuid": "4561a173-bfd2-4f64-b7ba-888cce0e4d9d",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

frontend/assets/scripts/Map.js

@@ -163,8 +163,8 @@ cc.Class({
       return [previousSelfInput, existingInputFrame.inputList[joinIndex - 1]];
     }
     const prefabbedInputList = (null == previousInputFrameDownsyncWithPrediction ? new Array(self.playerRichInfoDict.size).fill(0) : previousInputFrameDownsyncWithPrediction.inputList.slice());
-    const discreteDir = self.ctrl.getDiscretizedDirection();
+    const currSelfInput = self.ctrl.getEncodedInput();
-    prefabbedInputList[(joinIndex - 1)] = discreteDir.encodedIdx;
+    prefabbedInputList[(joinIndex - 1)] = currSelfInput;
     const prefabbedInputFrameDownsync = {
       inputFrameId: inputFrameId,
       inputList: prefabbedInputList,
@@ -173,7 +173,7 @@ cc.Class({
 
     self.dumpToInputCache(prefabbedInputFrameDownsync); // A prefabbed inputFrame, would certainly be adding a new inputFrame to the cache, because server only downsyncs "all-confirmed inputFrames" 
 
-    return [previousSelfInput, discreteDir.encodedIdx];
+    return [previousSelfInput, currSelfInput];
   },
 
   shouldSendInputFrameUpsyncBatch(prevSelfInput, currSelfInput, lastUpsyncInputFrameId, currInputFrameId) {
@@ -204,7 +204,7 @@ cc.Class({
       } else {
         const inputFrameUpsync = {
           inputFrameId: i,
-          encodedDir: inputFrameDownsync.inputList[self.selfPlayerInfo.joinIndex - 1],
+          encoded: inputFrameDownsync.inputList[self.selfPlayerInfo.joinIndex - 1],
         };
         inputFrameUpsyncBatch.push(inputFrameUpsync);
       }
@@ -338,7 +338,7 @@ cc.Class({
     window.mapIns = self;
     window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding;
 
-    self.showCriticalCoordinateLabels = true;
+    self.showCriticalCoordinateLabels = false;
 
     console.warn("+++++++ Map onLoad()");
     window.handleClientSessionError = function() {
@@ -754,12 +754,12 @@ cc.Class({
     const self = this;
     const newPlayerNode = cc.instantiate(self.controlledCharacterPrefab)
     const playerScriptIns = newPlayerNode.getComponent("ControlledCharacter");
+
     if (1 == joinIndex) {
-      newPlayerNode.color = cc.Color.RED;
+      playerScriptIns.setSpecies("SoldierElf");
-    }
+    } else if (2 == joinIndex) {
-    if (2 == joinIndex) {
+      playerScriptIns.setSpecies("SoldierFireGhost");
-      newPlayerNode.color = cc.Color.BLUE;
+      playerScriptIns.animComp.node.scaleX = (-1.0);
-      playerScriptIns.animNode.scaleX = (-1.0);
     }
 
     const wpos = self.virtualGridToWorldPos(vx, vy);
@@ -1039,8 +1039,7 @@ cc.Class({
         const playerCollider = collisionSysMap.get(collisionPlayerIndex);
         const player = currRenderFrame.players[playerId];
 
-        const encodedInput = inputList[joinIndex - 1];
+        const decodedInput = self.ctrl.decodeInput(inputList[joinIndex - 1]);
-        const decodedInput = self.ctrl.decodeDirection(encodedInput);
 
         // console.log(`Got non-zero inputs for playerId=${playerId}, decodedInput=${JSON.stringify(decodedInput)} @currRenderFrame.id=${currRenderFrame.id}, delayedInputFrame.id=${delayedInputFrame.id}`);
         /* 

frontend/assets/scripts/OfflineMap.js

@@ -6,13 +6,6 @@ const OnlineMap = require('./Map');
 cc.Class({
   extends: OnlineMap,
 
-  properties: {
-    keyboardInputControllerNode: {
-      type: cc.Node,
-      default: null
-    },
-  },
-
   onDestroy() {
     console.warn("+++++++ Map onDestroy()");
   },
@@ -21,6 +14,12 @@ cc.Class({
     const self = this;
     const newPlayerNode = cc.instantiate(self.controlledCharacterPrefab)
     const playerScriptIns = newPlayerNode.getComponent("ControlledCharacter");
+    if (1 == joinIndex) {
+      playerScriptIns.setSpecies("SoldierElf");
+    } else if (2 == joinIndex) {
+      playerScriptIns.setSpecies("SoldierFireGhost");
+      playerScriptIns.animComp.node.scaleX = (-1.0);
+    }
     const wpos = self.virtualGridToWorldPos(vx, vy);
 
     newPlayerNode.setPosition(cc.v2(wpos[0], wpos[1]));
@@ -150,6 +149,7 @@ cc.Class({
         players: {
           10: {
             id: 10,
+            joinIndex: 2,
             virtualGridX: 0,
             virtualGridY: 0,
             speed: 2 * self.worldToVirtualGridRatio,

frontend/assets/scripts/TouchEventsManager.js

@@ -94,6 +94,12 @@ cc.Class({
 
   onLoad() {
     this.cachedStickHeadPosition = cc.v2(0.0, 0.0);
+    this.cachedBtnUpLevel = 0;
+    this.cachedBtnDownLevel = 0;
+    this.cachedBtnLeftLevel = 0;
+    this.cachedBtnRightLevel = 0;
+    this.cachedBtnALevel = 0;
+
     this.canvasNode = this.mapNode.parent;
     this.mainCameraNode = this.canvasNode.getChildByName("Main Camera"); // Cannot drag and assign the `mainCameraNode` from CocosCreator EDITOR directly, otherwise it'll cause an infinite loading time, till v2.1.0.
     this.mainCamera = this.mainCameraNode.getComponent(cc.Camera);
@@ -143,6 +149,51 @@ cc.Class({
       self._touchEndEvent(event);
     });
     zoomingListenerNode.inTouchPoints = new Map();
+
+    // Setup keyboard controls for the ease of attach debugging
+    cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, function(evt) {
+      switch (evt.keyCode) {
+        case cc.macro.KEY.w:
+          self.cachedBtnUpLevel = 1;
+          break;
+        case cc.macro.KEY.s:
+          self.cachedBtnDownLevel = 1;
+          break;
+        case cc.macro.KEY.a:
+          self.cachedBtnLeftLevel = 1;
+          break;
+        case cc.macro.KEY.d:
+          self.cachedBtnRightLevel = 1;
+          break;
+        case cc.macro.KEY.h:
+          self.cachedBtnALevel = 1;
+          break;
+        default:
+          break;
+      }
+    }, this);
+
+    cc.systemEvent.on(cc.SystemEvent.EventType.KEY_UP, function(evt) {
+      switch (evt.keyCode) {
+        case cc.macro.KEY.w:
+          self.cachedBtnUpLevel = 0;
+          break;
+        case cc.macro.KEY.s:
+          self.cachedBtnDownLevel = 0;
+          break;
+        case cc.macro.KEY.a:
+          self.cachedBtnLeftLevel = 0;
+          break;
+        case cc.macro.KEY.d:
+          self.cachedBtnRightLevel = 0;
+          break;
+        case cc.macro.KEY.h:
+          self.cachedBtnALevel = 0;
+          break;
+        default:
+          break;
+      }
+    }, this);
   },
 
   _isMapOverMoved(mapTargetPos) {
@@ -239,7 +290,6 @@ cc.Class({
 
     // TODO: Handle single-finger-click event.
     } while (false);
-    this.cachedStickHeadPosition = cc.v2(0.0, 0.0);
     for (let touch of event._touches) {
       if (touch) {
         theListenerNode.inTouchPoints.delete(touch._id);
@@ -252,7 +302,42 @@ cc.Class({
   update(dt) {
     if (this.inMultiTouch) return;
     if (true != this.initialized) return;
+    const self = this;
+    // Keyboard takes top priority
+    let keyboardDiffVec = cc.v2(0, 0);
+    if (1 == this.cachedBtnUpLevel) {
+      if (1 == this.cachedBtnLeftLevel) {
+        keyboardDiffVec = cc.v2(-1.0, +1.0);
+      } else if (1 == this.cachedBtnRightLevel) {
+        keyboardDiffVec = cc.v2(+1.0, +1.0);
+      } else {
+        keyboardDiffVec = cc.v2(0.0, +1.0);
+      }
+    } else if (1 == this.cachedBtnDownLevel) {
+      if (1 == this.cachedBtnLeftLevel) {
+        keyboardDiffVec = cc.v2(-1.0, -1.0);
+      } else if (1 == this.cachedBtnRightLevel) {
+        keyboardDiffVec = cc.v2(+1.0, -1.0);
+      } else {
+        keyboardDiffVec = cc.v2(0.0, -1.0);
+      }
+    } else if (1 == this.cachedBtnLeftLevel) {
+      keyboardDiffVec = cc.v2(-1.0, 0.0);
+    } else if (1 == this.cachedBtnRightLevel) {
+      keyboardDiffVec = cc.v2(+1.0, 0.0);
+    }
+    if (0 != keyboardDiffVec.x || 0 != keyboardDiffVec.y) {
+      this.cachedStickHeadPosition = keyboardDiffVec.mul(this.maxHeadDistance / keyboardDiffVec.mag());
+    }
     this.stickhead.setPosition(this.cachedStickHeadPosition);
+
+    const translationListenerNode = (self.translationListenerNode ? self.translationListenerNode : self.mapNode);
+    if (0 == translationListenerNode.inTouchPoints.size
+      &&
+      (0 == keyboardDiffVec.x && 0 == keyboardDiffVec.y)
+    ) {
+      this.cachedStickHeadPosition = cc.v2(0, 0); // Important reset!
+    }
   },
 
   discretizeDirection(continuousDx, continuousDy, eps) {
@@ -312,18 +397,23 @@ cc.Class({
     return ret;
   },
 
-  decodeDirection(encodedDirection) {
+  getEncodedInput() {
-    const mapped = window.DIRECTION_DECODER[encodedDirection];
+    const discretizedDir = this.discretizeDirection(this.stickhead.x, this.stickhead.y, this.joyStickEps).encodedIdx; // There're only 9 dirs, thus using only the lower 4-bits
-    if (null == mapped) {
+    const btnALevel = (this.cachedBtnALevel << 4);
-      console.error("Unexpected encodedDirection = ", encodedDirection);
+    return (btnALevel + discretizedDir);
-    }
-    return {
-      dx: mapped[0],
-      dy: mapped[1],
-    };
   },
 
-  getDiscretizedDirection() {
+  decodeInput(encodedInput) {
-    return this.discretizeDirection(this.cachedStickHeadPosition.x, this.cachedStickHeadPosition.y, this.joyStickEps);
+    const encodedDirection = (encodedInput & 0xf);
+    const mappedDirection = window.DIRECTION_DECODER[encodedDirection];
+    if (null == mappedDirection) {
+      console.error("Unexpected encodedDirection = ", encodedDirection);
     }
+    const btnALevel = ((encodedInput >> 4) & 1);
+    return {
+      dx: mappedDirection[0],
+      dy: mappedDirection[1],
+      a: btnALevel,
+    };
+  },
 });