bugfix
This commit is contained in:
@@ -1092,6 +1092,140 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 76119653}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &83085749
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 83085750}
|
||||
- component: {fileID: 83085753}
|
||||
- component: {fileID: 83085752}
|
||||
- component: {fileID: 83085751}
|
||||
m_Layer: 5
|
||||
m_Name: Nyomozas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 2147483647
|
||||
m_IsActive: 1
|
||||
--- !u!224 &83085750
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 83085749}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1091291449}
|
||||
m_Father: {fileID: 891272366}
|
||||
m_RootOrder: 25
|
||||
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: 509.34, y: -18.68}
|
||||
m_SizeDelta: {x: 196.67, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &83085751
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 83085749}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 83085752}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 197904229}
|
||||
m_TargetAssemblyTypeName: Akciok, Assembly-CSharp
|
||||
m_MethodName: Nyomozas
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 2
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &83085752
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 83085749}
|
||||
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: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &83085753
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 83085749}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &85536135
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2915,6 +3049,7 @@ GameObject:
|
||||
- component: {fileID: 197904228}
|
||||
- component: {fileID: 197904229}
|
||||
- component: {fileID: 197904230}
|
||||
- component: {fileID: 197904232}
|
||||
m_Layer: 0
|
||||
m_Name: Mangager
|
||||
m_TagString: Untagged
|
||||
@@ -3078,6 +3213,8 @@ MonoBehaviour:
|
||||
threefour_Collider: {fileID: 255844036}
|
||||
korhazlepes1: {fileID: 975035252}
|
||||
korhazlepes2: {fileID: 986735257}
|
||||
jelenlegi_x: 1
|
||||
jelenlegi_y: 1
|
||||
--- !u!114 &197904224
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3148,6 +3285,7 @@ MonoBehaviour:
|
||||
- {fileID: 1832345121}
|
||||
- {fileID: 2125780727}
|
||||
- {fileID: 248187470}
|
||||
granatAktivalva: 0
|
||||
--- !u!114 &197904227
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3231,6 +3369,19 @@ MonoBehaviour:
|
||||
- {fileID: 889062367}
|
||||
- {fileID: 1970422692}
|
||||
elet: 2
|
||||
--- !u!114 &197904232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 197904216}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
foundsource: 0
|
||||
--- !u!1 &229807670
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -14542,6 +14693,7 @@ RectTransform:
|
||||
- {fileID: 248016068}
|
||||
- {fileID: 235549631}
|
||||
- {fileID: 1377405324}
|
||||
- {fileID: 83085750}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -19478,6 +19630,141 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 20, y: 5}
|
||||
m_SizeDelta: {x: 18.7, y: 21.87}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1091291448
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1091291449}
|
||||
- component: {fileID: 1091291451}
|
||||
- component: {fileID: 1091291450}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 2147483647
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1091291449
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1091291448}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 83085750}
|
||||
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!114 &1091291450
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1091291448}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Nyomozas
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24
|
||||
m_fontSizeBase: 24
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1091291451
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1091291448}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1113344666
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -13,8 +13,20 @@ public class Akciok : MonoBehaviour
|
||||
private Akciopont ap;
|
||||
//
|
||||
|
||||
//Nyomozashoz
|
||||
private movement movement;
|
||||
private string[,] nyomozasok =
|
||||
{
|
||||
{"ures", "ures", "ures", "" },
|
||||
{"ures", "ures", "ures", "" },
|
||||
{"ures", "ures", "ures", "" },
|
||||
{"ures", "ures", "ures", "" },
|
||||
|
||||
};
|
||||
|
||||
private void Start() {
|
||||
ap = FindObjectOfType<Akciopont>();
|
||||
movement= FindObjectOfType<movement>();
|
||||
|
||||
//kezdesnel karikazza be az elso harom adott toltenyt
|
||||
for (int i = 0; i < tolteny_index; i++) {
|
||||
@@ -58,5 +70,34 @@ public class Akciok : MonoBehaviour
|
||||
} else {
|
||||
Debug.Log("Nincs eleg tolteny");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Nyomozas
|
||||
public void Nyomozas() {
|
||||
if (ap.akciopont <= 0) {
|
||||
Debug.Log("nincs eleg akciopont");
|
||||
return;
|
||||
}
|
||||
|
||||
ap.akciopont--;
|
||||
|
||||
int atirandox = (movement.jelenlegi_x - 1);
|
||||
int atirandoy = (movement.jelenlegi_y - 1);
|
||||
|
||||
if (nyomozasok[atirandox, atirandoy] == "nyomozott") {
|
||||
Debug.Log("Itt mar nyomoztal");
|
||||
return;
|
||||
} else {
|
||||
nyomozasok[atirandoy, atirandox] = "nyomozott";
|
||||
}
|
||||
|
||||
for (int i = 0; i < nyomozasok.GetLength(0); i++) {
|
||||
string sor = "";
|
||||
for (int j = 0; j < nyomozasok.GetLength(1); j++) {
|
||||
sor += nyomozasok[i, j] + " ";
|
||||
}
|
||||
Debug.Log(sor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,8 +25,7 @@ public class Energia : MonoBehaviour
|
||||
|
||||
energiasav_text[getEnergiasavIndex()].text = "X";
|
||||
setEnegiasavIndex(getEnergiasavIndex() + 1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Debug.Log("energia csokkent");
|
||||
}
|
||||
|
||||
@@ -8,9 +8,9 @@ public class helyszinaktivalas : MonoBehaviour
|
||||
public Upgrade upgrade;
|
||||
private Akciopont akciopont;
|
||||
public movement movement;
|
||||
int jelenlegi_x;
|
||||
int jelenlegi_y;
|
||||
bool canUpgrade;
|
||||
//int movement.jelenlegi_x;
|
||||
//int movement.movement.jelenlegi_y;
|
||||
bool canUpgrade = false;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@@ -22,38 +22,38 @@ public class helyszinaktivalas : MonoBehaviour
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
/*void Update()
|
||||
{
|
||||
jelenlegi_x = movement.jelenlegi_x;
|
||||
jelenlegi_y = movement.jelenlegi_y;
|
||||
movement.jelenlegi_x = movement.jelenlegi_x;
|
||||
movement.jelenlegi_y = movement.jelenlegi_y;
|
||||
canUpgrade = false;
|
||||
}
|
||||
}*/
|
||||
|
||||
public void HelyszinAktivalas()
|
||||
{
|
||||
//1-es mezõ
|
||||
if (jelenlegi_x == 1 && jelenlegi_y == 1)
|
||||
if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1)
|
||||
{
|
||||
//ügynökcsapat ölés bárhol töltény nélkül
|
||||
}
|
||||
//2-es mezõ
|
||||
if (jelenlegi_x == 2 && jelenlegi_y == 1)
|
||||
if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1)
|
||||
{
|
||||
canUpgrade = true;
|
||||
//1 fejlesztés ingyen
|
||||
}
|
||||
//3-es mezõ
|
||||
if (jelenlegi_x == 3 && jelenlegi_y == 1)
|
||||
if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1)
|
||||
{
|
||||
//behuzni a boxcollidereket es kattintásra átváltani a játékos helyét
|
||||
}
|
||||
//4-es mezõ
|
||||
if (jelenlegi_x == 1 && jelenlegi_y == 2)
|
||||
if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2)
|
||||
{
|
||||
//kapsz egy tárgyat
|
||||
}
|
||||
//5-es mezõ
|
||||
if (jelenlegi_x == 2 && jelenlegi_y == 2)
|
||||
if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2)
|
||||
{
|
||||
dice.setLocked(false);
|
||||
/*if (dobas % 2 == 0)
|
||||
@@ -67,18 +67,18 @@ public class helyszinaktivalas : MonoBehaviour
|
||||
*/
|
||||
}
|
||||
//6-es mezõ
|
||||
if (jelenlegi_x == 3 && jelenlegi_y == 2)
|
||||
if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2)
|
||||
{
|
||||
//+1 akció
|
||||
}
|
||||
//7-es mezõ
|
||||
if (jelenlegi_x == 1 && jelenlegi_y == 3)
|
||||
if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3)
|
||||
{
|
||||
canUpgrade = true;
|
||||
//1 fejlesztés ingyen
|
||||
}
|
||||
//8-es mezõ
|
||||
if (jelenlegi_x == 2 && jelenlegi_y == 3)
|
||||
if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3)
|
||||
{
|
||||
dice.setLocked(false);
|
||||
/*dob két kockával
|
||||
@@ -86,22 +86,22 @@ public class helyszinaktivalas : MonoBehaviour
|
||||
a másik -X energia*/
|
||||
}
|
||||
//9-es mezõ
|
||||
if (jelenlegi_x == 3 && jelenlegi_y == 3)
|
||||
if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3)
|
||||
{
|
||||
//kapsz egy tárgyat
|
||||
}
|
||||
//10-es mezõ
|
||||
if (jelenlegi_x == 1 && jelenlegi_y == 4)
|
||||
if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4)
|
||||
{
|
||||
//+4 töltény
|
||||
}
|
||||
//11-es mezõ
|
||||
if (jelenlegi_x == 2 && jelenlegi_y == 4)
|
||||
if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4)
|
||||
{
|
||||
//Dobj! Megkapod a tárgyat.
|
||||
}
|
||||
//12-es mezõ
|
||||
if (jelenlegi_x == 3 && jelenlegi_y == 4)
|
||||
if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4)
|
||||
{
|
||||
//+1 élet
|
||||
}
|
||||
|
||||
@@ -4,7 +4,9 @@ using UnityEngine;
|
||||
|
||||
public class nyomozas : MonoBehaviour
|
||||
{
|
||||
public movement movement;
|
||||
private movement movement;
|
||||
private Akciopont ap;
|
||||
|
||||
private string[,] nyomozasok =
|
||||
{
|
||||
{"ures", "ures", "ures", "" },
|
||||
@@ -13,28 +15,48 @@ public class nyomozas : MonoBehaviour
|
||||
{"ures", "ures", "ures", "" },
|
||||
{"", "", "", "" }
|
||||
};
|
||||
int jelenlegi_x;
|
||||
int jelenlegi_y;
|
||||
//int jelenlegi_x;
|
||||
//int jelenlegi_y;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
movement = FindObjectOfType<movement>();
|
||||
|
||||
|
||||
movement = FindObjectOfType<movement>();
|
||||
ap = FindObjectOfType<Akciopont>();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
/*void Update()
|
||||
{
|
||||
int jelenlegi_x = movement.jelenlegi_x;
|
||||
int jelenlegi_y = movement.jelenlegi_y;
|
||||
}
|
||||
}*/
|
||||
|
||||
public void Nyomozas()
|
||||
{
|
||||
int atirandox = (jelenlegi_x -1);
|
||||
int atirandoy = (jelenlegi_y - 1);
|
||||
nyomozasok[atirandoy, atirandox] = "nyomozott";
|
||||
if (ap.akciopont <= 0) {
|
||||
Debug.Log("nincs eleg akciopont");
|
||||
return;
|
||||
}
|
||||
|
||||
ap.akciopont--;
|
||||
|
||||
int atirandox = (movement.jelenlegi_x - 1);
|
||||
int atirandoy = (movement.jelenlegi_y - 1);
|
||||
|
||||
if (nyomozasok[atirandox, atirandoy] == "nyomozott") {
|
||||
Debug.Log("Itt mar nyomoztal");
|
||||
return;
|
||||
} else {
|
||||
nyomozasok[atirandoy, atirandox] = "nyomozott";
|
||||
}
|
||||
|
||||
for (int i = 0; i < nyomozasok.GetLength(0); i++) {
|
||||
string sor = "";
|
||||
for (int j = 0; j < nyomozasok.GetLength(1); j++) {
|
||||
sor += nyomozasok[i, j] + " ";
|
||||
}
|
||||
Debug.Log(sor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Unity.Mathematics;
|
||||
|
||||
|
||||
public class vegpontozas : MonoBehaviour
|
||||
{
|
||||
@@ -10,20 +10,18 @@ public class vegpontozas : MonoBehaviour
|
||||
private Upgrade FejlesztesPont;
|
||||
private Targyak targyak;
|
||||
private Akciok akciok;
|
||||
public bool foundsource;
|
||||
private Elet elet;
|
||||
public bool foundsource;
|
||||
|
||||
int osszpont = 0;
|
||||
int elhasznaltelet = 0;
|
||||
int tolteny = 0;
|
||||
int megszerzetttargyak = 0;
|
||||
int tolteny;
|
||||
int megszerzetttargyak;
|
||||
int fejlesztespont;
|
||||
int energiapont;
|
||||
int megmaradtelet;
|
||||
// Start is called before the first frame update
|
||||
|
||||
void Start()
|
||||
{
|
||||
energia = FindObjectOfType<Energia>();
|
||||
energia = FindObjectOfType<Energia>();
|
||||
FejlesztesPont = FindObjectOfType<Upgrade>();
|
||||
targyak = FindObjectOfType<Targyak>();
|
||||
@@ -32,15 +30,15 @@ public class vegpontozas : MonoBehaviour
|
||||
foundsource = false;
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
public int OsszpontSzamalas()
|
||||
{
|
||||
energiapont = energia.energiasav_text.Length - (energia.getEnergiasavIndex() + 1);
|
||||
megmaradtelet = elet.elet;
|
||||
tolteny = akciok.betarazott_tolteny;
|
||||
megszerzetttargyak = targyak.targy_szamlalo;
|
||||
energiapont = Convert.ToInt32(energia.energiasav_text) - energia.getEnergiasavIndex();
|
||||
fejlesztespont = FejlesztesPont.fejlesztes_szamlalo;
|
||||
megmaradtelet = elet.elet;
|
||||
|
||||
osszpont = (energiapont * 2) + (megmaradtelet * 2) + (fejlesztespont / 3) + (tolteny / 2) + megszerzetttargyak;
|
||||
return osszpont;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@ EditorUserSettings:
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedSceneGuid-0:
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-1:
|
||||
value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
flags: 0
|
||||
UnityRemoteCompression:
|
||||
value: 337f73
|
||||
|
||||
@@ -16,8 +16,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 43
|
||||
width: 1366
|
||||
height: 685
|
||||
width: 1920
|
||||
height: 997
|
||||
m_ShowMode: 4
|
||||
m_Title: Hierarchy
|
||||
m_RootView: {fileID: 2}
|
||||
@@ -44,8 +44,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1366
|
||||
height: 685
|
||||
width: 1920
|
||||
height: 997
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_UseTopView: 1
|
||||
@@ -69,7 +69,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1366
|
||||
width: 1920
|
||||
height: 30
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
@@ -90,8 +90,8 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 665
|
||||
width: 1366
|
||||
y: 977
|
||||
width: 1920
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
@@ -114,12 +114,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 30
|
||||
width: 1366
|
||||
height: 635
|
||||
width: 1920
|
||||
height: 947
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 6887
|
||||
controlID: 84
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -139,12 +139,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1005
|
||||
height: 635
|
||||
width: 1413
|
||||
height: 947
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 6888
|
||||
controlID: 85
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -164,12 +164,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1005
|
||||
height: 363
|
||||
width: 1413
|
||||
height: 541
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 6889
|
||||
controlID: 86
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -187,8 +187,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 220
|
||||
height: 363
|
||||
width: 309
|
||||
height: 541
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 15}
|
||||
@@ -211,10 +211,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 220
|
||||
x: 309
|
||||
y: 0
|
||||
width: 785
|
||||
height: 363
|
||||
width: 1104
|
||||
height: 541
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 16}
|
||||
@@ -241,13 +241,13 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 363
|
||||
width: 1005
|
||||
height: 272
|
||||
y: 541
|
||||
width: 1413
|
||||
height: 406
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 6963
|
||||
controlID: 50
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -265,8 +265,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 512
|
||||
height: 272
|
||||
width: 760
|
||||
height: 406
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 17}
|
||||
@@ -289,12 +289,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 512
|
||||
x: 760
|
||||
y: 0
|
||||
width: 493
|
||||
height: 272
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
width: 653
|
||||
height: 406
|
||||
m_MinSize: {x: 102, y: 121}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 18}
|
||||
m_Panes:
|
||||
- {fileID: 18}
|
||||
@@ -315,10 +315,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1005
|
||||
x: 1413
|
||||
y: 0
|
||||
width: 361
|
||||
height: 635
|
||||
width: 507
|
||||
height: 947
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 19}
|
||||
@@ -346,10 +346,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 206
|
||||
x: 309
|
||||
y: 73
|
||||
width: 797
|
||||
height: 342
|
||||
width: 1102
|
||||
height: 520
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -360,7 +360,7 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 797, y: 321}
|
||||
m_TargetSize: {x: 1102, y: 499}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -375,10 +375,10 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -398.5
|
||||
m_HBaseRangeMax: 398.5
|
||||
m_VBaseRangeMin: -160.5
|
||||
m_VBaseRangeMax: 160.5
|
||||
m_HBaseRangeMin: -551
|
||||
m_HBaseRangeMax: 551
|
||||
m_VBaseRangeMin: -249.5
|
||||
m_VBaseRangeMax: 249.5
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@@ -396,23 +396,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 797
|
||||
height: 321
|
||||
width: 1102
|
||||
height: 499
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 398.5, y: 160.5}
|
||||
m_Translation: {x: 551, y: 249.5}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -398.5
|
||||
y: -160.5
|
||||
width: 797
|
||||
height: 321
|
||||
x: -551
|
||||
y: -249.5
|
||||
width: 1102
|
||||
height: 499
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 797, y: 342}
|
||||
m_LastWindowPixelSize: {x: 1102, y: 520}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
@@ -440,8 +440,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 73
|
||||
width: 219
|
||||
height: 342
|
||||
width: 308
|
||||
height: 520
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -451,7 +451,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 8487ffff2688fffff489ffff0a8affff3c8effffde8effffac90ffffc290ffffd894ffff7a95ffff4897ffff5e97ffff1299ffffb499ffff729dffff889dffff76c0ffff18c1ffffe6c2fffff0c2ffff8cc4ffff2ec5fffffcc6ffff06c7ffffc0caffff64cbffff26cfffff34cfffffc2f4ffff1cf7ffff28fbffffd4810000fc810000608300009ad8000016da000040da00007afe0000a2fe0000c0ff0000080001003e5501006655010084560100cc56010080690100a8690100c66a0100ee6a01000e6b01005e6b01009a8201001083010076840100c2840100
|
||||
m_ExpandedIDs: de9affff829bffff249fffff4a9fffffdaeaffff06f9ffff02fbffff8e6d0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -495,10 +495,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 220
|
||||
x: 309
|
||||
y: 73
|
||||
width: 783
|
||||
height: 342
|
||||
width: 1102
|
||||
height: 520
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -755,9 +755,9 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: 302.41953, y: 232.69096, z: -2.4036145}
|
||||
m_Target: {x: -5.7593803, y: -0.58151525, z: -0.2918403}
|
||||
speed: 2
|
||||
m_Value: {x: 302.41953, y: 232.69096, z: -2.4036145}
|
||||
m_Value: {x: -5.7593803, y: -0.58151525, z: -0.2918403}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -808,9 +808,9 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 300.6967
|
||||
m_Target: 11.683351
|
||||
speed: 2
|
||||
m_Value: 300.6967
|
||||
m_Value: 11.683351
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -856,9 +856,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 436
|
||||
width: 511
|
||||
height: 251
|
||||
y: 614
|
||||
width: 759
|
||||
height: 385
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -876,22 +876,22 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets
|
||||
- Assets/Scripts
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 55
|
||||
m_LastFolders:
|
||||
- Assets
|
||||
- Assets/Scripts
|
||||
m_LastFoldersGridSize: 55
|
||||
m_LastProjectPath: C:\dev\find the source
|
||||
m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 12770000
|
||||
m_LastClickedID: 30482
|
||||
m_ExpandedIDs: 000000001277000000ca9a3bffffff7f
|
||||
m_SelectedIDs: 326d0000
|
||||
m_LastClickedID: 27954
|
||||
m_ExpandedIDs: 00000000866b0000886b00008a6b0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -919,7 +919,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 000000001277000000ca9a3bffffff7f
|
||||
m_ExpandedIDs: 00000000866b0000886b00008a6b0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -995,10 +995,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 512
|
||||
y: 436
|
||||
width: 491
|
||||
height: 251
|
||||
x: 760
|
||||
y: 614
|
||||
width: 651
|
||||
height: 385
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -1023,10 +1023,10 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1005
|
||||
x: 1413
|
||||
y: 73
|
||||
width: 360
|
||||
height: 614
|
||||
width: 506
|
||||
height: 926
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
|
||||
Reference in New Issue
Block a user