Commit db644030 authored by czy's avatar czy

CharacterController版本1.0

parent be03f2b7
......@@ -92,7 +92,6 @@
<Compile Include="Assets\#A2_Scripts\Battle\UI\TestGestureAround.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\BombView.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\CarView.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\CarView2.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\ChainDragView.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\ChainRopeView.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\View\ChainView.cs" />
......@@ -262,9 +261,12 @@
<Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCInput.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCJoystick.cs" />
<Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCTouchPad.cs" />
<Compile Include="Assets\My\AI\AIMove.cs" />
<Compile Include="Assets\My\FloorBoard.cs" />
<Compile Include="Assets\My\Gold\Gold.cs" />
<Compile Include="Assets\My\Player\PlayerMove.cs" />
<Compile Include="Assets\My\RandomEnvironment.cs" />
<Compile Include="Assets\My\TestEtc.cs" />
<Compile Include="Assets\My\Test\TestEtc.cs" />
<Compile Include="Assets\My\TriggerTurnDir.cs" />
<Compile Include="Assets\My\Wall.cs" />
<Compile Include="Assets\Ultimate Game Tools\AutomaticLOD\Scripts\AutomaticLOD.cs" />
......
......@@ -377,81 +377,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisX.showInertiaInspector
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisX.isEnertia
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisX.inertia
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showEventInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showTouchEventInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showDownEventInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showPressEventInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showSpriteInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: showCameraInspector
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisY.showSimulatinInspector
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisY.showInertiaInspector
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisY.showDirectInspector
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisY.isEnertia
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: axisY.inertia
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1742407565065312546, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: useFixedUpdate
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Name
......
......@@ -109,7 +109,7 @@ public class BattleCtrl : MonoBehaviour
/// </summary>
void StartBattle()
{
print("_IsStartBattle设置为true");
//print("_IsStartBattle设置为true");
_IsStartBattle = true;
......
......@@ -42,6 +42,8 @@ public class BattleUI : MonoBehaviour
public Slider sliderScore;
public Text ScoreTex;
public Text Timer;
public Action onStartBtn;
public Action onPosUpBtn;
......@@ -86,6 +88,10 @@ public class BattleUI : MonoBehaviour
m_joystickImage = GameServices.inputService.joyStick.GetComponent<Image>();
m_thumbImage = GameServices.inputService.joyStick.thumb.GetComponent<Image>();
}
private void Update()
{
Timer.text = Time.time.ToString("F1");
}
void SetDragMode()
{
BattleCtrl.instance.levelManager.curLevel.chainView.SetDragMode(true);
......
......@@ -1099,6 +1099,159 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1702194949
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1702194950}
- component: {fileID: 1702194952}
- component: {fileID: 1702194951}
m_Layer: 5
m_Name: Timer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1702194950
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702194949}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1737215858}
m_Father: {fileID: 6064464676328073067}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 24.91, y: 716}
m_SizeDelta: {x: 220.88156, y: 101.82471}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1702194952
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702194949}
m_CullTransparentMesh: 0
--- !u!114 &1702194951
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702194949}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.31764707}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1737215857
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1737215858}
- component: {fileID: 1737215860}
- component: {fileID: 1737215859}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1737215858
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1737215857}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1702194950}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1737215860
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1737215857}
m_CullTransparentMesh: 0
--- !u!114 &1737215859
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1737215857}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 78
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 100
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 0
--- !u!1 &1812017393
GameObject:
m_ObjectHideFlags: 0
......@@ -6848,7 +7001,7 @@ MonoBehaviour:
allowSimulationStandalone: 0
visibleOnStandalone: 1
dPadAxisCount: 0
useFixedUpdate: 0
useFixedUpdate: 1
isOnDrag: 0
isSwipeIn: 0
isSwipeOut: 0
......@@ -6924,7 +7077,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
isEnertia: 0
inertia: 0
inertia: 1
inertiaThreshold: 0.08
isAutoStab: 0
autoStabThreshold: 0.01
......@@ -6952,7 +7105,7 @@ MonoBehaviour:
unityAxis: Horizontal
showGeneralInspector: 1
showDirectInspector: 1
showInertiaInspector: 0
showInertiaInspector: 1
showSimulatinInspector: 0
axisY:
name: VerticalLeft
......@@ -6971,7 +7124,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
isEnertia: 0
inertia: 0
inertia: 1
inertiaThreshold: 0.08
isAutoStab: 0
autoStabThreshold: 0.01
......@@ -6998,9 +7151,9 @@ MonoBehaviour:
isJump: 0
unityAxis: Vertical
showGeneralInspector: 1
showDirectInspector: 0
showInertiaInspector: 0
showSimulatinInspector: 0
showDirectInspector: 1
showInertiaInspector: 1
showSimulatinInspector: 1
thumb: {fileID: 2810382325705922103}
joystickArea: 1
userArea: {fileID: 0}
......@@ -10029,6 +10182,7 @@ RectTransform:
- {fileID: 9107797946881246061}
- {fileID: 6109125632920290557}
- {fileID: 584139469}
- {fileID: 1702194950}
m_Father: {fileID: 6064464677632144690}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -11992,6 +12146,7 @@ MonoBehaviour:
m_symbolObj: {fileID: 8615814293053379064}
sliderScore: {fileID: 584139470}
ScoreTex: {fileID: 606454945}
Timer: {fileID: 1737215859}
--- !u!114 &1995691973
MonoBehaviour:
m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 1a32f12420100da4ab7ea5ff2bb47bc4
guid: 045df304258a19b4283e122b36a97ba2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
......
This diff is collapsed.
fileFormatVersion: 2
guid: 22604520b1ef064468a7f5f682fe242b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 744c516b99801de4a8d7038cf159f31f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Gold : MonoBehaviour
{
//private void OnTriggerEnter(Collider other)
//{
// if (other.tag=="Player")
// {
// BattleCtrl.instance.Score++;
// BattleCtrl.instance.updateScore?.Invoke();
// Destroy(gameObject);
// }
//}
}
fileFormatVersion: 2
guid: 0b6122de87679854eb2212330a8efaaf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: c30afe05ade1fa14b8f21a52a21d0fb4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 988d4f82fb2c0ee49af6836de40fd04f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -8,8 +8,9 @@ public class TestEtc : MonoBehaviour
// Start is called before the first frame update
void Start()
{
//ETCInput.GetControlTouchPad("TouchPad1").onMove.AddListener(onMove);
ETCInput.GetControlTouchPad("TouchPad1").onMoveSpeed.AddListener(onMoveSpeed);
ETCInput.GetControlTouchPad("TouchPad1").onMove.AddListener(onMove);
//ETCInput.GetControlTouchPad("TouchPad1").onMoveSpeed.AddListener(onMoveSpeed);
}
......@@ -18,19 +19,23 @@ public class TestEtc : MonoBehaviour
{
//print(ETCInput.GetAxis("TouchPadHorizontal"));
//target.Translate(new Vector3(0, 0, 2*Time.deltaTime));
target.GetComponent<CharacterController>().Move(new Vector3(0, 0, 2 * Time.deltaTime));
//CollisionFlags cf= target.GetComponent<CharacterController>().Move(new Vector3(0, 0, 2 * Time.deltaTime));
//print(cf.ToString());
bool isGround=target.GetComponent<CharacterController>().SimpleMove(new Vector3(0, 0, 2));
print("是否在地面:"+ isGround);
}
//public void onMove(Vector2 aa)
//{
// //print("OnMove:"+aa.ToString());
// //target.Translate(new Vector3(aa.x,aa.y,0));
//}
public void onMove(Vector2 aa)
{
target.GetComponent<CharacterController>().SimpleMove(new Vector3(aa.x, 0, 0));
}
public void onMoveSpeed(Vector2 aa)
{
//print("onMoveSpeed:" + aa.ToString());
//target.Translate( new Vector3(aa.x,0, 0));
target.GetComponent<CharacterController>().Move(new Vector3(aa.x, 0,0));
//target.GetComponent<CharacterController>().Move(new Vector3(aa.x, 0,0));
target.GetComponent<CharacterController>().SimpleMove(new Vector3(aa.x*10.0f, 0, 0));
}
public void Show(string aa)
{
......
......@@ -19,7 +19,7 @@ public class TriggerTurnDir : MonoBehaviour
}
private void OnTriggerEnter(Collider other)
{
if (other.tag == "Player" && other.name== "TurnDirCollider")
if (other.tag == "Player" )
{
print("变化"+turnAngle+"度");
BattleCtrl.instance.turnDir?.Invoke(turnAngle);
......
......@@ -9,10 +9,11 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 804694910378826939}
- component: {fileID: 3214120346423666526}
- component: {fileID: 2201797878330323258}
- component: {fileID: 609213534401771201}
m_Layer: 0
m_Name: Egg
m_TagString: Egg
m_Name: Gold1
m_TagString: Gold
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -33,22 +34,31 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0.75900006, y: 0, z: 0}
--- !u!54 &3214120346423666526
Rigidbody:
--- !u!114 &2201797878330323258
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 804694910378826938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0b6122de87679854eb2212330a8efaaf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!135 &609213534401771201
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 804694910378826938}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
m_Radius: 0.42
m_Center: {x: 0, y: 0.24, z: 0}
--- !u!64 &2227981512111987852
MeshCollider:
m_ObjectHideFlags: 0
......@@ -58,7 +68,7 @@ MeshCollider:
m_GameObject: {fileID: 8650065609645589432}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
......@@ -72,7 +82,7 @@ MeshCollider:
m_GameObject: {fileID: 8650065610918094599}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
......@@ -152,7 +162,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
propertyPath: m_TagString
value: Egg
value: Untagged
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
......@@ -243,7 +253,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
propertyPath: m_TagString
value: Egg
value: Untagged
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}
......
......@@ -8,6 +8,9 @@ TagManager:
- Target
- soldier
- Egg
- AI
- Competitor
- Gold
layers:
- Default
- TransparentFX
......
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