diff --git a/DemoUnity/Assets/Scripts/LoginGUI.cs b/DemoUnity/Assets/Scripts/LoginGUI.cs index 0f0dce9..e7036f8 100644 --- a/DemoUnity/Assets/Scripts/LoginGUI.cs +++ b/DemoUnity/Assets/Scripts/LoginGUI.cs @@ -179,6 +179,7 @@ public class LoginGUI : MonoBehaviour { } } + public void OnToFriend() { state = 4; diff --git a/DemoUnity/UserSettings/Layouts/default-2021.dwlt b/DemoUnity/UserSettings/Layouts/default-2021.dwlt index d37970b..effdc72 100644 --- a/DemoUnity/UserSettings/Layouts/default-2021.dwlt +++ b/DemoUnity/UserSettings/Layouts/default-2021.dwlt @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 89 + controlID: 17 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 340 height: 751 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 90 + controlID: 18 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 91 + controlID: 19 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,8 +268,8 @@ MonoBehaviour: y: 0 width: 828 height: 445.5 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -292,7 +292,7 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -331,9 +331,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 7} - m_SelectedIDs: dcc60000 - m_LastClickedID: 50908 - m_ExpandedIDs: 00000000cec60000ffffff7f + m_SelectedIDs: 38710000 + m_LastClickedID: 28984 + m_ExpandedIDs: 0000000006710000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,7 +361,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 0000000006710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -386,8 +386,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e0ca0000 - m_LastClickedInstanceID: 51936 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -475,7 +475,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -491,9 +491,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e0ca0000 - m_LastClickedID: 51936 - m_ExpandedIDs: 6ab0ffff20b2ffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 10fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -533,7 +533,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -872,7 +872,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -918,7 +918,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -965,7 +965,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..10e84dd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM node:18.15.0 +EXPOSE 3999 +EXPOSE 3010 +EXPOSE 3011 +WORKDIR /works/jc/r2/game-server +RUN mkdir -p /works/jc/r2 +COPY . /works/jc/r2 +CMD npm run start diff --git a/game-server/app/util/dispatcher.js b/game-server/app/util/dispatcher.js index 9d3012f..26aa302 100644 --- a/game-server/app/util/dispatcher.js +++ b/game-server/app/util/dispatcher.js @@ -3,5 +3,4 @@ var crc = require('crc'); module.exports.dispatch = function(uid, connectors) { var index = Math.abs(crc.crc32(uid)) % connectors.length; return connectors[index]; -}; - +}; \ No newline at end of file diff --git a/game-server/k8s/nginx-deployment.yaml b/game-server/k8s/nginx-deployment.yaml new file mode 100644 index 0000000..685c17a --- /dev/null +++ b/game-server/k8s/nginx-deployment.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + app: nginx +spec: + replicas: 3 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx:1.14.2 + ports: + - containerPort: 80