Skip to content

Commit d67be3f

Browse files
committed
Move ServerConfig and Room Guid assets into each sample
Each sample now has its own Room Guid (with a unique room UUID) and ServerConfig so that samples are self-contained and work when imported individually via UPM. The old shared assets at the project root are removed since scenes no longer reference them.
1 parent 08b86d1 commit d67be3f

32 files changed

+374
-21
lines changed

Unity/Assets/Ubiq-Genie/Apps/Base/Base.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ MonoBehaviour:
215215
m_Script: {fileID: 11500000, guid: 31236ae480c068b47b3b029b89d511ba, type: 3}
216216
m_Name:
217217
m_EditorClassIdentifier:
218-
Guid: {fileID: 11400000, guid: 414ee18d2da694c8a9fafb3dc4c3bc49, type: 2}
218+
Guid: {fileID: 11400000, guid: 56a2a50016d84228ab01bc81220d90f5, type: 2}
219219
networkScene: {fileID: 859863062}
220220
roomClient: {fileID: 859863063}
221221
joinOnStart: 1
@@ -946,7 +946,7 @@ PrefabInstance:
946946
- target: {fileID: 3723249095139361142, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3}
947947
propertyPath: 'servers.Array.data[0]'
948948
value:
949-
objectReference: {fileID: -7849211376014683480, guid: 156a847df94e049da8a3a994f0142289, type: 2}
949+
objectReference: {fileID: -7849211376014683480, guid: 7cbf271ac2da43faa288e3661695ce40, type: 2}
950950
- target: {fileID: 3920886893764889674, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3}
951951
propertyPath: m_AnchorMax.y
952952
value: 0

Unity/Assets/Room Guid.asset renamed to Unity/Assets/Ubiq-Genie/Apps/Base/Room Guid.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 5abd7a152c301c644881029954909eab, type: 3}
1313
m_Name: Room Guid
1414
m_EditorClassIdentifier:
15-
Guid: 6765c52b-3ad6-4fb0-9030-2c9a05dc4731
15+
Guid: 3cdcb02a-745f-41a9-ab79-da3b48d9434d

Unity/Assets/Room Guid.asset.meta renamed to Unity/Assets/Ubiq-Genie/Apps/Base/Room Guid.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity/Assets/ServerConfig.asset renamed to Unity/Assets/Ubiq-Genie/Apps/Base/ServerConfig.asset

File renamed without changes.

Unity/Assets/ServerConfig.asset.meta renamed to Unity/Assets/Ubiq-Genie/Apps/Base/ServerConfig.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity/Assets/Ubiq-Genie/Apps/ConversationalAgent/ConversationalAgent.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9302,7 +9302,7 @@ MonoBehaviour:
93029302
m_Script: {fileID: 11500000, guid: 31236ae480c068b47b3b029b89d511ba, type: 3}
93039303
m_Name:
93049304
m_EditorClassIdentifier:
9305-
Guid: {fileID: 11400000, guid: 414ee18d2da694c8a9fafb3dc4c3bc49, type: 2}
9305+
Guid: {fileID: 11400000, guid: 486e99dd89f946d9b2e77658f8c15906, type: 2}
93069306
networkScene: {fileID: 8839457145026391852}
93079307
roomClient: {fileID: 8839457145026391853}
93089308
joinOnStart: 1
@@ -9862,7 +9862,7 @@ PrefabInstance:
98629862
- target: {fileID: 3723249095139361142, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3}
98639863
propertyPath: 'servers.Array.data[0]'
98649864
value:
9865-
objectReference: {fileID: -7849211376014683480, guid: 156a847df94e049da8a3a994f0142289, type: 2}
9865+
objectReference: {fileID: -7849211376014683480, guid: 17ec03d7e25d4dd889a7b78eb638f4e9, type: 2}
98669866
- target: {fileID: 3920886893764889674, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3}
98679867
propertyPath: m_AnchorMax.y
98689868
value: 0
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 5abd7a152c301c644881029954909eab, type: 3}
13+
m_Name: Room Guid
14+
m_EditorClassIdentifier:
15+
Guid: 452dbb15-1985-45b1-9b26-507026655332

Unity/Assets/Ubiq-Genie/Apps/ConversationalAgent/Room Guid.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7849211376014683480
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 9258ee9d68b597d40ac401b2c1f8c3a1, type: 3}
13+
m_Name: ServerConfig
14+
m_EditorClassIdentifier:
15+
listenOnIp:
16+
listenOnPort:
17+
sendToIp: localhost
18+
sendToPort: 8009
19+
type: 0
20+
platforms:
21+
- platform: 17
22+
connection: {fileID: -4538272763558664669}
23+
--- !u!114 &-4538272763558664669
24+
MonoBehaviour:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 0}
30+
m_Enabled: 1
31+
m_EditorHideFlags: 0
32+
m_Script: {fileID: 11500000, guid: 9258ee9d68b597d40ac401b2c1f8c3a1, type: 3}
33+
m_Name: Platform Connection
34+
m_EditorClassIdentifier:
35+
listenOnIp:
36+
listenOnPort:
37+
sendToIp: localhost
38+
sendToPort: 8010
39+
type: 3
40+
platforms: []

Unity/Assets/Ubiq-Genie/Apps/ConversationalAgent/ServerConfig.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)