@@ -62,7 +62,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 119026}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.42, y: 0.88, z: -24.71}
m_LocalPosition: {x: 2.42, y: 0.47, z: -24.71}
m_LocalScale: {x: 1.1131154, y: 0.799585, z: 2.3438332}
m_Children:
- {fileID: 471412}
@@ -212,7 +212,7 @@ Light:
m_Type: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1.6
m_Range: 20
m_Range: 30
m_SpotAngle: 72
m_CookieSize: 10
m_Shadows:
@@ -246,9 +246,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leverPosition: 0
speed: 5
speed: 3
acceleration: 0.05
maxSpeed: 10
maxSpeed: 7
rotationSpeed: 5
target: {x: 0, y: 0, z: 0}
--- !u!124 &12449080
@@ -175,8 +175,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fce150d4667854af49488d7608d39700, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonFileLocationStrings:
- Assets/Character_JSON/chars.json
--- !u!4 &176260816
Transform:
m_ObjectHideFlags: 0
@@ -460,7 +458,7 @@ MonoBehaviour:
matchMaker: {fileID: 176260817}
templatePatches:
- {fileID: 128614, guid: 3c7f2e6049e224d40aca2def4893744a, type: 2}
characterTemplate: {fileID: 164532, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
characterTemplate: {fileID: 115340, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
props:
- {fileID: 191472, guid: f3c197bbb1b254f3b97491e00f01b6b2, type: 2}
- {fileID: 157448, guid: 83414010fcaea43768c3d0db09f9543e, type: 2}
@@ -85,6 +85,48 @@ NavMeshSettings:
cellSize: 0.16666667
manualCellSize: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &347218507
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalPosition.x
value: -6.627
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalPosition.y
value: 1.499
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalPosition.z
value: -11.49
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 416586, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
m_IsPrefabParent: 0
--- !u!1 &515434922
GameObject:
m_ObjectHideFlags: 0
@@ -146,95 +188,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
--- !u!1 &559283943
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 559283944}
m_Layer: 0
m_Name: Abstract
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &559283944
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 559283943}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1814748189}
- {fileID: 645975458}
m_Father: {fileID: 0}
m_RootOrder: 2
--- !u!1 &645975457
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 645975458}
- 114: {fileID: 645975460}
- 114: {fileID: 645975459}
m_Layer: 0
m_Name: World Generator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &645975458
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 645975457}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 559283944}
m_RootOrder: 1
--- !u!114 &645975459
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 645975457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 622c43b03aeb7426e93daf470e02670e, type: 3}
m_Name:
m_EditorClassIdentifier:
matchMaker: {fileID: 1814748187}
templatePatches:
- {fileID: 128614, guid: 3c7f2e6049e224d40aca2def4893744a, type: 2}
characterTemplate: {fileID: 164532, guid: 305b5c69187424553bcaffcdaf8234e3, type: 2}
props:
- {fileID: 134818, guid: cf52af3bdbf9f41069f7527e4346babf, type: 2}
- {fileID: 139894, guid: dd3c39b5e39ab4ba7b7b993a888b3a68, type: 2}
--- !u!114 &645975460
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 645975457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6c6db52a2a1684db1bff7a801057dadf, type: 3}
m_Name:
m_EditorClassIdentifier:
generator: {fileID: 645975459}
trackedObject: {fileID: 0}
--- !u!1 &1374976639
GameObject:
m_ObjectHideFlags: 0
@@ -321,57 +274,3 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!1 &1814748186
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 1814748189}
- 114: {fileID: 1814748188}
- 114: {fileID: 1814748187}
m_Layer: 0
m_Name: Fate
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1814748187
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1814748186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0cf99022764b40cf9c3d85d10430609, type: 3}
m_Name:
m_EditorClassIdentifier:
characterPool: {fileID: 1814748188}
--- !u!114 &1814748188
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1814748186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fce150d4667854af49488d7608d39700, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonFileLocationStrings:
- Assets/Character_JSON/chars.json
--- !u!4 &1814748189
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1814748186}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 559283944}
m_RootOrder: 0
@@ -1,11 +1,13 @@
using UnityEngine;
using System.Collections;
using System.IO;

/// <summary>
/// Given a CharacterStruct, this Component will modify other components to match the info from the CharacterStruct
/// </summary>
public class InitFromCharacterStruct : MonoBehaviour {

public SpriteRenderer spriteRenderer;
private CharacterStruct characterInfo;

// Initialization
@@ -21,11 +23,11 @@ public class InitFromCharacterStruct : MonoBehaviour {
public void SetCharacterInfo (CharacterStruct newInfo) {
this.characterInfo = newInfo;

SpriteRenderer renderer = GetComponent<SpriteRenderer> ();
var path = characterInfo.type + "/" + characterInfo.sprite;
spriteRenderer.sprite = Resources.Load(path, typeof(Sprite)) as Sprite;

renderer.sprite = Resources.Load(characterInfo.sprite, typeof(Sprite)) as Sprite;
Vector3 scale = new Vector3( 1, 1, 1f );
renderer.transform.localScale = scale;
spriteRenderer.transform.localScale = scale;
}

public CharacterStruct GetCharacterInfo () {
Deleted file not rendered

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.