first changes (hp,dmg,ornt,jstk)
This commit is contained in:
parent
7167ac5c1c
commit
148c3e85cc
13
.idea/.idea.BG-Games/.idea/.gitignore
generated
vendored
Normal file
13
.idea/.idea.BG-Games/.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Rider ignored files
|
||||
/.idea.BG-Games.iml
|
||||
/contentModel.xml
|
||||
/modules.xml
|
||||
/projectSettingsUpdater.xml
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
4
.idea/.idea.BG-Games/.idea/encodings.xml
generated
Normal file
4
.idea/.idea.BG-Games/.idea/encodings.xml
generated
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
69
.idea/.idea.BG-Games/.idea/indexLayout.xml
generated
Normal file
69
.idea/.idea.BG-Games/.idea/indexLayout.xml
generated
Normal file
@ -0,0 +1,69 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelUserStore">
|
||||
<attachedFolders />
|
||||
<explicitIncludes>
|
||||
<Path>Library/PackageCache/com.unity.2d.sprite@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.burst@1.4.11</Path>
|
||||
<Path>Library/PackageCache/com.unity.cinemachine@2.6.5</Path>
|
||||
<Path>Library/PackageCache/com.unity.collab-proxy@1.7.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.device-simulator@3.0.1-preview</Path>
|
||||
<Path>Library/PackageCache/com.unity.ext.nunit@1.0.6</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.rider@2.0.7</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.visualstudio@2.0.11</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.vscode@1.2.3</Path>
|
||||
<Path>Library/PackageCache/com.unity.mathematics@1.2.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.ai@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.androidjni@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.animation@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.assetbundle@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.audio@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.cloth@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.director@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.imageconversion@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.imgui@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.jsonserialize@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.particlesystem@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.physics2d@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.physics@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.screencapture@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.subsystems@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.terrain@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.terrainphysics@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.tilemap@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.ui@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.uielements@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.uielementsnative@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.umbra@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unityanalytics@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unitywebrequest@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unitywebrequestassetbundle@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unitywebrequestaudio@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unitywebrequesttexture@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.unitywebrequestwww@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.vehicles@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.video@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.vr@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.wind@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.modules.xr@1.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.nuget.newtonsoft-json@2.0.0</Path>
|
||||
<Path>Library/PackageCache/com.unity.postprocessing@3.0.3</Path>
|
||||
<Path>Library/PackageCache/com.unity.recorder@2.5.5</Path>
|
||||
<Path>Library/PackageCache/com.unity.test-framework@1.1.27</Path>
|
||||
<Path>Library/PackageCache/com.unity.textmeshpro@3.0.6</Path>
|
||||
<Path>Library/PackageCache/com.unity.timeline@1.4.8</Path>
|
||||
<Path>Library/PackageCache/com.unity.ugui@1.0.0</Path>
|
||||
<Path>Packages</Path>
|
||||
<Path>ProjectSettings</Path>
|
||||
</explicitIncludes>
|
||||
<explicitExcludes>
|
||||
<Path>.git</Path>
|
||||
<Path>.idea</Path>
|
||||
<Path>Library</Path>
|
||||
<Path>Logs</Path>
|
||||
<Path>Temp</Path>
|
||||
<Path>UserSettings</Path>
|
||||
<Path>obj</Path>
|
||||
</explicitExcludes>
|
||||
</component>
|
||||
</project>
|
6
.idea/.idea.BG-Games/.idea/misc.xml
generated
Normal file
6
.idea/.idea.BG-Games/.idea/misc.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavaScriptSettings">
|
||||
<option name="languageLevel" value="ES6" />
|
||||
</component>
|
||||
</project>
|
6
.idea/.idea.BG-Games/.idea/vcs.xml
generated
Normal file
6
.idea/.idea.BG-Games/.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
7
.idea/.idea.BG-Games/riderModule.iml
generated
Normal file
7
.idea/.idea.BG-Games/riderModule.iml
generated
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RIDER_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$/../.." />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
@ -94,7 +94,7 @@ AnimatorController:
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
|
@ -31,7 +31,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -45,25 +45,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 30
|
||||
m_WrapMode: 0
|
||||
@ -79,13 +60,6 @@ AnimationClip:
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
@ -122,7 +96,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -136,25 +110,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.5
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
|
@ -22,7 +22,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -45,25 +45,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 30
|
||||
m_WrapMode: 0
|
||||
@ -79,13 +60,6 @@ AnimationClip:
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
@ -113,7 +87,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -136,25 +110,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
|
@ -22,7 +22,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -36,25 +36,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_PPtrCurves: []
|
||||
m_SampleRate: 60
|
||||
m_WrapMode: 0
|
||||
@ -70,13 +51,6 @@ AnimationClip:
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
@ -104,7 +78,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -2431
|
||||
value: -2445
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@ -118,25 +92,6 @@ AnimationClip:
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
- curve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: -416
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
attribute: m_AnchoredPosition.y
|
||||
path:
|
||||
classID: 224
|
||||
script: {fileID: 0}
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
|
@ -56,17 +56,17 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 2929252283123773939}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
@ -76,6 +76,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &2929252283123773951
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -90,6 +91,9 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
handleRange: 1
|
||||
deadZone: 0
|
||||
axisOptions: 0
|
||||
snapX: 0
|
||||
snapY: 0
|
||||
background: {fileID: 2929252283123773938}
|
||||
handle: {fileID: 2929252285020697096}
|
||||
--- !u!1 &2929252285020697097
|
||||
@ -146,17 +150,17 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 2929252285020697097}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 010a6e5305fa7004f89c5d317b7b47d4, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
@ -166,3 +170,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
@ -35,7 +35,7 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint
|
||||
[SerializeField] private bool snapY = false;
|
||||
|
||||
[SerializeField] protected RectTransform background = null;
|
||||
[SerializeField] private RectTransform handle = null;
|
||||
[SerializeField] protected RectTransform handle = null;
|
||||
private RectTransform baseRect = null;
|
||||
|
||||
private Canvas canvas;
|
||||
|
@ -1,31 +1,52 @@
|
||||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class DynamicJoystick : Joystick
|
||||
{
|
||||
public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } }
|
||||
|
||||
[SerializeField] private float moveThreshold = 1;
|
||||
|
||||
private Vector3 _initPos;
|
||||
private Image _bgImage;
|
||||
private Image _hndImage;
|
||||
|
||||
private Color _white = Color.white;
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
MoveThreshold = moveThreshold;
|
||||
base.Start();
|
||||
background.gameObject.SetActive(false);
|
||||
_bgImage = background.GetComponent<Image>();
|
||||
_hndImage = handle.GetComponent<Image>();
|
||||
_initPos = background.anchoredPosition;
|
||||
|
||||
SetOpacityJoystick(0.5f);
|
||||
|
||||
//background.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public override void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
|
||||
SetOpacityJoystick(1);
|
||||
|
||||
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
|
||||
background.gameObject.SetActive(true);
|
||||
//background.gameObject.SetActive(true);
|
||||
base.OnPointerDown(eventData);
|
||||
}
|
||||
|
||||
public override void OnPointerUp(PointerEventData eventData)
|
||||
{
|
||||
background.gameObject.SetActive(false);
|
||||
|
||||
SetOpacityJoystick(0.5f);
|
||||
|
||||
background.anchoredPosition = _initPos;
|
||||
//background.gameObject.SetActive(false);
|
||||
base.OnPointerUp(eventData);
|
||||
}
|
||||
|
||||
@ -38,4 +59,11 @@ public class DynamicJoystick : Joystick
|
||||
}
|
||||
base.HandleInput(magnitude, normalised, radius, cam);
|
||||
}
|
||||
|
||||
private void SetOpacityJoystick(float amount)
|
||||
{
|
||||
_white.a = amount;
|
||||
_bgImage.color = _white;
|
||||
_hndImage.color = _white;
|
||||
}
|
||||
}
|
@ -3,29 +3,55 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class FloatingJoystick : Joystick
|
||||
{
|
||||
//public Action OnTouchDown, OnTouchUp;
|
||||
public bool isPressed { get; set; }
|
||||
private Vector3 _initPos;
|
||||
|
||||
private Image _bgImage;
|
||||
private Image _hndImage;
|
||||
|
||||
private Color _white = Color.white;
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
base.Start();
|
||||
background.gameObject.SetActive(false);
|
||||
//background.gameObject.SetActive(false);
|
||||
_bgImage = background.GetComponent<Image>();
|
||||
_hndImage = handle.GetComponent<Image>();
|
||||
|
||||
_initPos = background.anchoredPosition;
|
||||
|
||||
SetOpacityJoystick(0.5f);
|
||||
}
|
||||
|
||||
public override void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
|
||||
SetOpacityJoystick(1f);
|
||||
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
|
||||
background.gameObject.SetActive(true);
|
||||
//background.gameObject.SetActive(true);
|
||||
base.OnPointerDown(eventData);
|
||||
//OnTouchDown?.Invoke();
|
||||
}
|
||||
|
||||
public override void OnPointerUp(PointerEventData eventData)
|
||||
{
|
||||
background.gameObject.SetActive(false);
|
||||
// background.gameObject.SetActive(false);
|
||||
|
||||
SetOpacityJoystick(0.5f);
|
||||
background.anchoredPosition = _initPos;
|
||||
base.OnPointerUp(eventData);
|
||||
//OnTouchUp?.Invoke();
|
||||
}
|
||||
|
||||
private void SetOpacityJoystick(float amount)
|
||||
{
|
||||
_white.a = amount;
|
||||
_bgImage.color = _white;
|
||||
_hndImage.color = _white;
|
||||
}
|
||||
}
|
@ -27,7 +27,7 @@ Transform:
|
||||
m_GameObject: {fileID: 594306107340321050}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.01, z: 0}
|
||||
m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
|
||||
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
|
||||
m_Children:
|
||||
- {fileID: 594306107340057920}
|
||||
- {fileID: 594306107340066234}
|
||||
|
@ -47,7 +47,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
owner: 1
|
||||
damage: 100
|
||||
damage: 500
|
||||
collisionVFX: {fileID: 2307028534112872116, guid: 79d768bf87aadec478a5722da8c6d516,
|
||||
type: 3}
|
||||
timeToDamage: 2
|
||||
|
@ -176,7 +176,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startHealth: 250
|
||||
startHealth: 4200
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
|
@ -289,7 +289,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startHealth: 250
|
||||
startHealth: 4200
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
|
@ -289,7 +289,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startHealth: 250
|
||||
startHealth: 4200
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
|
@ -1,5 +1,25 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &7117637459513898660
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1415495982521125429}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ba0d0e7a039f526499c356a3c5cd6d3f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
handleRange: 1
|
||||
deadZone: 0.3
|
||||
axisOptions: 0
|
||||
snapX: 0
|
||||
snapY: 0
|
||||
background: {fileID: 1415495983658094506}
|
||||
handle: {fileID: 1415495981690910128}
|
||||
moveThreshold: 1
|
||||
--- !u!1 &7117637457422693166
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -194,8 +214,8 @@ RectTransform:
|
||||
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: 120}
|
||||
m_SizeDelta: {x: 0, y: -240}
|
||||
m_AnchoredPosition: {x: 0, y: 263.16797}
|
||||
m_SizeDelta: {x: 0, y: -526.336}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7117637458024167129
|
||||
CanvasRenderer:
|
||||
@ -1586,26 +1606,6 @@ Animator:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &7117637459513898660
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1415495982521125429}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ba0d0e7a039f526499c356a3c5cd6d3f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
handleRange: 1
|
||||
deadZone: 0.3
|
||||
axisOptions: 0
|
||||
snapX: 0
|
||||
snapY: 0
|
||||
background: {fileID: 1415495983658094506}
|
||||
handle: {fileID: 1415495981690910128}
|
||||
moveThreshold: 1
|
||||
--- !u!1 &7117637459520280379
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1920,12 +1920,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
@ -2005,12 +2005,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
@ -2033,6 +2033,54 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 7117637459326710719}
|
||||
m_Modifications:
|
||||
- target: {fileID: 357650608, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 416.346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 357650608, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 449.653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 357650608, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 357650608, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 240
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1110084546, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 416.346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1110084546, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 449.653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1110084546, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 225
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1110084546, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 240
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1735438791, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 416.346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1735438791, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 449.653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1735438791, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1735438791, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 240
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1744211102367292428, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -2146,27 +2194,47 @@ PrefabInstance:
|
||||
- target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Spacing.x
|
||||
value: 79.2
|
||||
value: 40.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_CellSize.x
|
||||
value: 242
|
||||
value: 400.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_CellSize.y
|
||||
value: 262
|
||||
value: 435.18
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Padding.m_Top
|
||||
value: 4
|
||||
value: 14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697504995, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Padding.m_Left
|
||||
value: 163
|
||||
value: 26
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697505020, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 891.224
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697505020, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 470.274
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697505020, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -445.612
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544697505020, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -65.914
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544782492864, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
@ -2216,7 +2284,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 280
|
||||
value: 602.098
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
@ -2261,7 +2329,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 139.89703
|
||||
value: 300.94604
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
@ -2281,27 +2349,47 @@ PrefabInstance:
|
||||
- target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Spacing.x
|
||||
value: 79.2
|
||||
value: 40.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_CellSize.x
|
||||
value: 242
|
||||
value: 400.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_CellSize.y
|
||||
value: 262
|
||||
value: 435.18
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Padding.m_Top
|
||||
value: 4
|
||||
value: 14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907475, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_Padding.m_Left
|
||||
value: 58
|
||||
value: 24
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907948, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 891.224
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907948, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 470.274
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907948, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 445.612
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3858971544809907948, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -65.914
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5665143410171049482, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
@ -2338,6 +2426,26 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859334620793988638, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 416.346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859334620793988638, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 449.653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859334620793988638, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -225
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859334620793988638, guid: 97a03d914d2e6ea40a905290ce13f5b0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 240
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3}
|
||||
--- !u!224 &6290191269712271513 stripped
|
||||
@ -2401,7 +2509,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 700
|
||||
value: 2020.877
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -2471,12 +2579,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -2513,17 +2621,22 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 512
|
||||
value: 445
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 530
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
|
||||
@ -2682,12 +2795,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -2724,12 +2837,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -2795,12 +2908,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252283123773938, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
@ -2880,12 +2993,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252285020697096, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2929252285020698103, guid: aaa2c939c0359ac4dbce3f49e8b90252,
|
||||
type: 3}
|
||||
@ -2956,7 +3069,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 700
|
||||
value: 2020.877
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -3026,12 +3139,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 668
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -3058,17 +3171,22 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 350
|
||||
value: 644
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 512
|
||||
value: 635
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 530
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
|
||||
|
@ -461,7 +461,7 @@ MonoBehaviour:
|
||||
m_Follow: {fileID: 1801060022}
|
||||
m_Lens:
|
||||
FieldOfView: 40
|
||||
OrthographicSize: 5
|
||||
OrthographicSize: 6
|
||||
NearClipPlane: 0.1
|
||||
FarClipPlane: 5000
|
||||
Dutch: 0
|
||||
@ -2978,7 +2978,7 @@ Transform:
|
||||
- {fileID: 1923264932}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 70, y: 45.000004, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 60, y: -1, z: 0}
|
||||
--- !u!1001 &972268607
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5204,7 +5204,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startHealth: 310
|
||||
startHealth: 4200
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
@ -5749,7 +5749,7 @@ Camera:
|
||||
far clip plane: 5000
|
||||
field of view: 40
|
||||
orthographic: 1
|
||||
orthographic size: 5
|
||||
orthographic size: 6
|
||||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
@ -33259,9 +33259,9 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tilePosition: {x: 0, y: 0, z: 0}
|
||||
canMove: 1
|
||||
canBeAttacked: 1
|
||||
canBuildHere: 1
|
||||
canMove: 0
|
||||
canBeAttacked: 0
|
||||
canBuildHere: 0
|
||||
buildingOnTile: {fileID: 0}
|
||||
tileOwnerIndex: 0
|
||||
easyCaptureFor:
|
||||
@ -39151,9 +39151,9 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tilePosition: {x: 0, y: 0, z: 0}
|
||||
canMove: 1
|
||||
canBeAttacked: 1
|
||||
canBuildHere: 1
|
||||
canMove: 0
|
||||
canBeAttacked: 0
|
||||
canBuildHere: 0
|
||||
buildingOnTile: {fileID: 0}
|
||||
tileOwnerIndex: 0
|
||||
easyCaptureFor:
|
||||
@ -55771,11 +55771,121 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 36970315026428850, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1415495982748264142, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_Color.a
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5557455103468811314, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: bonusController
|
||||
value:
|
||||
objectReference: {fileID: 1801060033}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7117637457422693166, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7117637458723671167, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7117637458793366621, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
@ -55911,6 +56021,36 @@ PrefabInstance:
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 185995048}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3}
|
||||
--- !u!1 &7121823489171206717
|
||||
@ -66099,15 +66239,15 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tilePosition: {x: 0, y: 0, z: 0}
|
||||
canMove: 1
|
||||
canBeAttacked: 1
|
||||
canBuildHere: 1
|
||||
canMove: 37
|
||||
canBeAttacked: 2
|
||||
canBuildHere: 0
|
||||
buildingOnTile: {fileID: 0}
|
||||
tileOwnerIndex: 0
|
||||
easyCaptureFor:
|
||||
checkedFor:
|
||||
isBorderTile: 0
|
||||
easyCaptureForAll: 0
|
||||
isBorderTile: 37
|
||||
easyCaptureForAll: 2
|
||||
gCost: 0
|
||||
hCost: 0
|
||||
fCost: 0
|
||||
|
@ -1847,7 +1847,7 @@ RectTransform:
|
||||
- {fileID: 925062906}
|
||||
- {fileID: 1378130271}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@ -3565,11 +3565,101 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5557455103468811314, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: bonusController
|
||||
value:
|
||||
objectReference: {fileID: 1801060033}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5643681896748709694, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6305254850507510473, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7117637459326710691, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -3680,6 +3770,36 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3}
|
||||
--- !u!1 &1129072375 stripped
|
||||
@ -3742,6 +3862,55 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1357573721}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1149306262
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1801060022}
|
||||
m_Modifications:
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CharacterAura
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3}
|
||||
--- !u!1 &1151158176 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9,
|
||||
@ -4461,6 +4630,12 @@ RectTransform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1378130270}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1486469296 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1149306262}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1496855615
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4754,7 +4929,7 @@ Transform:
|
||||
- {fileID: 566274521}
|
||||
- {fileID: 1163069908}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0}
|
||||
--- !u!114 &1536054282
|
||||
MonoBehaviour:
|
||||
@ -5251,8 +5426,9 @@ Transform:
|
||||
m_LocalPosition: {x: 28.920218, y: 0, z: -27.468939}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1944520322}
|
||||
- {fileID: 1996574566}
|
||||
- {fileID: 1944520322}
|
||||
- {fileID: 1486469296}
|
||||
- {fileID: 622020284}
|
||||
- {fileID: 1536054281}
|
||||
m_Father: {fileID: 0}
|
||||
@ -5340,7 +5516,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5182c2cb5eef6d849b560f764c4a0ed6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
startHealth: 310
|
||||
startHealth: 4200
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
@ -6120,7 +6296,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 246600703}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2020157753 stripped
|
||||
MonoBehaviour:
|
||||
@ -53960,7 +54136,7 @@ PrefabInstance:
|
||||
- target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
|
||||
type: 3}
|
||||
|
@ -435,8 +435,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -252.96997, y: -0.0032043457}
|
||||
m_SizeDelta: {x: 101.9678, y: 101.97}
|
||||
m_AnchoredPosition: {x: -318, y: 0}
|
||||
m_SizeDelta: {x: 165.459, y: 165.462}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &131612032
|
||||
MonoBehaviour:
|
||||
@ -737,8 +737,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 75, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 100, y: 0.00096893}
|
||||
m_SizeDelta: {x: 165, y: 165}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &588146957
|
||||
MonoBehaviour:
|
||||
@ -869,8 +869,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 140, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 180}
|
||||
m_AnchoredPosition: {x: 231, y: 0}
|
||||
m_SizeDelta: {x: 358.253, y: 403.034}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &668707259
|
||||
MonoBehaviour:
|
||||
@ -1001,8 +1001,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -401.32056, y: -0.0019226074}
|
||||
m_SizeDelta: {x: 101.9678, y: 101.97}
|
||||
m_AnchoredPosition: {x: -516, y: 0}
|
||||
m_SizeDelta: {x: 165.459, y: 165.462}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &675598632
|
||||
MonoBehaviour:
|
||||
@ -1227,8 +1227,8 @@ RectTransform:
|
||||
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: -0.000030518, y: 59.816}
|
||||
m_SizeDelta: {x: 1651.0859, y: 799.0186}
|
||||
m_AnchoredPosition: {x: 0.000061035, y: 0.00012207}
|
||||
m_SizeDelta: {x: 3845.839, y: 2772.782}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &713212108
|
||||
MonoBehaviour:
|
||||
@ -1348,8 +1348,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -75, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: -100, y: 0}
|
||||
m_SizeDelta: {x: 165, y: 165}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &758185741
|
||||
MonoBehaviour:
|
||||
@ -1689,8 +1689,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -142.57, y: -12}
|
||||
m_SizeDelta: {x: 160, y: 180}
|
||||
m_AnchoredPosition: {x: -231, y: 0}
|
||||
m_SizeDelta: {x: 358.253, y: 403.034}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &866147932
|
||||
MonoBehaviour:
|
||||
@ -1915,7 +1915,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -118.65112, y: -104.670746}
|
||||
m_AnchoredPosition: {x: -118.65112, y: -104.6709}
|
||||
m_SizeDelta: {x: 237.30225, y: 209.34149}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &903249949
|
||||
@ -2249,8 +2249,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 50
|
||||
m_fontSizeBase: 50
|
||||
m_fontSize: 97.9
|
||||
m_fontSizeBase: 97.9
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -2408,8 +2408,8 @@ RectTransform:
|
||||
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: 0.00076294, y: -44.999817}
|
||||
m_SizeDelta: {x: 512.67, y: 33.3644}
|
||||
m_AnchoredPosition: {x: -0.00098419, y: -64.717}
|
||||
m_SizeDelta: {x: 854.6, y: 72.797}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1029464726
|
||||
MonoBehaviour:
|
||||
@ -2458,8 +2458,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 78.8
|
||||
m_fontSizeBase: 78.8
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -2938,8 +2938,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 50
|
||||
m_fontSizeBase: 50
|
||||
m_fontSize: 97.9
|
||||
m_fontSizeBase: 97.9
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@ -3083,10 +3083,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1801607763}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -300, y: 110}
|
||||
m_SizeDelta: {x: 506.86206, y: 158.624}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 265}
|
||||
m_SizeDelta: {x: 957.166, y: 299.548}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1623606164
|
||||
MonoBehaviour:
|
||||
@ -3221,8 +3221,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -118.58801, y: 61.677002}
|
||||
m_SizeDelta: {x: 750.1018, y: 123.364}
|
||||
m_AnchoredPosition: {x: 0, y: 573.133}
|
||||
m_SizeDelta: {x: 1404.938, y: 202.23}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1799454952
|
||||
MonoBehaviour:
|
||||
@ -3442,10 +3442,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1801607763}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -2424.9983, y: -415.998}
|
||||
m_SizeDelta: {x: 878.6379, y: 128.2168}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -2431, y: 265}
|
||||
m_SizeDelta: {x: 1084.286, y: 277.934}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1862883450
|
||||
MonoBehaviour:
|
||||
@ -3605,7 +3605,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -79.24835}
|
||||
m_AnchoredPosition: {x: 0, y: -79.248535}
|
||||
m_SizeDelta: {x: 2160, y: 158.4967}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1907154470
|
||||
@ -3843,8 +3843,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -94.47095, y: -0.002960205}
|
||||
m_SizeDelta: {x: 101.9678, y: 101.97}
|
||||
m_AnchoredPosition: {x: -133, y: 0}
|
||||
m_SizeDelta: {x: 165.459, y: 165.462}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1996759275
|
||||
MonoBehaviour:
|
||||
@ -3975,8 +3975,8 @@ RectTransform:
|
||||
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: 0.00076291, y: 16.682}
|
||||
m_SizeDelta: {x: 512.67, y: 90}
|
||||
m_AnchoredPosition: {x: -0.00098419, y: 36.398003}
|
||||
m_SizeDelta: {x: 854.6, y: 129.43}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2027767344
|
||||
MonoBehaviour:
|
||||
@ -4025,8 +4025,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 60
|
||||
m_fontSizeBase: 60
|
||||
m_fontSize: 136.8
|
||||
m_fontSizeBase: 136.8
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
|
@ -80,12 +80,12 @@ public class TileManagment : MonoBehaviour
|
||||
OnInitialized?.Invoke();
|
||||
|
||||
}
|
||||
|
||||
|
||||
private float GetTileOffset()
|
||||
{
|
||||
return Vector3.Distance(adjTile_1.tilePosition, adjTile_2.tilePosition);
|
||||
}
|
||||
|
||||
private void SetStaticTileMaterials()
|
||||
{
|
||||
tileMaterialsStatic = new List<Material>();
|
||||
@ -108,6 +108,7 @@ public class TileManagment : MonoBehaviour
|
||||
}
|
||||
private void SetTileStartParams(TileInfo tile)
|
||||
{
|
||||
//print(tile);
|
||||
tile.tilePosition = tile.transform.position;
|
||||
tile.GetComponent<Renderer>().material = tileMaterialsStatic[(int)tile.tileOwnerIndex];
|
||||
}
|
||||
@ -137,7 +138,6 @@ public class TileManagment : MonoBehaviour
|
||||
}*/
|
||||
|
||||
SetAllPLayersTilesCapState(GameManager.activePlayers);
|
||||
|
||||
}
|
||||
|
||||
public static void ChangeTileOwnerSilent(TileInfo tile, PlayerState newPlayer)
|
||||
|
File diff suppressed because one or more lines are too long
@ -3,14 +3,14 @@
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.burst": "1.4.11",
|
||||
"com.unity.cinemachine": "2.6.5",
|
||||
"com.unity.collab-proxy": "1.5.7",
|
||||
"com.unity.collab-proxy": "1.7.1",
|
||||
"com.unity.device-simulator": "3.0.1-preview",
|
||||
"com.unity.ide.rider": "2.0.7",
|
||||
"com.unity.ide.visualstudio": "2.0.8",
|
||||
"com.unity.ide.visualstudio": "2.0.11",
|
||||
"com.unity.ide.vscode": "1.2.3",
|
||||
"com.unity.postprocessing": "3.0.3",
|
||||
"com.unity.recorder": "2.5.5",
|
||||
"com.unity.test-framework": "1.1.24",
|
||||
"com.unity.test-framework": "1.1.27",
|
||||
"com.unity.textmeshpro": "3.0.6",
|
||||
"com.unity.timeline": "1.4.8",
|
||||
"com.unity.ugui": "1.0.0",
|
||||
|
@ -23,7 +23,7 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.collab-proxy": {
|
||||
"version": "1.5.7",
|
||||
"version": "1.7.1",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -55,7 +55,7 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ide.visualstudio": {
|
||||
"version": "2.0.8",
|
||||
"version": "2.0.11",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
@ -103,7 +103,7 @@
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.test-framework": {
|
||||
"version": "1.1.24",
|
||||
"version": "1.1.27",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
@ -1,2 +1,2 @@
|
||||
m_EditorVersion: 2020.3.12f1
|
||||
m_EditorVersionWithRevision: 2020.3.12f1 (b3b2c6512326)
|
||||
m_EditorVersion: 2020.3.16f1
|
||||
m_EditorVersionWithRevision: 2020.3.16f1 (049d6eca3c44)
|
||||
|
Loading…
x
Reference in New Issue
Block a user