Commit 209eb921 authored by wanqing's avatar wanqing

修改代码

parent da3c29f5
......@@ -50,6 +50,8 @@ public class BattleUI : MonoBehaviour
private int m_mouseIndex = 0;//点击次数
private bool m_bIsShowMouse = true;//是否显示手指图标
private int m_bombIndex = 0;//炸弹计数
private Image m_joystickImage;
private Image m_thumbImage;
public bool IsLeftEmtryBomb { get { return m_bombIndex >= 3; } }//是否不剩炸弹了
public bool IsBombButtonCanInteractable { get { return m_boomBtn.interactable; } }
void Awake()
......@@ -73,6 +75,8 @@ public class BattleUI : MonoBehaviour
private void Start()
{
m_boomBtn.interactable = false;
m_joystickImage = GameServices.inputService.joyStick.GetComponent<Image>();
m_thumbImage = GameServices.inputService.joyStick.thumb.GetComponent<Image>();
}
void SetDragMode()
{
......@@ -317,4 +321,16 @@ public class BattleUI : MonoBehaviour
varVec2.y = y;
m_symbolObj.transform.localPosition = varVec2;
}
//摇杆图标出现
public void ShowJoystick()
{
m_joystickImage.color = Color.white;
m_thumbImage.color = Color.white;
}
//摇杆图标隐藏
public void HideJoystick()
{
m_joystickImage.color = Color.clear;
m_thumbImage.color = Color.clear;
}
}
......@@ -304,6 +304,7 @@ public class CarView : MonoBehaviour
varThumb.x = 80;
varThumb.y = 80;
m_thumbRT.sizeDelta = varThumb;
BattleCtrl.instance.battleUI.ShowJoystick();
}
// 抬起回调
void OnTouchUp()
......@@ -336,6 +337,7 @@ public class CarView : MonoBehaviour
BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
//----------摇杆操作
BattleCtrl.instance.battleUI.HideJoystick();
Vector2 varThumb = m_thumbRT.sizeDelta;
varThumb.x = 4000;
varThumb.y = 4000;
......
......@@ -11220,6 +11220,36 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &552265705064167944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6714471397938014066}
m_Layer: 0
m_Name: EggPos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6714471397938014066
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 552265705064167944}
m_LocalRotation: {x: 0.006623483, y: 0, z: 0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 2.425, z: -0.808}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 2529069999023669817}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0.75900006, y: 0, z: 0}
--- !u!1 &849169977848925939
GameObject:
m_ObjectHideFlags: 0
......@@ -11839,7 +11869,7 @@ Transform:
m_GameObject: {fileID: 947493322440029789}
m_LocalRotation: {x: 0.0066259005, y: -0, z: -0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 2, z: -127.2}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 5214210585284215195}
- {fileID: 5214210584945372603}
......@@ -12074,7 +12104,7 @@ Transform:
m_GameObject: {fileID: 947493322889572841}
m_LocalRotation: {x: 0.0066259005, y: -0, z: -0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 0.55, z: -14.83}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 5214210586180352071}
- {fileID: 5214210585175760120}
......@@ -12309,7 +12339,7 @@ Transform:
m_GameObject: {fileID: 947493323297442156}
m_LocalRotation: {x: 0.0066259005, y: -0, z: -0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 1.3, z: -74.6}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 5214210585083669840}
- {fileID: 5214210585227293721}
......@@ -12451,7 +12481,7 @@ Transform:
m_GameObject: {fileID: 947493323364260893}
m_LocalRotation: {x: 0.0066259005, y: -0, z: -0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 0.89, z: -40.34}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 5214210585374810903}
- {fileID: 5214210584681449867}
......@@ -13226,6 +13256,20 @@ Light:
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!64 &584179127058593524
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2361652760358353120}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -676865549890247029, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
--- !u!64 &7789358371702766144
MeshCollider:
m_ObjectHideFlags: 0
......@@ -13266,7 +13310,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c1b66e066d7173f4cac99234462771ad, type: 3}
m_Name:
m_EditorClassIdentifier:
m_eggTrans: {fileID: 5070924701899757355}
m_eggTrans: {fileID: 6714471397938014066}
m_eggParent: {fileID: 3498789872602422898}
driveWheel:
- {fileID: 2382278138100975009}
......@@ -13365,8 +13409,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5070924701899757355}
- component: {fileID: 5384362140748764134}
m_Layer: 0
m_Name: EggPos
m_Name: Egg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -13380,14 +13425,30 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3147104211403195630}
m_LocalRotation: {x: 0.006623483, y: 0, z: 0, w: 0.99997807}
m_LocalPosition: {x: 0, y: 3, z: -0.62}
m_LocalScale: {x: 1.25, y: 1.2499999, z: 1.2499998}
m_LocalPosition: {x: 0, y: 2.425, z: -0.808}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 1629493226080307955}
- {fileID: 751673233473904895}
m_Father: {fileID: 2529069999023669817}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0.75900006, y: 0, z: 0}
--- !u!54 &5384362140748764134
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3147104211403195630}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &3642943334855923717
GameObject:
m_ObjectHideFlags: 0
......@@ -13479,6 +13540,20 @@ Transform:
m_Father: {fileID: 4462938229828782545}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &4223850227056065544
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4338412342635614956}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -3233282816774651164, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}
--- !u!1 &6069609110352846493
GameObject:
m_ObjectHideFlags: 0
......@@ -14389,18 +14464,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}
--- !u!1 &9081439646928789416 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322494674593}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5214210584945372603 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322494674593}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9081439646928789416 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322494674593}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &947493322629826122
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -14480,18 +14555,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
--- !u!4 &5214210585083669840 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322629826122}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9081439646795734851 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322629826122}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5214210585083669840 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322629826122}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &947493322738513890
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -14571,18 +14646,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}
--- !u!4 &5214210585175760120 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322738513890}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9081439647240646379 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322738513890}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5214210585175760120 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 947493322738513890}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &947493322771898958
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -14833,18 +14908,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
--- !u!4 &5214210585284215195 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322831374977}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9081439647131005832 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322831374977}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5214210585284215195 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493322831374977}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &947493322937681933
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -15015,18 +15090,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
--- !u!1 &9081439645694855764 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493323743286109}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5214210586180352071 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493323743286109}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9081439645694855764 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 947493323743286109}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1184126910409974321
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -15042,12 +15117,12 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.43
value: 1.401
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.55
value: -0.81
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
......@@ -15092,17 +15167,17 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
propertyPath: m_LocalScale.x
value: 1
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
propertyPath: m_LocalScale.y
value: 1
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
propertyPath: m_LocalScale.z
value: 1
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: ac67921b91e757847a70ae204378ff44,
type: 3}
......@@ -15416,7 +15491,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4842359234585284, guid: 0e395c70fae214776ac9f3f8cb609d69, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
value: 0.54
objectReference: {fileID: 0}
- target: {fileID: 4842359234585284, guid: 0e395c70fae214776ac9f3f8cb609d69, type: 3}
propertyPath: m_LocalPosition.z
......@@ -15448,7 +15523,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4842359234585284, guid: 0e395c70fae214776ac9f3f8cb609d69, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4842359234585284, guid: 0e395c70fae214776ac9f3f8cb609d69, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4842359234585284, guid: 0e395c70fae214776ac9f3f8cb609d69, type: 3}
propertyPath: m_LocalScale.z
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 54205258495911752, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
......@@ -15724,9 +15807,15 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2526101453538259439 stripped
--- !u!146 &2382200437065362819 stripped
WheelCollider:
m_CorrespondingSourceObject: {fileID: 146223463955533182, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2525385702317272199 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1891406781403410, guid: 0e395c70fae214776ac9f3f8cb609d69,
m_CorrespondingSourceObject: {fileID: 1059038583491706, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
......@@ -15736,27 +15825,21 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2525754834703426023 stripped
--- !u!1 &2526101453538259439 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1534341797839130, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!146 &2382278138100975009 stripped
WheelCollider:
m_CorrespondingSourceObject: {fileID: 146286184125572444, guid: 0e395c70fae214776ac9f3f8cb609d69,
m_CorrespondingSourceObject: {fileID: 1891406781403410, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2525385702317272199 stripped
--- !u!1 &2525754834703426023 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1059038583491706, guid: 0e395c70fae214776ac9f3f8cb609d69,
m_CorrespondingSourceObject: {fileID: 1534341797839130, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
--- !u!146 &2382200437065362819 stripped
--- !u!146 &2382278138100975009 stripped
WheelCollider:
m_CorrespondingSourceObject: {fileID: 146223463955533182, guid: 0e395c70fae214776ac9f3f8cb609d69,
m_CorrespondingSourceObject: {fileID: 146286184125572444, guid: 0e395c70fae214776ac9f3f8cb609d69,
type: 3}
m_PrefabInstance: {fileID: 2524333399333282045}
m_PrefabAsset: {fileID: 0}
......@@ -15912,7 +15995,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2f966a98e51e2824b9e5ee4af73def99, type: 3}
......@@ -15922,6 +16005,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 5698406049358810085}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4338412342635614956 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2f966a98e51e2824b9e5ee4af73def99,
type: 3}
m_PrefabInstance: {fileID: 5698406049358810085}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6045989840824410601
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -15997,10 +16086,16 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 57d35467d1e4fe342bf6d78f402ace73, type: 3}
--- !u!1 &2361652760358353120 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 57d35467d1e4fe342bf6d78f402ace73,
type: 3}
m_PrefabInstance: {fileID: 6045989840824410601}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1629493226080307955 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 57d35467d1e4fe342bf6d78f402ace73,
......
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