This commit is contained in:
康地林 2023-09-14 23:09:49 +08:00
commit f7140059a9
914 changed files with 1055520 additions and 22695 deletions

View File

@ -0,0 +1,332 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7841566711014911766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7841566711014911761}
- component: {fileID: 7841566711014911763}
- component: {fileID: 7841566711014911760}
m_Layer: 5
m_Name: Arrow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7841566711014911761
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711014911766}
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: 7841566712123838754}
m_RootOrder: 2
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: 14, y: 0}
m_SizeDelta: {x: 34, y: 41}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7841566711014911763
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711014911766}
m_CullTransparentMesh: 1
--- !u!114 &7841566711014911760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711014911766}
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: 21300000, guid: bd4f4fdbf06d1354ea2220b6e57db918, type: 3}
m_Type: 0
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!1 &7841566711052037341
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7841566711052037340}
- component: {fileID: 7841566711052037342}
- component: {fileID: 7841566711052037343}
m_Layer: 5
m_Name: Info
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7841566711052037340
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711052037341}
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: 7841566712123838754}
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: 62.575027, y: 0}
m_SizeDelta: {x: -129.15005, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7841566711052037342
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711052037341}
m_CullTransparentMesh: 1
--- !u!114 &7841566711052037343
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711052037341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.37169808, g: 1, b: 0.98916715, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 18
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4F7F\u7528\u4E0D\u5408\u683C\u7684\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\uFF0C\u6216\u4F7F\u7528\u7684\u9632\u62A4\u7528\u54C1\u4E0D\u9F50\u5168\u3002\u8FDB\u5165\u4F5C\u4E1A\u73B0\u573A\u672A\u6309\u89C4\u5B9A\u6B63\u786E\u4F69\u6234\u5B89\u5168\u5E3D\u3001\u7740\u88C5\u3002"
--- !u!1 &7841566711167579073
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7841566711167579072}
- component: {fileID: 7841566711167579074}
- component: {fileID: 7841566711167579075}
m_Layer: 5
m_Name: ID
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7841566711167579072
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711167579073}
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: 7841566712123838754}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 48, y: 0}
m_SizeDelta: {x: 79.151, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7841566711167579074
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711167579073}
m_CullTransparentMesh: 1
--- !u!114 &7841566711167579075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566711167579073}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.37254903, g: 1, b: 0.9882353, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 40
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1
--- !u!1 &7841566712123838755
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7841566712123838754}
- component: {fileID: 7841566712123838780}
- component: {fileID: 7841566712123838781}
- component: {fileID: 7841566712123838783}
m_Layer: 5
m_Name: OptionItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7841566712123838754
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566712123838755}
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: 7841566711052037340}
- {fileID: 7841566711167579072}
- {fileID: 7841566711014911761}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -5.7496, y: -17.625305}
m_SizeDelta: {x: -78.8296, y: 68.9779}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &7841566712123838780
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566712123838755}
m_CullTransparentMesh: 1
--- !u!114 &7841566712123838781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566712123838755}
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: 21300000, guid: 6861fe63fefedef4d82788149c7b72d8, type: 3}
m_Type: 0
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!114 &7841566712123838783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841566712123838755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 212dfd773c23c4347a57f74a2e1989f8, type: 3}
m_Name:
m_EditorClassIdentifier:
ID: {fileID: 7841566711167579075}
info: {fileID: 7841566711052037343}

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 80dd0453f38e90f468e3639781e35f11
NativeFormatImporter:
guid: 93344dcdc8d5a4847a7aa731e5635769
PrefabImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -34,7 +34,6 @@ namespace Adam
});
}
SwitchPanel(false);
//GameManager.ins.CameraManager.BtnOnClick(BirdEyeView);
BirdEyeView.gameObject.SetActive(false);
}

View File

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230914
//@company QianHuo
//
//@description:
//============================================================
namespace Components
{
public class OptionItem : MonoBehaviour
{
public Text ID;
public Text info;
public void SetValue(string _id, string _info)
{
ID.text = _id;
info.text = _info;
}
}
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9a37968ab41d263409e78ac49712dfe8
guid: 212dfd773c23c4347a57f74a2e1989f8
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@ -22,16 +22,13 @@ public class ToolItem : MonoBehaviour
public Vector3 originAngle = new Vector3();
public GameObject prefab;
public Attribute attribute = Attribute.defaultModel;
public void SetValue(string name, Transform modelTransform, Action selfCallback = null)
public void SetValue(string name, Transform modelTransform)
{
toolName = name;
closeButton.onClick.AddListener(OnClose);
selfButton.onClick.AddListener(() =>
{
selfCallback?.Invoke();
});
Texture2D icon = Resources.Load<Texture2D>("New/UI/" + name);
showIcon.sprite = ToSprite(icon);
originPos = modelTransform.localPosition;
@ -66,10 +63,7 @@ public class ToolItem : MonoBehaviour
}
}
public void OnSelfClick()
{
}
private Sprite ToSprite(Texture2D t)
{
@ -77,12 +71,16 @@ public class ToolItem : MonoBehaviour
return prite;
}
public void OnClose()
private void OnClose()
{
GameObject obj = Instantiate(prefab);
obj.name = toolName;
obj.transform.localPosition = originPos;
obj.transform.localEulerAngles = originAngle;
Destroy(gameObject);
ToolsItemManager.Instance.RemoveNull();
}
}

View File

@ -73,7 +73,7 @@ public class ToolModelClick : MonoBehaviour
return;
}
onDown?.Invoke();
ToolsItemController.Instance.CreatToolItem(gameObject);
ToolsItemManager.Instance.CreatToolItem(gameObject);
Destroy(gameObject);
}

View File

@ -0,0 +1,28 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230914
//@company QianHuo
//
//@description:
//============================================================
namespace JData
{
[Serializable]
public class JobCardData
{
public string state;
public string message;
public Data data;
}
[Serializable]
public class Data
{
public string name;
public string adress;
}
}

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: dcd90870c667e3e41aa6a7877b1caeb8
timeCreated: 1566840309
licenseType: Store
guid: e3585b88167c10e47b5a8db56eb348cf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0

View File

@ -13,16 +13,25 @@ using System;
namespace Data
{
[Serializable]
public class SceneData
public class SceneInfoData
{
public bool state { get; private set; }
public string message { get; private set; }
public string data { get; private set; }
public bool state;
public string message;
public string data;
public SceneInfoData(bool state, string message, string data)
{
this.state = state;
this.message = message;
this.data = data;
}
}
//public class Data
//{
// public string Isguangfu;
// public string Isguangfu;pu
// public string jxfs;
// public string zhbl;
//}

View File

@ -13,5 +13,5 @@ using UnityEngine;
public class GlobalFlag
{
public SceneData sceneData;
public static SceneInfoData sceneData;
}

View File

@ -1,8 +1,10 @@
using Data;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using Utility;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
@ -17,7 +19,6 @@ namespace QianHuo
{
public Button goToSceneBtn;
public InputField userID;
public SceneData sceneData = new SceneData();
public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=changjing&bianhao=";
// Use this for initialization
private void Start()
@ -28,8 +29,23 @@ namespace QianHuo
public async void OnGo()
{
string _url = url + userID.text;
SceneData data = await AsyncWebReq.Get<SceneData>(_url);
SceneInfoData sceneInfoData = await AsyncWebReq.Get<SceneInfoData>(_url);
GlobalFlag.sceneData = sceneInfoData;
string[] tt = ToolUtility.GetInfo(sceneInfoData.message,'_');
foreach (var item in tt)
{
Debug.Log(item);
}
//if (tt[3].Equals("商业用户"))
//{
// SceneLoad.Instance.SceneChange("");
//}
Debug.Log(sceneInfoData.message);
Debug.Log(GlobalFlag.sceneData.message);
}
}
}

View File

@ -0,0 +1,47 @@
using JData;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230914
//@company Adam
//
//@description:
//============================================================
namespace Adam
{
public class JobCardController : MonoBehaviour
{
public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=kh&bianhao=";
public InputField[] userIDs;
public InputField[] userNames;
public InputField[] workSpace;
public GameObject jobCardPanel;
// Use this for initialization
private void Start()
{
for (int i = 0; i < userIDs.Length; i++)
{
int index = i;
userIDs[index].onSubmit.AddListener((string numb) =>
{
GetValue(numb, index);
});
}
jobCardPanel.SetActive(false);
}
public async void GetValue(string numb, int _index)
{
Debug.Log(numb);
string _url = url + numb;
JobCardData jData = await AsyncWebReq.Get<JobCardData>(_url);
userNames[_index].text = jData.data.name;
workSpace[_index].text = jData.data.adress;
}
}
}

View File

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

View File

@ -12,18 +12,5 @@ using UnityEngine;
public class ToolModelManager : MonoBehaviour
{
public ToolItem[] toolItems;
public Transform toolItemContent;
/// <summary>
/// 需要3D去调用
/// </summary>
public void SwitchAllToolItems()
{
toolItems = toolItemContent.GetComponentsInChildren<ToolItem>();
for (int i = 0; i < toolItems.Length; i++)
{
toolItems[i].SwitchSelfIsClick();
}
}
}

View File

@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.UI;
//============================================================
//支持中文文件使用UTF-8编码
@ -11,13 +12,14 @@ using UnityEngine.UI;
//@description:
//============================================================
public class ToolsItemController : MonoSingleton<ToolsItemController>
public class ToolsItemManager : MonoSingleton<ToolsItemManager>
{
public GameObject toolPanel;
public List<ToolItem> toolItems = new List<ToolItem>();
public ToolItem toolItemPrefab;
public Transform toolsContent;
public Button closeBtn;
public UnityEvent ItemClick;
private void Start()
{
closeBtn.onClick.AddListener(() => { SwictchToolPanel(false); });
@ -40,10 +42,46 @@ public class ToolsItemController : MonoSingleton<ToolsItemController>
public void CreatToolItem(GameObject currentModel)
{
ToolItem tTemp = Instantiate(toolItemPrefab, toolsContent);
if (tTemp.name == "工作卡")
{
tTemp.selfButton.onClick.AddListener(() =>
{
UIManager.Instance.jobCardController.jobCardPanel.SetActive(true);
});
}
else
{
tTemp.selfButton.onClick.AddListener(() =>
{
ItemClick?.Invoke();
});
}
tTemp.SetValue(currentModel.name, currentModel.transform);
tTemp.SetState(true);
toolItems.Add(tTemp);
}
public void RemoveNull()
{
for (int i = 0; i < toolItems.Count; i++)
{
if (toolItems[i] == null)
toolItems.RemoveAt(i);
}
}
/// <summary>
/// 需要3D去调用
/// </summary>
public void SwitchAllToolItems()
{
for (int i = 0; i < toolItems.Count; i++)
{
if (toolItems[i] != null)
toolItems[i].SwitchSelfIsClick();
else
toolItems.RemoveAt(i);
}
}
}

View File

@ -14,11 +14,12 @@ using UnityEngine.UI;
public class UIManager : MonoSingleton<UIManager>
{
public ToolsItemController ToolsItemManager;
public ToolsItemManager ToolsItemManager;
public MobileTerminalController MobileTerminalController;
public AssignmentController assignmentController;
public BottomController bottomCotroller;
public ToolModelManager toolModelManager;
public JobCardController jobCardController;
public Button exitBtn;
public Button backToToolBtn;
// Use this for initialization

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 04d0422b9fd760740ba28eb44e1b1108
guid: 71a1e7d6687d69e4f86927f7da77e9a8
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230914
//@company QianHuo
//
//@description:
//============================================================
namespace Utility
{
public class ToolUtility
{
/// <summary>
/// 分割字符串
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
public static string[] GetInfo(string info,char t)
{
string[] result = info.Split(t);
return result;
}
}
}

View File

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

View File

@ -1,72 +1,29 @@
(Version numbers: http://semver.org/)
3.1.0:
Quick fix for new Unity versions.
Features:
- Fix build issues caused by breaking changes Unity made in 2019.3.9.
-------------------------------------------------------------------------
3.0.0:
CEF update, VR update, some bugfixes.
I've been working on a big, awesome update. This is not it.
Breaking Changes:
- Update to CEF 74.1.19+gb62bacf+chromium-74.0.3729.157 / Chromium 74.0.3729.157
- Default HTML errors are generated by ErrorGenerator.cs instead of Resources/Browser/Errors.html
Other changes:
- [OS X] Browsers can use hardware OS cursors again.
- Move CEF version information from versions.txt to documentation.
Features:
- Support for SteamVR 2+ with its remappable input handlers and related changes.
- Postbuild scripts display an alert in addition to logging a message when there's an issue.
- Add support for using ExternalKeyboard in Unity's GUI (and demo).
- You can test your game from the Windows Editor while targeting OS X and building for OS X from Windows is officially supported.
- Added Browser.LoadDataURI()
- The newer Chromium version supports mp3 audio (blocking patents have expired).
Fixes:
- Fix Windows 32-bit executable effectively having --zf-log-internal hardcoded on.
- Fixes for newer Unity versions.
- Log fixes: Deal better with odd application names, put the browser log beside instead of inside the Unity log in Unity 2019.1+ to keep messages from getting clobbered, and more.
- Fix a ZFGameBrowser crash-on-exit bug.
- Fix ExternalKeyboard causing errors after it's destroyed.
- Fix scrolling one GUI browser scrolling them all (and probably some related bugs). Now we scroll what the mouse is over.
- [OS X] Fix issues with tab and insert keys.
- [Windows] Bail on build if the chosen path will break things (has a ";").
Known Issues:
- Due to technical reasons (see CEF issue 2586) LoadHTML doesn't work right in some cases, such as after a fetch fail. We still display errors (by loading a data URI), but the history and URL are incorrect.
-------------------------------------------------------------------------
2.1.0:
Note: ThirdPartyNotices.txt for 2.0.0 was partially wrong see fixes below.
Changes:
- --zf-browser-update-delay is unused. The slave update loop is now
handled by CefRunMessageLoop instead of CefDoMessageLoopWork and
should hopefully work fine without tuning. (Existing applications
- --zf-browser-update-delay is unused. The slave update loop is now
handled by CefRunMessageLoop instead of CefDoMessageLoopWork and
should hopefully work fine without tuning. (Existing applications
using this flag should continue to run.)
- Tweaks to the main demo's 3rd room.
Features:
- Add experimental support for Linux 64-bit builds!
- Add support for Windows 64-bit and OS X il2cpp builds.
- Add support for Windows 64-bit and OS X il2cpp builds.
- Add CSP-friendly version of EvalJS: EvalJSCSP. (Has some requirements
and pitfalls, see the function documentation.)
- Automatically set the executable bit on ZFGameBrowser executable
- Automatically set the executable bit on ZFGameBrowser executable
on build. (OS X, Linux)
Fixes:
- ThirdPartyNotices.txt contained data from CEF 3.3202.1683 instead of
3.3282.1741. It has been updated. Also: encoding fix.
Consider updating this file (as appropriate), even if you don't use
Consider updating this file (as appropriate), even if you don't use
the new asset version, for legal reasons.
(You should have more-or-less what should have been in the last
(You should have more-or-less what should have been in the last
version if you remove the libX11 section.)
- Fix needing MSVC 2013 runtime installed. (Windows)
- Fix browser not working if started under a path with Unicode
@ -82,14 +39,13 @@ Fixes:
- Fix an issue that crashed the Editor when hot-reloading scripts.
(Hot-reloading isn't supported, but it shouldn't crash your Editor.)
- Don't leak world-space cursors into the scene if browser is destroyed.
- CEFResources are now (properly) handled on a per-platform+architecture
- CEFResources are now (properly) handled on a per-platform+architecture
basis.
- Fix build errors for OS X with newer Unity versions. (Unity doesn't
- Fix build errors for OS X with newer Unity versions. (Unity doesn't
make a Plugins folder for us anymore.)
- Some fixes for new Unity versions.
- Misc fixes, docs updates/changes.
-------------------------------------------------------------------------
2.0.0:
Changes:
- Updated to Chromium 64.0.3282.119 / CEF 3.3282.1741.gcd94615 for
@ -102,7 +58,7 @@ Changes:
- The Unity Editor won't hang if you use the new Mono (.NET 4.6)
backend.
- (Windows) Standalone builds made with newer Unity and CEF
versions won't crash on exit.
versions won't crash on exit.d
- (OS X) Fixes all sorts of crashing in builds.
- (Windows) Since the browser no longer executes directly from the
Player executable, many files can and have been moved from the build
@ -179,14 +135,12 @@ Fixes:
persisted.
- New Unity version fixes.
-------------------------------------------------------------------------
1.1.1:
Changes:
- The Unity 4.x FPS controller isn't included with the demo anymore.
The demo now uses a simple replacement controller. (Not a public API
change, affects demo and demo scripts only.)
-------------------------------------------------------------------------
1.1.0:
Features:
- You can now adjust or add Chromium switches with
@ -213,7 +167,6 @@ Fixes:
- localGame:// will strip query strings/hashes and try to find the
underlying file instead of always failing when one is present.
-------------------------------------------------------------------------
1.0.2:
Fixes:
- OS X: Asset Store packages still weren't getting the right child process
@ -221,7 +174,6 @@ Fixes:
starting a browser in the Editor.
-------------------------------------------------------------------------
1.0.1:
Fixes:
- Rebuild package so ZFGameBrowser has the correct initial permissions
@ -235,7 +187,6 @@ Fixes:
break automatic resizing.
-------------------------------------------------------------------------
1.0.0:
Initial release

View File

@ -77,17 +77,15 @@ LightmapSettings:
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFiltering: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0}
m_ShadowMaskMode: 2
--- !u!196 &4
@ -253,11 +251,6 @@ Prefab:
propertyPath: enableTouchInput
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114098032772169006, guid: 5d7c381cc86ee934083552b6fc2c4e62,
type: 2}
propertyPath: initialBrowser
value:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114111633764499206, guid: 5d7c381cc86ee934083552b6fc2c4e62, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: 5d7c381cc86ee934083552b6fc2c4e62, type: 2}

View File

@ -1,658 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 8
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_GIWorkflowMode: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_TemporalCoherenceThreshold: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
serializedVersion: 8
m_Resolution: 2
m_BakeResolution: 40
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_LightingDataAsset: {fileID: 0}
m_ShadowMaskMode: 2
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &108231970
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 108231973}
- component: {fileID: 108231972}
- component: {fileID: 108231971}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &108231971
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 108231970}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &108231972
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 108231970}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &108231973
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 108231970}
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: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &140009346
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 140009350}
- component: {fileID: 140009349}
- component: {fileID: 140009348}
- component: {fileID: 140009347}
- component: {fileID: 140009351}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &140009347
AudioListener:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 140009346}
m_Enabled: 1
--- !u!124 &140009348
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 140009346}
m_Enabled: 1
--- !u!20 &140009349
Camera:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 140009346}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!4 &140009350
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 140009346}
m_LocalRotation: {x: 0.15248701, y: 0.053334653, z: -0.008241861, w: 0.98683095}
m_LocalPosition: {x: -0.21409537, y: 0.86498666, z: -1.5526361}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &140009351
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 140009346}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a395529363898b4b8efe7f4c2f5f724, type: 3}
m_Name:
m_EditorClassIdentifier:
enableVR: 0
--- !u!1 &609766711
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 609766715}
- component: {fileID: 609766714}
- component: {fileID: 609766713}
- component: {fileID: 609766712}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &609766712
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 609766711}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &609766713
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 609766711}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &609766714
Canvas:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 609766711}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &609766715
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 609766711}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1929661806}
- {fileID: 1928997826}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &964651082
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 964651084}
- component: {fileID: 964651083}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &964651083
Light:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 964651082}
m_Enabled: 1
serializedVersion: 8
m_Type: 1
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &964651084
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 964651082}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1928997825
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1928997826}
- component: {fileID: 1928997831}
- component: {fileID: 1928997830}
- component: {fileID: 1928997829}
- component: {fileID: 1928997828}
- component: {fileID: 1928997827}
- component: {fileID: 1928997832}
m_Layer: 5
m_Name: ExternalKeyboard (GUI)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1928997826
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
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: 609766715}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0.024952, y: 153.80002}
m_SizeDelta: {x: -0.050049, y: 308}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1928997827
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b27bad8d50722bb4083b964da1d1cae4, type: 3}
m_Name:
m_EditorClassIdentifier:
cursorNormallyVisible: 1
--- !u!114 &1928997828
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9f0449828438f1c4eb0712205cc11bb7, type: 3}
m_Name:
m_EditorClassIdentifier:
dragMovementThreshold: 0
viewCamera: {fileID: 0}
enableMouseInput: 1
enableTouchInput: 1
enableFPSInput: 0
enableVRInput: 0
maxDistance: Infinity
disableMouseEmulation: 0
enableInput: 1
automaticResize: 1
--- !u!114 &1928997829
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35bf0bd4ded61a34f9be34f6738e4010, type: 3}
m_Name:
m_EditorClassIdentifier:
_url:
_width: 512
_height: 512
generateMipmap: 0
baseColor:
serializedVersion: 2
rgba: 0
_zoom: 0
allowContextMenuOn: 2
newWindowAction: 2
--- !u!114 &1928997830
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 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_Texture: {fileID: 2800000, guid: 30a28a853ae87d44bab2c4bdc861c40d, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1928997831
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
--- !u!114 &1928997832
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1928997825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faa68da6a73a843439bee4b722ce18b4, type: 3}
m_Name:
m_EditorClassIdentifier:
automaticFocus: 1
initialBrowser: {fileID: 0}
hideWhenUnneeded: 1
--- !u!1001 &1929661804
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 609766715}
m_Modifications:
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchoredPosition.y
value: 159
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_SizeDelta.y
value: -319
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 11479464, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
propertyPath: _url
value: https://google.com/
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 2}
m_IsPrefabParent: 0
--- !u!224 &1929661806 stripped
RectTransform:
m_PrefabParentObject: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd,
type: 2}
m_PrefabInternal: {fileID: 1929661804}

View File

@ -1,10 +1,9 @@
fileFormatVersion: 2
guid: 29961feb2d2f247b5bd1b00a1e4b1fba
guid: 014cce0e580fad54199644e2ccb3fae2
folderAsset: yes
timeCreated: 1563395979
timeCreated: 1519940966
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 42795773916087042b860b6de9da4a50
timeCreated: 1519940967
licenseType: Store
NativeFormatImporter:
mainObjectFileID: 25800000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,69 @@
fileFormatVersion: 2
guid: 9ae1fc0b5ec6c88479d8ad7541de3a7d
timeCreated: 1519940967
licenseType: Store
TextureImporter:
fileIDToRecycleName:
8900000: generatedCubemap
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 2
aniso: 0
mipBias: 0
wrapMode: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,80 +2,137 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: DemoRed
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_ShaderKeywords:
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
serializedVersion: 2
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.615
- _GlossyReflections: 1
- _Metallic: 0.277
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
data:
first:
name: _SrcBlend
second: 1
data:
first:
name: _DstBlend
second: 0
data:
first:
name: _Cutoff
second: .5
data:
first:
name: _Parallax
second: .0199999996
data:
first:
name: _ZWrite
second: 1
data:
first:
name: _Glossiness
second: .61500001
data:
first:
name: _BumpScale
second: 1
data:
first:
name: _OcclusionStrength
second: 1
data:
first:
name: _DetailNormalMapScale
second: 1
data:
first:
name: _UVSec
second: 0
data:
first:
name: _Mode
second: 0
data:
first:
name: _Metallic
second: .27700001
m_Colors:
- _Color: {r: 1, g: 0.2794118, b: 0.2794118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
data:
first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _Color
second: {r: 1, g: .279411793, b: .279411793, a: 1}

View File

@ -231,9 +231,9 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_Convex: 0
m_InflateMesh: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &64732355649939724
@ -245,9 +245,9 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_Convex: 0
m_InflateMesh: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &114024988043671530
@ -330,7 +330,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
dragMovementThreshold: 20
viewCamera: {fileID: 0}
enableMouseInput: 0
enableMouseInput: 1
enableTouchInput: 0
enableFPSInput: 0
enableVRInput: 1

View File

@ -1,64 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!850595691 &4890085278179872738
LightingSettings:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SimpleBrowserSettings
serializedVersion: 4
m_GIWorkflowMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_BakeBackend: 0
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_LightmapCompression: 3
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 0
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 1
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 1024
m_FinalGatherFiltering: 1
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 2
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: fc21dcc94c4ca6b48ae76c2e1b27f222
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,99 +2,180 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PinkSmooth
m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords:
- _EMISSIONMAP
- _LIGHTMAPPING_DYNAMIC_LIGHTMAPS
- _LIGHTMAPPING_REALTIME
- _UVSEC_UV1
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_ShaderKeywords: _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME
_UVSEC_UV1
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
serializedVersion: 2
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 580615edf5e29d245af58fc5fe2b06ac, type: 3}
m_Scale: {x: 4, y: 4}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Occlusion:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 580615edf5e29d245af58fc5fe2b06ac, type: 3}
m_Scale: {x: 4, y: 4}
m_Offset: {x: 0, y: 0}
data:
first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _Occlusion
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _SpecGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaTestRef: 0.5
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EmissionScaleUI: 2
- _GlossMapScale: 1
- _Glossiness: 0.1
- _GlossyReflections: 1
- _Lightmapping: 1
- _Metallic: 0.1
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
data:
first:
name: _SrcBlend
second: 1
data:
first:
name: _DstBlend
second: 0
data:
first:
name: _Cutoff
second: .5
data:
first:
name: _AlphaTestRef
second: .5
data:
first:
name: _Parallax
second: .0199999996
data:
first:
name: _ZWrite
second: 1
data:
first:
name: _Glossiness
second: .100000001
data:
first:
name: _BumpScale
second: 1
data:
first:
name: _OcclusionStrength
second: 1
data:
first:
name: _DetailNormalMapScale
second: 1
data:
first:
name: _UVSec
second: 0
data:
first:
name: _Mode
second: 0
data:
first:
name: _Metallic
second: .100000001
data:
first:
name: _Lightmapping
second: 1
data:
first:
name: _EmissionScaleUI
second: 2
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1.3348337}
- _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1}
- _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1}
m_BuildTextureStacks: []
data:
first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1.33483374}
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
data:
first:
name: _SpecColor
second: {r: .117647059, g: .117647059, b: .117647059, a: 1}
data:
first:
name: _EmissionColorUI
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _EmissionColorWithMapUI
second: {r: 1, g: 1, b: 1, a: 1}
data:
first:
name: _SpecularColor
second: {r: .156862751, g: .156862751, b: .156862751, a: 1}

View File

@ -125,18 +125,6 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -1,10 +1,9 @@
fileFormatVersion: 2
guid: 1613456aeef65ea469bc21be8dc8cff9
guid: b78c7a8d91830584c8c68aefcc987c94
folderAsset: yes
timeCreated: 1550017345
timeCreated: 1449185535
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 3d0998daec9a6d74cad55d1b73dfaa39
timeCreated: 1510942876
guid: 288aff370b146d64b888fc82748707ae
timeCreated: 1447179520
licenseType: Store
DefaultImporter:
userData:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 422351628c7df594b95a2a1bb9020b3f
timeCreated: 1447179520
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 23b7bf640e316894494ad2065bbb7061
timeCreated: 1447179520
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9c18e995583ecee42a6a042e905d0642
timeCreated: 1449023156
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6bff9d367b2929c42ba5f533e0802666
timeCreated: 1447179520
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,10 +1,9 @@
fileFormatVersion: 2
guid: 1b8258490b5d5f44092672b22506a67e
guid: 45c9d019c8f1e3546ba1ceda2e723287
folderAsset: yes
timeCreated: 1550017345
timeCreated: 1449185535
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: cbad104baf5a0455f96b95c8de23a8e2
timeCreated: 1563470936
guid: 11576fcabddf35c4b80a46d003c73e7b
timeCreated: 1519428899
licenseType: Store
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c687d9881da4db9408f64547797ad854
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e9967cfe8bd614bd1bbd5efd5ff8c665
timeCreated: 1563470936
guid: 5cba39460ba682a43bab86c3a50631e4
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2a03c79a1d71d074a8b7fcb9fffc91d5
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 94327f332046848f7be908a38a3090b2
timeCreated: 1563470936
guid: 023e8e7c05f62924ea88d0edc7da3b0b
timeCreated: 1519428899
licenseType: Store
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 923f73a7c84c96b4cb69aa538061b564
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a5419a76cca511c4191197d023ffb04b
timeCreated: 1518219584
guid: 2e1f51193d5c7d7408c4496d4d335d8c
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 84a4254cae90c7f419fdae343e04cb20
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ccb91c906a8cad2408c6ab6b17acf245
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c1513bd8d82f39547a3c904b8d249fa8
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7b25451619668e14eb4f9dbefbc3c6f0
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6a269b6a1bdcc8b4c871238597aef2f2
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: a1f378ea08dfe024e8b97a2fdcada940
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e244e6c95acf9bc45a582a7486f2c5c3
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 0116c9d953bfb8f4ab00a8377a166e8d
timeCreated: 1519428899
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 82538650ced325b49a6c2bce18cb38b7
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 114a34f6df9c1344593d6e07bb424739
timeCreated: 1519428899
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3df8ffe167d7cbe429e0789bc1f6103b
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 37607100c31b07d41ab1ce4be304a778
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d42d54c4030330f458b52aaed3af4d6b
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7380df30808dc6b4c9203fcda17515b7
timeCreated: 1519428900
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ad5efd4e7da7bb14791453deadfc95ec
timeCreated: 1447106677
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More