Commit 4e950c9a authored by wanqing's avatar wanqing

增加新关卡

parent 5cb4b927
......@@ -70,6 +70,25 @@
<Compile Include="Assets\0E1_Plugins\Easy performant outline\Scripts\Editor\OutlineTargetPropertyDrawer.cs" />
<Compile Include="Assets\0E1_Plugins\Easy performant outline\Scripts\Editor\OutlinerEditor.cs" />
<Compile Include="Assets\0E1_Plugins\Easy performant outline\Scripts\Editor\SerializedPassPropertyDrawer.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RFMeshAsset.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RFOrder.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireActivatorEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireBladeEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireBombEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireClusterEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireCombineEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireConnectivityEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireDebrisEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireDustEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireGunEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireManEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireRecorderEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireRigidEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireShatterEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireSnapshotEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireUnyieldingEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireVortexEditor.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Editor\RayfireWindEditor.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Plugins\Editor\EasyTouchInspector.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Plugins\Editor\EasyTouchMenu.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Plugins\Editor\EasyTouchTriggerInspector.cs" />
......@@ -303,6 +322,9 @@
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="RFLib_DotNet_2018">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/0E1_Plugins/RayFire/Plugins/Windows/x86_x64/RFLib_DotNet_2018.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
......@@ -268,6 +268,9 @@
<Reference Include="DOTween">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath>
</Reference>
<Reference Include="RFLib_DotNet_2018">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/0E1_Plugins/RayFire/Plugins/Windows/x86_x64/RFLib_DotNet_2018.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
......
......@@ -174,6 +174,55 @@
<Compile Include="Assets\0E1_Plugins\Obi\Samples\RopeAndRod\SampleResources\Scripts\WrapRopeGameController.cs" />
<Compile Include="Assets\0E1_Plugins\Obi\Samples\RopeAndRod\SampleResources\Scripts\WrapRopePlayerController.cs" />
<Compile Include="Assets\0E1_Plugins\Obi\Samples\RopeAndRod\SampleResources\Scripts\Wrappable.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFActivation.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFCluster.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFCustom.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFDamage.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFDemolitionCluster.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFDemolitionMesh.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFEvent.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFFade.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFFragment.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFFragmentProperties.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFLimitations.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFManDemolition.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFMaterial.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFMesh.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFParticles.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFPhysic.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFRecord.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFReferenceDemolition.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFReset.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFRestriction.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFRuntimeCaching.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFShard.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFShatterAdvanced.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFSnapshot.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFSound.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFSurface.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RFTypes.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Classes\RayFire.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireActivator.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireBlade.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireBomb.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireCluster.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireCombine.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireConnectivity.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireDebris.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireDust.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireGun.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireMan.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireRecorder.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireRigid.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireShatter.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireSnapshot.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireUnyielding.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireVortex.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Scripts\Components\RayfireWind.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Tutorial\Scripts\ActivationEventScript.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Tutorial\Scripts\AddRigidComponent.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Tutorial\Scripts\ApplyDamageScript.cs" />
<Compile Include="Assets\0E1_Plugins\RayFire\Tutorial\Scripts\DemolitionEventScript.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Examples\4.X\AdvancedExamples\AutoSelect\MultiLayerTouch.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Examples\4.X\AdvancedExamples\AutoSelect\MultiLayerUI.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouch\Examples\4.X\AdvancedExamples\MultiCamera\MultiCameraTouch.cs" />
......@@ -373,8 +422,10 @@
<None Include="Assets\0D2_Shaders\Ray.shader" />
<None Include="Assets\HoleBall\readme.txt" />
<None Include="Assets\0D2_Shaders\Occlusion.shader" />
<None Include="Assets\0E1_Plugins\RayFire\Info\CHANGELOG.txt" />
<None Include="Assets\0E1_Plugins\Obi\Plugins\libOni.bundle\Contents\Resources\CMakeLists.txt" />
<None Include="Assets\0Z2_Documents\项目文件说明文档.txt" />
<None Include="Assets\0E1_Plugins\RayFire\Info\README.txt" />
<None Include="Assets\0E1_Plugins\Obi\CHANGELOG_rope.txt" />
<None Include="Assets\0D2_Shaders\moveLight 1.shader" />
<None Include="Assets\0C1_Models\PolygonPrototype\Shaders\Prototype_Glass_Object.shader" />
......@@ -384,6 +435,7 @@
<None Include="Assets\0D2_Shaders\Inside.shader" />
<None Include="Assets\0E1_Plugins\Obi\Resources\ObiMaterials\ObiUtils.cginc" />
<None Include="Assets\EasyTouchBundle\EasyTouch\RealseNotes.txt" />
<None Include="Assets\0E1_Plugins\RayFire\Info\License.txt" />
<None Include="Assets\0Z3_WebAPI\项目文件说明文档.txt" />
<Reference Include="UnityEngine">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
......@@ -565,6 +617,9 @@
<Reference Include="DOTween">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/DOTween.dll</HintPath>
</Reference>
<Reference Include="RFLib_DotNet_2018">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/0E1_Plugins/RayFire/Plugins/Windows/x86_x64/RFLib_DotNet_2018.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
</Reference>
......
......@@ -170,6 +170,7 @@ MonoBehaviour:
- {fileID: 8744738608159344848, guid: ede9ddf15b410904798bc74f3ca63a8c, type: 3}
- {fileID: 4567337292791389910, guid: 7a841727d29832047bb76befac15a6c3, type: 3}
- {fileID: 7109006367036189340, guid: bc146b9b911d9494faeb6d77dbe34891, type: 3}
- {fileID: 9164101802928396636, guid: 3e464a0491ac42549bc50bd3bdbc322d, type: 3}
--- !u!1 &707446923
GameObject:
m_ObjectHideFlags: 0
......
......@@ -6365,7 +6365,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -6382,7 +6382,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
m_Name:
......@@ -6396,7 +6396,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677571250785}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
......@@ -9541,7 +9541,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '?'
m_Text: 6
--- !u!1 &6598198701575155059
GameObject:
m_ObjectHideFlags: 0
......@@ -10237,7 +10237,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6598198701825853662
RectTransform:
m_ObjectHideFlags: 0
......
......@@ -172,6 +172,50 @@ Transform:
m_Father: {fileID: 4040573734196891636}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &106463959488253690
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2422231685862188115}
- component: {fileID: 2479404184301286160}
m_Layer: 16
m_Name: CubeObstruct
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2422231685862188115
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106463959488253690}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.1809, y: 1.13, z: 0}
m_LocalScale: {x: 0.35, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 4040573735078340624}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2479404184301286160
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106463959488253690}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &988018843723496819
GameObject:
m_ObjectHideFlags: 0
......@@ -2051,6 +2095,7 @@ Transform:
- {fileID: 4040573734893267028}
- {fileID: 4040573734458488863}
- {fileID: 1871120859092402026}
- {fileID: 2422231685862188115}
m_Father: {fileID: 4040573734196891636}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2168,6 +2213,7 @@ MonoBehaviour:
m_buildTrans: {fileID: 4035800303001616775}
m_buttonTrans: {fileID: 1871549070046122665}
m_speed: 1
m_upSpeed: 4
--- !u!1001 &1871120857418378013
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -2470,6 +2516,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5063288112106375073, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5063288112106375078, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Camera
......@@ -2481,6 +2532,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 5063288112137550278, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Mass
......@@ -2501,6 +2557,16 @@ PrefabInstance:
propertyPath: m_Controller
value:
objectReference: {fileID: 0}
- target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5063288112863477293, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
propertyPath: linkInstances.Array.size
......@@ -3060,15 +3126,15 @@ PrefabInstance:
- {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
- {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
--- !u!4 &4566462821820411514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4040573734206883611 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4566462821820411514 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
type: 3}
m_PrefabInstance: {fileID: 9103861518316231015}
m_PrefabAsset: {fileID: 0}
......@@ -694,7 +694,7 @@ MonoBehaviour:
m_chainRopeView: {fileID: 0}
m_chainHandle: {fileID: 3063652833201834175}
m_camera: {fileID: 0}
curLevelIndex: 2
curLevelIndex: 5
--- !u!1 &2708402589168360407
GameObject:
m_ObjectHideFlags: 0
......
......@@ -347,6 +347,9 @@
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="RFLib_DotNet_2018">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/0E1_Plugins/RayFire/Plugins/Windows/x86_x64/RFLib_DotNet_2018.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
......
......@@ -567,6 +567,9 @@
<Reference Include="DOTweenEditor">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/Plugins/DOTween/Editor/DOTweenEditor.dll</HintPath>
</Reference>
<Reference Include="RFLib_DotNet_2018">
<HintPath>D:/wan/dyspaceGame/SteelBall/SteelBall/Assets/0E1_Plugins/RayFire/Plugins/Windows/x86_x64/RFLib_DotNet_2018.dll</HintPath>
</Reference>
<Reference Include="netstandard">
<HintPath>D:/wan/unity2019.3.14path/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
</Reference>
......
......@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DySpace
productName: SteelBall
productName: "Iron Ball\uFF01"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment