link node replicator to node sync component

yumwifi · Aug 6, 2023 · 1460367 · 1460367
1 parent 8431d2b
commit 1460367
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/assets/Script/example/sync/SyncUI.ts b/assets/Script/example/sync/SyncUI.ts
@@ -1,6 +1,6 @@
 import { _decorator, Component, Button } from 'cc';
+import { ClientReplicator } from '../../sync/components/ClientReplicator';
 import { ServerReplicator } from '../../sync/components/ServerReplicator';
-import ClientReplicator from '../../sync/components/ClientReplicator';
 const { ccclass, property } = _decorator;
 
 @ccclass('SyncUI')

diff --git a/assets/Script/sync/NodeReplicator.ts b/assets/Script/sync/NodeReplicator.ts
@@ -3,7 +3,12 @@ import { IReplicator } from './SyncUtil';
 import { createReplicator } from './ReplicatorFactory';
 import { getReplicateMark } from './ReplicateMark';
 
-class NodeReplicator implements IReplicator {
+/**
+ * NodeReplicator用于管理当前节点及其子节点的所有标记为同步的组件
+ * 维护这些组件的Replicator，以及生成Diff
+ * NodeReplicator当前的版本不支持节点和组件的动态添加和删除
+ */
+export default class NodeReplicator implements IReplicator {
     private target: Node;
     private replicators: Map<string, IReplicator> = new Map();
     private version: number = 0;

diff --git a/assets/Script/sync/ReplicatorFactory.ts b/assets/Script/sync/ReplicatorFactory.ts
@@ -1,4 +1,4 @@
-import { Vec3 } from "cc";
+import { Vec3, Node } from "cc";
 import { ArrayLinkReplicator, ArrayReplicator, SimpleArrayReplicator } from "./ArrayReplicator";
 import { CCVec3Replicator } from "./CocosReplicator";
 import { ReplicateScanner } from "./DiffScaner";
@@ -7,6 +7,7 @@ import ReplicateMark, { ReplicateType } from "./ReplicateMark";
 import { IReplicator, isSimpleType } from "./SyncUtil";
 import { SimpleSetReplicator } from "./SetReplicator";
 import { HashReplicator, SimpleHashReplicator } from "./HashReplicator";
+import NodeReplicator from "./NodeReplicator";
 
 export function createReplicator(target: any, mark?: ReplicateMark): IReplicator | null {
     // 根据target的类型和mark参数决定创建哪种类型的Replicator
@@ -33,6 +34,8 @@ export function createReplicator(target: any, mark?: ReplicateMark): IReplicator
         return null;
     } else if (target instanceof Vec3) {
         return new CCVec3Replicator(target);
+    } else if (target instanceof Node) {
+        return new NodeReplicator(target);
     } else if (target instanceof Set) {
         return new SimpleSetReplicator(target, mark);
     } else if (target instanceof Map) {

diff --git a/assets/Script/sync/components/NodeSync.ts b/assets/Script/sync/components/NodeSync.ts
@@ -1,5 +1,6 @@
 import { _decorator, Component, Node } from 'cc';
 import { ServerReplicator } from './ServerReplicator';
+import NodeReplicator from '../NodeReplicator';
 const { ccclass, property } = _decorator;
 
 @ccclass('NodeSync')
@@ -10,6 +11,9 @@ export class NodeSync extends Component {
     @property
     public prefabPath: string = '';
 
+    @property
+    public replicator: NodeReplicator | null = null;
+
     public childrenNodeSync: NodeSync[] = [];
 
     public setInstanceId(id: number) {
@@ -26,6 +30,31 @@ export class NodeSync extends Component {
 
     onEnable() {
         this.registerToParent();
+        if (!this.replicator) {
+            this.replicator = new NodeReplicator(this.node);
+        }
+    }
+
+    /**
+     * 生成一个Diff对象
+     */
+    genDiff(fromVersion: number, toVersion: number): any {
+        return this.replicator?.genDiff(fromVersion, toVersion);
+    }
+
+    /**
+     * 应用一个Diff对象
+     * @param diff Diff对象
+     */
+    applyDiff(diff: any): void {
+        this.replicator?.applyDiff(diff);
+    }
+
+    /**
+     * 获取当前版本
+     */
+    getVersion(): number {
+        return this.replicator?.getVersion() || 0;
     }
 
     private registerToParent() {

diff --git a/profiles/v2/packages/scene.json b/profiles/v2/packages/scene.json
@@ -163,7 +163,7 @@
     }
   },
   "camera-uuids": [
-    "f46876e4-e81b-4931-b493-6d367be385e7"
+    "4753fa27-55ac-44df-94a5-a91c50b1cd4d"
   ],
   "float-window": {
     "position": {