UVCXR/Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
UVCLimHun
2025-07-22 18:02:00 +09:00
parent 0af1034974
commit 261fbac539
14 changed files with 102 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Conveyor.prefab
View File

@@ -174,7 +174,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 75}
m_SizeDelta: {x: 300, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -307,7 +307,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

6
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab
View File

@@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 102}
m_SizeDelta: {x: 300, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -369,7 +369,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -584,7 +584,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67
value: -72
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

6
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab
View File

@@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 102}
m_SizeDelta: {x: 300, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -349,7 +349,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -566,7 +566,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67
value: -72
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

12
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab
View File

@@ -178,7 +178,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 188}
m_SizeDelta: {x: 300, y: 193}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -355,7 +355,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -572,7 +572,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -121
value: -126
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -789,7 +789,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -148
value: -153
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1006,7 +1006,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67
value: -72
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1223,7 +1223,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -94
value: -99
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

4
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Sink.prefab
View File

@@ -174,7 +174,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 75}
m_SizeDelta: {x: 300, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -343,7 +343,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

6
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Source.prefab
View File

@@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 102}
m_SizeDelta: {x: 300, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -345,7 +345,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -558,7 +558,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67
value: -72
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

6
Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab
View File

@@ -175,7 +175,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 102}
m_SizeDelta: {x: 300, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255244719177744486
CanvasRenderer:
@@ -345,7 +345,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -40
value: -45
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -558,7 +558,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_AnchoredPosition.y
value: -67
value: -72
objectReference: {fileID: 0}
- target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

44
Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab
View File

@@ -40,7 +40,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8821954000461372192}
- component: {fileID: 1911005932232925378}
m_Layer: 0
m_Name: TransporterPosition
m_TagString: Untagged
@@ -63,27 +62,6 @@ Transform:
m_Children: []
m_Father: {fileID: 3137325652683494274}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!65 &1911005932232925378
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1614332710282870568}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2823787419424581068
GameObject:
m_ObjectHideFlags: 0
@@ -179,7 +157,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1810991537706168995}
- component: {fileID: 6043047124662958686}
m_Layer: 0
m_Name: TransporterPosition (1)
m_TagString: Untagged
@@ -202,27 +179,6 @@ Transform:
m_Children: []
m_Father: {fileID: 3137325652683494274}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!65 &6043047124662958686
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3392206005471942842}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3405731869049931283
GameObject:
m_ObjectHideFlags: 0

64
Assets/Resources/Library/LibraryPrefab/Store_BufferRack.prefab
View File

@@ -25,7 +25,7 @@ Transform:
m_GameObject: {fileID: 176473125807648944}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.84, y: 2.65, z: -0}
m_LocalPosition: {x: 2.84, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -56,7 +56,7 @@ Transform:
m_GameObject: {fileID: 626609241899090828}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.78, y: 0.03, z: -0}
m_LocalPosition: {x: -2.78, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -118,7 +118,7 @@ Transform:
m_GameObject: {fileID: 1405554230339421793}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.78, y: 4, z: -0}
m_LocalPosition: {x: -2.78, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -180,7 +180,7 @@ Transform:
m_GameObject: {fileID: 2176810382504552171}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.81, y: 0.03, z: -0}
m_LocalPosition: {x: -3.81, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -211,7 +211,7 @@ Transform:
m_GameObject: {fileID: 2346815303386828598}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.81, y: 4, z: -0}
m_LocalPosition: {x: -3.81, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -242,7 +242,7 @@ Transform:
m_GameObject: {fileID: 2412496226233222934}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.88, y: 2.65, z: -0}
m_LocalPosition: {x: 3.88, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -366,7 +366,7 @@ Transform:
m_GameObject: {fileID: 2717765109085383880}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.62, y: 1.39, z: -0}
m_LocalPosition: {x: 0.62, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -428,7 +428,7 @@ Transform:
m_GameObject: {fileID: 3008735273986023254}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59, y: 1.39, z: -0}
m_LocalPosition: {x: -0.59, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -459,7 +459,7 @@ Transform:
m_GameObject: {fileID: 3010343666505441744}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.68, y: 0.03, z: -0}
m_LocalPosition: {x: 1.68, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -490,7 +490,7 @@ Transform:
m_GameObject: {fileID: 3148044407811774202}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.65, y: 1.39, z: -0}
m_LocalPosition: {x: -1.65, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -521,7 +521,7 @@ Transform:
m_GameObject: {fileID: 3205260892716880778}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.68, y: 1.39, z: -0}
m_LocalPosition: {x: 1.68, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -552,7 +552,7 @@ Transform:
m_GameObject: {fileID: 3475285108277225809}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.84, y: 4, z: -0}
m_LocalPosition: {x: 2.84, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -583,7 +583,7 @@ Transform:
m_GameObject: {fileID: 3510490193301291529}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.81, y: 2.65, z: -0}
m_LocalPosition: {x: -3.81, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -614,7 +614,7 @@ Transform:
m_GameObject: {fileID: 3592562177351420955}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59, y: 0.03, z: -0}
m_LocalPosition: {x: -0.59, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -645,7 +645,7 @@ Transform:
m_GameObject: {fileID: 3782249051454301750}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.68, y: 2.65, z: -0}
m_LocalPosition: {x: 1.68, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -707,7 +707,7 @@ Transform:
m_GameObject: {fileID: 4128381698608160793}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.62, y: 4, z: -0}
m_LocalPosition: {x: 0.62, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -738,7 +738,7 @@ Transform:
m_GameObject: {fileID: 4261383916342080362}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.84, y: 1.39, z: -0}
m_LocalPosition: {x: 2.84, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -808,7 +808,7 @@ Transform:
m_GameObject: {fileID: 4508280095499066049}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.65, y: 0.03, z: -0}
m_LocalPosition: {x: -1.65, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -839,7 +839,7 @@ Transform:
m_GameObject: {fileID: 4664715409228248419}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.65, y: 4, z: -0}
m_LocalPosition: {x: -1.65, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -902,7 +902,7 @@ Transform:
m_GameObject: {fileID: 4741053644897933099}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.78, y: 2.65, z: -0}
m_LocalPosition: {x: -2.78, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -933,7 +933,7 @@ Transform:
m_GameObject: {fileID: 4856973095821483961}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.88, y: 0.03, z: 0}
m_LocalPosition: {x: 3.88, y: 0.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -964,7 +964,7 @@ Transform:
m_GameObject: {fileID: 4916798379862687920}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.81, y: 1.39, z: -0}
m_LocalPosition: {x: -3.81, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -995,7 +995,7 @@ Transform:
m_GameObject: {fileID: 5091855500062975139}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.88, y: 4, z: -0}
m_LocalPosition: {x: 3.88, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1120,7 +1120,7 @@ Transform:
m_GameObject: {fileID: 5705097384651535724}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.65, y: 2.65, z: -0}
m_LocalPosition: {x: -1.65, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1151,7 +1151,7 @@ Transform:
m_GameObject: {fileID: 5938124988120266571}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.62, y: 0.03, z: -0}
m_LocalPosition: {x: 0.62, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1182,7 +1182,7 @@ Transform:
m_GameObject: {fileID: 6012389562074536858}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59, y: 2.65, z: -0}
m_LocalPosition: {x: -0.59, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1213,7 +1213,7 @@ Transform:
m_GameObject: {fileID: 6199624609152728616}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.88, y: 1.39, z: -0}
m_LocalPosition: {x: 3.88, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1306,7 +1306,7 @@ Transform:
m_GameObject: {fileID: 7663275756904372759}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.84, y: 0.03, z: -0}
m_LocalPosition: {x: 2.84, y: 0.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1337,7 +1337,7 @@ Transform:
m_GameObject: {fileID: 7923651137269095608}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.78, y: 1.39, z: -0}
m_LocalPosition: {x: -2.78, y: 1.9, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1368,7 +1368,7 @@ Transform:
m_GameObject: {fileID: 8002266870659208437}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.68, y: 4, z: -0}
m_LocalPosition: {x: 1.68, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1399,7 +1399,7 @@ Transform:
m_GameObject: {fileID: 8102185881794969019}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.59, y: 4, z: -0}
m_LocalPosition: {x: -0.59, y: 4.5, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1461,7 +1461,7 @@ Transform:
m_GameObject: {fileID: 8567808428072664291}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.62, y: 2.65, z: -0}
m_LocalPosition: {x: 0.62, y: 3.15, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

8
Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Camera/RTFocusCamera.cs
View File

@@ -120,6 +120,8 @@ namespace RTG
public CameraHotkeys Hotkeys { get { return _hotkeys; } }
public CameraLimit LimitSetting { get { return _cameraLimitSetting; } }
public bool isLoad = false;
private WebReceiver _receiver;
public bool IsViewportHoveredByDevice()
{
@@ -131,7 +133,8 @@ namespace RTG
public void SetTargetCamera(Camera camera)
{
if (camera == null) return;
if (camera == null)
return;
if (Application.isPlaying)
{
@@ -165,7 +168,8 @@ namespace RTG
{
return;
}
var cam = JsonUtility.FromJson<CameraEntity>(json);
isLoad = true;
var cam = JsonUtility.FromJson<CameraEntity>(json);
if (_targetCamera != null)
{
_targetCamera.transform.position = new Vector3(cam.posX, cam.posY, cam.posZ);

8
Assets/Scripts/RTGController.cs
View File

@@ -58,6 +58,7 @@ public class RTGController : UnitySingleton<RTGController>
workGizmo = objectMoveGizmo;
workGizmoId = GizmoId.None;
simulationUI = FindAnyObjectByType<Panel_SimulationUI>();
simulationUI.onPlaying += (flag)=>SetClear();
}
private void Update()
@@ -131,6 +132,13 @@ public class RTGController : UnitySingleton<RTGController>
workGizmo.RefreshPositionAndRotation();
}
}
void SetClear()
{
selectedObjects.Clear();
OnSelectionChanged();
}
private void OnSelectionChanged()
{
if (selectedObjects.Count != 0)

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 2193962706157699151
- rid: 2193962706157699152
- rid: 2193962706157699187
- rid: 2193962706157699188
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 2193962706157699153
- rid: 2193962706157699154
- rid: 2193962706157699189
- rid: 2193962706157699190
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 2193962706157699155
- rid: 2193962706157699156
- rid: 2193962706157699157
- rid: 2193962706157699158
- rid: 2193962706157699159
- rid: 2193962706157699160
- rid: 2193962706157699191
- rid: 2193962706157699192
- rid: 2193962706157699193
- rid: 2193962706157699194
- rid: 2193962706157699195
- rid: 2193962706157699196
- rid: 6852985685364965392
- rid: 2193962706157699161
- rid: 2193962706157699197
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 5092397466944798720
- rid: 2193962706157699162
- rid: 2193962706157699198
m_RuntimeSettings:
m_List:
- rid: 6852985685364965378
@@ -97,14 +97,14 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 2193962706157699151
- rid: 2193962706157699187
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 2193962706157699152
- rid: 2193962706157699188
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -116,7 +116,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 2193962706157699153
- rid: 2193962706157699189
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -131,7 +131,7 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 2193962706157699154
- rid: 2193962706157699190
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -140,7 +140,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 2193962706157699155
- rid: 2193962706157699191
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -153,13 +153,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 2193962706157699156
- rid: 2193962706157699192
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 2193962706157699157
- rid: 2193962706157699193
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -172,12 +172,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 2193962706157699158
- rid: 2193962706157699194
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 2193962706157699159
- rid: 2193962706157699195
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -187,21 +187,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 2193962706157699160
- rid: 2193962706157699196
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 2193962706157699161
- rid: 2193962706157699197
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 2193962706157699162
- rid: 2193962706157699198
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}

4
Assets/WorkSpace/LH/Web/WebReceiver.cs
View File

@@ -21,9 +21,9 @@ namespace Octopus.Simulator.Networks
onParameterRecived += FindAnyObjectByType<ProjectDataManager>().RequestInfo;
onParameterRecived += FindAnyObjectByType<LogicDataManager>().RequestInfo;
#if UNITY_EDITOR
config.projectId = "45";
config.projectId = "37";
//config.simulationId = "15";
config.logicId = "50";
config.logicId = "42";
WebParameters.config = config;
onParameterRecived?.Invoke();
#else

11
Assets/WorkSpace/LWJ/SaveLoadmanager.cs
View File

@@ -6,6 +6,7 @@ using System.IO;
using System.Linq;
using System.Text;
using UVC.Networks;
using RTG;
namespace Octopus.Simulator.Networks
{
@@ -202,13 +203,17 @@ namespace Octopus.Simulator.Networks
{
loadInfos = JsonConvert.DeserializeObject<List<SimulationModelInfo>>(jsonData);
}
catch(JsonSerializationException e)
catch (JsonSerializationException e)
{
Debug.Log("loadfromdb");
loadEntity = JsonConvert.DeserializeObject<SaveLoadEntity>(jsonData);
loadInfos = loadEntity.modelInfos;
UnityEngine.Camera.main.transform.position = ParseVector3(loadEntity.cameraPositionInfo.position);
UnityEngine.Camera.main.transform.eulerAngles = ParseVector3(loadEntity.cameraPositionInfo.rotation);
if (!FindAnyObjectByType<RTFocusCamera>().isLoad)
{
UnityEngine.Camera.main.transform.position = ParseVector3(loadEntity.cameraPositionInfo.position);
UnityEngine.Camera.main.transform.eulerAngles = ParseVector3(loadEntity.cameraPositionInfo.rotation);
}
}