Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added fix for Stretch movement. #129

Merged
merged 7 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.zip filter=lfs diff=lfs merge=lfs -text
template/Bathing/10-7[[:space:]]RCareToborFix_Data/StreamingAssets/aa/StandaloneLinux64/user_assets_all_8a7e8c517c5bd193b6a83d9a3d7b4a7a.bundle filter=lfs diff=lfs merge=lfs -text
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ jobs:
pip uninstall -y numpy
conda install numpy
cd ../

pytest tests/
6 changes: 3 additions & 3 deletions pyrcareworld/pyrcareworld/attributes/controller_attr.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def TurnLeft(self, angle: float, speed: float):
:param angle: Float, rotation angle.
:param speed: Float, velocity.
"""
self._send_data("TurnLeft", float(angle), float(speed*2000))
self._send_data("TurnLeft", float(angle), float(speed*100))

def TurnRight(self, angle: float, speed: float):
"""
Expand All @@ -218,7 +218,7 @@ def TurnRight(self, angle: float, speed: float):
:param angle: Float, rotation angle.
:param speed: Float, velocity.
"""
self._send_data("TurnRight", float(angle), float(speed*2000))
self._send_data("TurnRight", float(angle), float(speed*100))

def StopMovement(self):
"""
Expand Down Expand Up @@ -379,4 +379,4 @@ def AddRoot6DOF(self, new_id: int = None):
new_id = int("1" + str(self.id))
self._send_data("AddRoot6DOF", new_id)
self.env.attrs[new_id] = ControllerAttr(self.env, new_id)
return self.env.attrs[new_id]
return self.env.attrs[new_id]
11 changes: 7 additions & 4 deletions pyrcareworld/pyrcareworld/envs/bathing_env.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
"""Bathing environment for the PhyRC competition."""

from pyrcareworld.attributes.camera_attr import CameraAttr
from pyrcareworld.attributes.controller_attr import ControllerAttr
from pyrcareworld.attributes.sponge_attr import SpongeAttr
from pyrcareworld.envs.base_env import RCareWorld
from pathlib import Path

Expand All @@ -20,18 +23,18 @@ class BathingEnv(RCareWorld):
def __init__(self, executable_file=str(_DEFAULT_EXECUTABLE_PATH), *args, **kwargs):
super().__init__(executable_file=executable_file, *args, **kwargs)

def get_robot(self):
def get_robot(self) -> ControllerAttr:
"""Access the robot."""
return self.GetAttr(self._robot_id)

def get_gripper(self):
def get_gripper(self) -> ControllerAttr:
"""Access the gripper."""
return self.GetAttr(self._gripper_id)

def get_camera(self):
def get_camera(self) -> CameraAttr:
"""Access the camera."""
return self.GetAttr(self._camera_id)

def get_sponge(self):
def get_sponge(self) -> SpongeAttr:
"""Access the sponge."""
return self.GetAttr(self._sponge_id)
Binary file modified template/Bathing/BathingPlayer.x86_64
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
Library: /home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--platform=Linux
--backend=burst-llvm-16
--target=X64_SSE2
Expand All @@ -7,12 +7,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+Relu6Job_Full_Float, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+Relu6Job_Full_Float&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--db5dc6c8ea53410100f79e66afceabda
Expand Down Expand Up @@ -123,12 +122,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+Relu6Job_Full_Float, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+Relu6Job_Full_Float&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--db5dc6c8ea53410100f79e66afceabda
Expand Down Expand Up @@ -239,12 +237,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+ElementwiseMinJob_Full_Half, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+ElementwiseMinJob_Full_Half&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--29c9a32da97e10019f953470978e130e
Expand Down Expand Up @@ -294,12 +291,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+ElementwiseMinJob_Full_Half, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+ElementwiseMinJob_Full_Half&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--29c9a32da97e10019f953470978e130e
Expand Down Expand Up @@ -350,12 +346,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--float-precision=Low
--target-framework=NetFramework
--float-mode=Fast
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+ExpBiasReduceJob_Full_Half, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+ExpBiasReduceJob_Full_Half&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--270ed1e9cc63181baf35e9074fbf6e3e
Expand Down Expand Up @@ -401,12 +396,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--float-precision=Low
--target-framework=NetFramework
--float-mode=Fast
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Jobs.IJobParallelForExtensions+ParallelForJobStruct`1[[Unity.Barracuda.BurstCPUOps+ExpBiasReduceJob_Full_Half, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(Unity.Barracuda.BurstCPUOps+ExpBiasReduceJob_Full_Half&, Unity.Barracuda, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--270ed1e9cc63181baf35e9074fbf6e3e
Expand Down Expand Up @@ -451,12 +445,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Burst.BurstCompiler+BurstCompilerHelper, Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::IsBurstEnabled()--8c2be93e18276203cbd918daa2748a10
Expand Down Expand Up @@ -567,12 +560,11 @@ Library: F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burs
--dump=Function
--float-precision=Standard
--target-framework=NetFramework
--generate-link-xml=Temp\burst.link.xml
--temp-folder=F:\Code\UnityProject\RCare2+Obi6\Temp\Burst
--debug=LineOnly
--key-folder=F:/Code/Unity/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=F:\Code\UnityProject\RCare2+Obi6\Library\Burst
--output=F:\Code\UnityProject\RCare2+Obi6\Temp\BurstOutput\Data\Plugins\lib_burst_generated
--generate-link-xml=Temp/burst.link.xml
--temp-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/Burst
--key-folder=/home/cathy/Unity/Hub/Editor/2022.3.34f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport
--decode-folder=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Library/Burst
--output=/home/cathy/Workspace/phy-robo-care/UnityProject/RCare2+Obi6/Temp/BurstOutput/Data/Plugins/lib_burst_generated
--pdb-search-paths=Temp/ManagedSymbols/

--method=Unity.Burst.BurstCompiler+BurstCompilerHelper, Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::IsBurstEnabled()--8c2be93e18276203cbd918daa2748a10
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Autodesk.Fbx.dll
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/CoACD.dll
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Obi.dll
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Pcx.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/RFUniverse.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Unity.Barracuda.dll
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Unity.Burst.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Unity.Recorder.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/Unity.Timeline.dll
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/UnityEngine.UI.dll
Binary file not shown.
Binary file modified template/Bathing/BathingPlayer_Data/Managed/vhacd.dll
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -158,25 +158,16 @@
<type fullname="UnityEngine.UIElements.ThemeStyleSheet" preserve="all" />
<type fullname="UnityEngine.UIElements.UIDocument" preserve="all" />
<type fullname="UnityEngine.UIElements.VisualTreeAsset" preserve="all" />
<type fullname="UnityEngine.UIElements.Button/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.Label/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.ScrollView/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.Slider/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleProperty" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleRule" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleSheets.Dimension" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleValueHandle" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.UxmlRootElementFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.VisualElement/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.VisualElementAsset" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.DynamicAtlasSettings" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleComplexSelector" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleSelector" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleSelectorPart" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.StyleSheets.ScalableImage" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.FloatField/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.GroupBox/UxmlFactory" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UIElements.Toggle/UxmlFactory" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Canvas" preserve="all" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fa114898e5abd733b15a6856b435c238

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Loading