Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
3
3D Fruit
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanqing
3D Fruit
Commits
1973fc04
Commit
1973fc04
authored
Apr 28, 2021
by
Yuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
于:液体测试场景
parent
8c3e6d0d
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
196127 additions
and
15173 deletions
+196127
-15173
ArtScenes.unity
3D Fruit/Assets/#A1_Scenes/ArtScenes.unity
+68
-15161
Custom.physicMaterial
...1_Plugins/RayFire/Tutorial/Material/Custom.physicMaterial
+5
-4
MudRendererBase.cs
3D Fruit/Assets/MudBun/Script/MudRendererBase.cs
+1
-1
Leveltest.prefab
3D Fruit/Assets/Res/Levels/Leveltest.prefab
+196032
-0
Leveltest.prefab.meta
3D Fruit/Assets/Res/Levels/Leveltest.prefab.meta
+7
-0
MudBun.Customization.Editor.csproj
3D Fruit/MudBun.Customization.Editor.csproj
+4
-2
MudBun.Editor.csproj
3D Fruit/MudBun.Editor.csproj
+4
-2
MudBun.csproj
3D Fruit/MudBun.csproj
+6
-3
No files found.
3D Fruit/Assets/#A1_Scenes/ArtScenes.unity
View file @
1973fc04
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/#E1_Plugins/RayFire/Tutorial/Material/Custom.physicMaterial
View file @
1973fc04
...
@@ -3,11 +3,12 @@
...
@@ -3,11 +3,12 @@
---
!u!134
&13400000
---
!u!134
&13400000
PhysicMaterial
:
PhysicMaterial
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
m_PrefabParentObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Custom
m_Name
:
Custom
dynamicFriction
:
0
.18
dynamicFriction
:
0
staticFriction
:
0
.18
staticFriction
:
0
bounciness
:
0
bounciness
:
0
frictionCombine
:
0
frictionCombine
:
0
bounceCombine
:
0
bounceCombine
:
0
3D Fruit/Assets/MudBun/Script/MudRendererBase.cs
View file @
1973fc04
...
@@ -257,7 +257,7 @@ namespace MudBun
...
@@ -257,7 +257,7 @@ namespace MudBun
// NOTE: MaxBrushes must be a multiple of 32 (8 * sizeof(int))
// NOTE: MaxBrushes must be a multiple of 32 (8 * sizeof(int))
// (MaxBrushes / 32) must be less than or equal to kMaxBrushMaskInts in BrushMaskDefs.cginc
// (MaxBrushes / 32) must be less than or equal to kMaxBrushMaskInts in BrushMaskDefs.cginc
// MaxBrushes must *NOT* be larger than 2^kAabbTreeNodeStackSize in AabbTreeDefs.cginc
// MaxBrushes must *NOT* be larger than 2^kAabbTreeNodeStackSize in AabbTreeDefs.cginc
public
static
readonly
int
MaxBrushes
=
1024
;
public
static
readonly
int
MaxBrushes
=
20480
;
public
static
int
MaxBrushMaskInts
=>
MaxBrushes
/
32
;
public
static
int
MaxBrushMaskInts
=>
MaxBrushes
/
32
;
public
static
int
MaxBrushGroupDepth
=
6
;
public
static
int
MaxBrushGroupDepth
=
6
;
...
...
3D Fruit/Assets/Res/Levels/Leveltest.prefab
0 → 100644
View file @
1973fc04
This diff is collapsed.
Click to expand it.
3D Fruit/Assets/Res/Levels/Leveltest.prefab.meta
0 → 100644
View file @
1973fc04
fileFormatVersion: 2
guid: edc3b2142760b5b48a421fc32cddb037
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
3D Fruit/MudBun.Customization.Editor.csproj
View file @
1973fc04
...
@@ -4,18 +4,20 @@
...
@@ -4,18 +4,20 @@
<LangVersion>
latest
</LangVersion>
<LangVersion>
latest
</LangVersion>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<TargetFrameworkProfile
/>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<ProductVersion>
10.0.20506
</ProductVersion>
<ProductVersion>
10.0.20506
</ProductVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<RootNamespace></RootNamespace>
<RootNamespace>
</RootNamespace>
<ProjectGuid>
{367C413D-B9C9-2937-1091-F2B2564A6A91}
</ProjectGuid>
<ProjectGuid>
{367C413D-B9C9-2937-1091-F2B2564A6A91}
</ProjectGuid>
<OutputType>
Library
</OutputType>
<OutputType>
Library
</OutputType>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AssemblyName>
MudBun.Customization.Editor
</AssemblyName>
<AssemblyName>
MudBun.Customization.Editor
</AssemblyName>
<TargetFrameworkVersion>
v4.
7.1
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v4.
5.2
</TargetFrameworkVersion>
<FileAlignment>
512
</FileAlignment>
<FileAlignment>
512
</FileAlignment>
<BaseDirectory>
.
</BaseDirectory>
<BaseDirectory>
.
</BaseDirectory>
</PropertyGroup>
</PropertyGroup>
...
...
3D Fruit/MudBun.Editor.csproj
View file @
1973fc04
...
@@ -4,18 +4,20 @@
...
@@ -4,18 +4,20 @@
<LangVersion>
latest
</LangVersion>
<LangVersion>
latest
</LangVersion>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<TargetFrameworkProfile
/>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<ProductVersion>
10.0.20506
</ProductVersion>
<ProductVersion>
10.0.20506
</ProductVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<RootNamespace></RootNamespace>
<RootNamespace>
</RootNamespace>
<ProjectGuid>
{8015CEF2-706C-06D0-BBFA-EDE06DAE4F9B}
</ProjectGuid>
<ProjectGuid>
{8015CEF2-706C-06D0-BBFA-EDE06DAE4F9B}
</ProjectGuid>
<OutputType>
Library
</OutputType>
<OutputType>
Library
</OutputType>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AssemblyName>
MudBun.Editor
</AssemblyName>
<AssemblyName>
MudBun.Editor
</AssemblyName>
<TargetFrameworkVersion>
v4.
7.1
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v4.
5.2
</TargetFrameworkVersion>
<FileAlignment>
512
</FileAlignment>
<FileAlignment>
512
</FileAlignment>
<BaseDirectory>
.
</BaseDirectory>
<BaseDirectory>
.
</BaseDirectory>
</PropertyGroup>
</PropertyGroup>
...
...
3D Fruit/MudBun.csproj
View file @
1973fc04
...
@@ -4,18 +4,20 @@
...
@@ -4,18 +4,20 @@
<LangVersion>
latest
</LangVersion>
<LangVersion>
latest
</LangVersion>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolPath>
D:\Unity2019.3\Editor\Data\Tools\RoslynScripts
</CscToolPath>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<CscToolExe>
unity_csc.bat
</CscToolExe>
<TargetFrameworkProfile
/>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<ProductVersion>
10.0.20506
</ProductVersion>
<ProductVersion>
10.0.20506
</ProductVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<RootNamespace></RootNamespace>
<RootNamespace>
</RootNamespace>
<ProjectGuid>
{D46194A3-7D07-474D-D653-3101E0C3053E}
</ProjectGuid>
<ProjectGuid>
{D46194A3-7D07-474D-D653-3101E0C3053E}
</ProjectGuid>
<OutputType>
Library
</OutputType>
<OutputType>
Library
</OutputType>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<AssemblyName>
MudBun
</AssemblyName>
<AssemblyName>
MudBun
</AssemblyName>
<TargetFrameworkVersion>
v4.
7.1
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v4.
5.2
</TargetFrameworkVersion>
<FileAlignment>
512
</FileAlignment>
<FileAlignment>
512
</FileAlignment>
<BaseDirectory>
.
</BaseDirectory>
<BaseDirectory>
.
</BaseDirectory>
</PropertyGroup>
</PropertyGroup>
...
@@ -812,7 +814,8 @@
...
@@ -812,7 +814,8 @@
<HintPath>
G:/DuoYou/BlendMatch3D/3D Fruit/Library/ScriptAssemblies/UnityEngine.UI.dll
</HintPath>
<HintPath>
G:/DuoYou/BlendMatch3D/3D Fruit/Library/ScriptAssemblies/UnityEngine.UI.dll
</HintPath>
</Reference>
</Reference>
</ItemGroup>
</ItemGroup>
<ItemGroup></ItemGroup>
<ItemGroup>
</ItemGroup>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Target
Name=
"GenerateTargetFrameworkMonikerAttribute"
/>
<Target
Name=
"GenerateTargetFrameworkMonikerAttribute"
/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment