staging2 #26

Merged
helar merged 35 commits from staging2 into master 2022-04-11 16:26:06 +00:00
14 changed files with 36785 additions and 666 deletions
Showing only changes of commit 037432c393 - Show all commits

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 8bc88477f037e96478019bba8de301fd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,35 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlayerInfo : MonoBehaviour
{
private int health;
private int essence_basic;
//Add elemental essences?
private void Awake()
{
health = 5;
essence_basic = 0;
}
public void AddHealth(int value)
{
health += value;
if (health <= 0)
{
Debug.Log("NO HEALTH REMAINING");
}
}
public void AddEssenceBasic(int value)
{
if (essence_basic + value < 0)
{
Debug.LogError("NOT ENOUGH ESSENCE");
}
else essence_basic += value;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 08f72f5d017837743b67d344a6a7ed52
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: da52a93af762fab4ab9085821b0fb632
guid: 6d5f257272c8a9840891d8745d7bc200
DefaultImporter:
externalObjects: {}
userData:

View File

@ -90,19 +90,19 @@ Material:
- _HorizonCloudSize: 4.91
- _HorizonCloudStartPosition: -0.1
- _HorizonCloudStep: 25
- _HorizonExponent: 3.6061766
- _HorizonExponent: 3.7146542
- _HorizonStep: 500
- _HorizonThickness: 1
- _MoonGlow: 0
- _MoonLightIntensity: 0.0000020319862
- _MoonLightIntensity: 0.0000058246696
- _MoonSize: 0
- _MoonSoftEdge: 0
- _OverheadCloudAltitude: 1000
- _OverheadCloudAnimationSpeed: 50
- _OverheadCloudFlowDirectionX: 1
- _OverheadCloudFlowDirectionZ: 1
- _OverheadCloudRemapMax: 1.1693709
- _OverheadCloudRemapMin: 0.17691116
- _OverheadCloudRemapMax: 1.2231352
- _OverheadCloudRemapMin: 0.20684233
- _OverheadCloudSize: 10
- _OverheadCloudStep: 2
- _StarsDensity0: 0.4
@ -121,25 +121,25 @@ Material:
- _StarsTwinkle1: 6
- _StarsTwinkle2: 2
- _SunGlow: 0.45
- _SunLightIntensity: 0.32942882
- _SunLightIntensity: 0.38252082
- _SunSize: 0.1
- _SunSoftEdge: 0.5
m_Colors:
- _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
- _FogColor: {r: 0, g: 0, b: 0, a: 0}
- _GroundColor: {r: 0.42032427, g: 0.4022119, b: 0.43729466, a: 1}
- _GroundColor: {r: 0.42508656, g: 0.40805677, b: 0.44104263, a: 1}
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
- _HorizonColor: {r: 0.90110177, g: 0.8658971, b: 0.767836, a: 1}
- _HorizonColor: {r: 0.8990203, g: 0.87222093, b: 0.77996165, a: 1}
- _MoonColor: {r: 1, g: 1, b: 1, a: 0}
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
- _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.978663}
- _SkyColor: {r: 0.2242445, g: 0.4031012, b: 0.6445015, a: 1}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.98546386}
- _SkyColor: {r: 0.23304974, g: 0.42586115, b: 0.67070246, a: 1}
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
- _SunColor: {r: 0.9721589, g: 0.9262196, b: 0.85041976, a: 1}
- _SunDirection: {r: 0, g: -0.3992945, b: 0.91682273, a: 0}
- _SunColor: {r: 0.9716981, g: 0.924923, b: 0.8476991, a: 1}
- _SunDirection: {r: 0, g: -0.46185654, b: 0.88695467, a: 0}
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -27,17 +27,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -2646112983924582150, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -4654689040985271397, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: -6300121351230409384, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: 2844727453665291070, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 8617030177687235664, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: 4259349063529903109, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: 2950455026436092240, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 6814411336743759160, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 6346676012794499573, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 9222750968982691349, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 3157667036560643348, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 3896593589085943192, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -8931776079857562303, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 7347968026426540258, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: -1909830897108123684, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -1762372347208809787, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: -1994646342592843684, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -1736210976181236159, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}