6.30
This commit is contained in:
parent
7390a3b03a
commit
a11b7f4d87
Binary file not shown.
|
@ -162,6 +162,7 @@ TextureImporter:
|
|||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
|
@ -170,9 +171,9 @@ TextureImporter:
|
|||
maxTextureSize: 4096
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
filterMode: 1
|
||||
aniso: 16
|
||||
mipBias: -100
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
|
@ -1150,6 +1151,51 @@ TextureImporter:
|
|||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable:
|
||||
graffiti_atlas_B_38: 21300038
|
||||
graffiti_atlas_B_79: 21300074
|
||||
graffiti_atlas_B_8: 21300090
|
||||
graffiti_atlas_B_4: 21300082
|
||||
graffiti_atlas_B_54: 21300056
|
||||
graffiti_atlas_B_83: 21300078
|
||||
graffiti_atlas_B_9: 21300006
|
||||
graffiti_atlas_B_56: 21300058
|
||||
graffiti_atlas_B_74: 21300068
|
||||
graffiti_atlas_B_78: 21300072
|
||||
graffiti_atlas_B_19: 21300018
|
||||
graffiti_atlas_B_49: 21300050
|
||||
graffiti_atlas_B_13: 21300010
|
||||
graffiti_atlas_B_3: 21300084
|
||||
graffiti_atlas_B_0: 21300000
|
||||
graffiti_atlas_B_48: 21300048
|
||||
graffiti_atlas_B_52: 21300054
|
||||
graffiti_atlas_B_71: 21300064
|
||||
graffiti_atlas_B_6: 21300004
|
||||
graffiti_atlas_B_5: 21300086
|
||||
graffiti_atlas_B_25: 21300022
|
||||
graffiti_atlas_B_28: 21300028
|
||||
graffiti_atlas_B_77: 21300070
|
||||
graffiti_atlas_B_51: 21300052
|
||||
graffiti_atlas_B_37: 21300036
|
||||
graffiti_atlas_B_42: 21300044
|
||||
graffiti_atlas_B_18: 21300016
|
||||
graffiti_atlas_B_32: 21300034
|
||||
graffiti_atlas_B_41: 21300042
|
||||
graffiti_atlas_B_2: 21300080
|
||||
graffiti_atlas_B_62: 21300060
|
||||
graffiti_atlas_B_14: 21300012
|
||||
graffiti_atlas_B_29: 21300030
|
||||
graffiti_atlas_B_26: 21300024
|
||||
graffiti_atlas_B_44: 21300046
|
||||
graffiti_atlas_B_15: 21300014
|
||||
graffiti_atlas_B_27: 21300026
|
||||
graffiti_atlas_B_7: 21300088
|
||||
graffiti_atlas_B_30: 21300032
|
||||
graffiti_atlas_B_73: 21300066
|
||||
graffiti_atlas_B_39: 21300040
|
||||
graffiti_atlas_B_1: 21300002
|
||||
graffiti_atlas_B_80: 21300076
|
||||
graffiti_atlas_B_10: 21300008
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -22,33 +22,33 @@ public class ModelManager : MonoBehaviour
|
|||
public List<ModelItem> spacePoints;
|
||||
[HideInInspector]
|
||||
public List<ModelItem> expPoints;
|
||||
//监控
|
||||
//监控
|
||||
[HideInInspector]
|
||||
public List<ModelItem> camList;
|
||||
//客户
|
||||
//客户
|
||||
[HideInInspector]
|
||||
public List<ModelItem> clients;
|
||||
//柜台
|
||||
//柜台
|
||||
[HideInInspector]
|
||||
public List<ModelItem> counters;
|
||||
//空间Icon
|
||||
//空间Icon
|
||||
private List<GameObject> spaceIconList;
|
||||
//空间Icon特效光圈
|
||||
//空间Icon特效光圈
|
||||
private List<GameObject> spaceEffectList;
|
||||
//分区
|
||||
//分区
|
||||
private GameObject _spaceArea;
|
||||
|
||||
//异常Icon
|
||||
//异常Icon
|
||||
private List<Exception3DIcon> expIconList;
|
||||
//热力图
|
||||
//热力图
|
||||
private Heatmap heatmap;
|
||||
//人员点位热力图
|
||||
//人员点位热力图
|
||||
private HeatPointManager m_heatpoint;
|
||||
//切换热力图特效
|
||||
private ParticleSystem changePage;//切换页面时的特效
|
||||
//切换热力图特效
|
||||
private ParticleSystem changePage;//切换页面时的特效
|
||||
|
||||
|
||||
//屋顶
|
||||
//屋顶
|
||||
private Transform wuDing;
|
||||
//3DCanvas
|
||||
public Transform iconPanel;
|
||||
|
@ -84,7 +84,7 @@ public class ModelManager : MonoBehaviour
|
|||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
//测试demo,动态随机热力图效果
|
||||
//测试demo,动态随机热力图效果
|
||||
time += Time.deltaTime;
|
||||
if (time > 1)
|
||||
{
|
||||
|
@ -96,10 +96,10 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
}
|
||||
|
||||
#region 初始时获取数据
|
||||
#region 初始时获取数据
|
||||
|
||||
/// <summary>
|
||||
/// 根据类型初始化所有数据
|
||||
/// 根据类型初始化所有数据
|
||||
/// </summary>
|
||||
void InitData()
|
||||
{
|
||||
|
@ -124,7 +124,7 @@ public class ModelManager : MonoBehaviour
|
|||
expPoints.Add(item);
|
||||
else if (item.modelType == ModelType.Worker)
|
||||
{
|
||||
//电子工牌
|
||||
//电子工牌
|
||||
//devices.Add(item);
|
||||
peoples.Add(item);
|
||||
}
|
||||
|
@ -136,13 +136,13 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化设备
|
||||
/// 初始化设备
|
||||
/// </summary>
|
||||
private void InitDevice()
|
||||
{
|
||||
foreach (var item in devices)
|
||||
{
|
||||
//工牌暂时同人员一样
|
||||
//工牌暂时同人员一样
|
||||
if (item.deviceType != DeviceType.GongPai)
|
||||
{
|
||||
if (item.GetComponent<DeviceClick>() == null)
|
||||
|
@ -150,14 +150,14 @@ public class ModelManager : MonoBehaviour
|
|||
item.gameObject.AddComponent<DeviceClick>();
|
||||
}
|
||||
item.GetComponent<DeviceClick>().deviceType = item.deviceType;
|
||||
//todo:传入设备索引
|
||||
//todo:传入设备索引
|
||||
//item.GetComponent<DeviceClick>().index = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化人员
|
||||
/// 初始化人员
|
||||
/// </summary>
|
||||
private void InitPeople() {
|
||||
foreach (var item in peoples)
|
||||
|
@ -171,7 +171,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化客户
|
||||
/// 初始化客户
|
||||
/// </summary>
|
||||
private void InitClient()
|
||||
{
|
||||
|
@ -186,7 +186,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化柜台
|
||||
/// 初始化柜台
|
||||
/// </summary>
|
||||
private void InitCounter()
|
||||
{
|
||||
|
@ -206,7 +206,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 加载异常Icon
|
||||
/// 加载异常Icon
|
||||
/// </summary>
|
||||
public void LoadExpIcon() {
|
||||
|
||||
|
@ -225,14 +225,14 @@ public class ModelManager : MonoBehaviour
|
|||
icon.GetComponent<Exception3DIcon>().InitExpIcon(expPoints[i].GetComponent<ModelItem>().expType,i);
|
||||
}
|
||||
|
||||
//测试,第一个摄像头警告
|
||||
//测试,第一个摄像头警告
|
||||
camList[2].GetComponent<DeviceClick>()._isCamWarm = true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据异常名称找到对应的异常点位
|
||||
/// 根据异常名称找到对应的异常点位
|
||||
/// </summary>
|
||||
/// <param name="name">异常名称</param>
|
||||
/// <param name="name">异常名称</param>
|
||||
/// <returns></returns>
|
||||
public GameObject FindExpPointByName(string name)
|
||||
{
|
||||
|
@ -244,7 +244,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 关闭异常
|
||||
/// 关闭异常
|
||||
/// </summary>
|
||||
|
||||
public void CloseExpIcon()
|
||||
|
@ -262,7 +262,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 加载空间点Icon
|
||||
/// 加载空间点Icon
|
||||
/// </summary>
|
||||
public void LoadSpacePointIcon() {
|
||||
spaceIconList = new List<GameObject>();
|
||||
|
@ -289,14 +289,14 @@ public class ModelManager : MonoBehaviour
|
|||
icon.GetComponent<LookAtCam>().Cam=Camera.main.transform;
|
||||
spaceIconList.Add(icon);
|
||||
spaceEffectList.Add(effect);
|
||||
//默认分区隐藏
|
||||
//默认分区隐藏
|
||||
//icon.gameObject.SetActive(false);
|
||||
//effect.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据设备类型,找到一个设备
|
||||
/// 根据设备类型,找到一个设备
|
||||
/// </summary>
|
||||
/// <param name="type"></param>
|
||||
public GameObject FindDeviceByType(DeviceType type)
|
||||
|
@ -310,7 +310,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据设备类型和索引,找到一个设备
|
||||
/// 根据设备类型和索引,找到一个设备
|
||||
/// </summary>
|
||||
/// <param name="type"></param>
|
||||
public GameObject FindDeviceByTypeAndID(DeviceType type,int index)
|
||||
|
@ -329,34 +329,34 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 单体化模型360展示
|
||||
/// 单体化模型360展示
|
||||
/// </summary>
|
||||
/// <param name="obj"></param>
|
||||
public void SingleModel(GameObject obj)
|
||||
{
|
||||
//将上一个单体化物体隐藏
|
||||
//将上一个单体化物体隐藏
|
||||
if (Main.intance.CurentSingleObj != null)
|
||||
{
|
||||
Main.intance.singleCam.GetComponent<Camera360>().ChangeObjLayer(Main.intance.CurentSingleObj, "Default");
|
||||
}
|
||||
//显示单体化展示页面
|
||||
//显示单体化展示页面
|
||||
Main.intance.CurentSinglePage.SetActive(true);
|
||||
//将当前物体设置为单体化360观察的物体
|
||||
//将当前物体设置为单体化360观察的物体
|
||||
Main.intance.CurentSingleObj = obj;
|
||||
Main.intance.singleCam.GetComponent<Camera360>().SetTarget(obj.transform);
|
||||
Debug.Log("设备单体化"+obj);
|
||||
//设置模型为正视角
|
||||
Debug.Log("设备单体化"+obj);
|
||||
//设置模型为正视角
|
||||
Main.intance.singleCam.GetComponent<Camera360>().ChangeObjLayer(Main.intance.CurentSingleObj, "single360");
|
||||
Main.intance.ShowSingleModel(true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否显示空间Icon
|
||||
/// 是否显示空间Icon
|
||||
/// </summary>
|
||||
/// <param name="isShow"></param>
|
||||
public void ShowSpaceIcon(bool isShow)
|
||||
{
|
||||
Debug.Log("空间Icon" + isShow);
|
||||
Debug.Log("空间Icon" + isShow);
|
||||
foreach (var item in spaceIconList)
|
||||
{
|
||||
item.SetActive(isShow);
|
||||
|
@ -365,7 +365,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否显示空间icon下的蓝色光圈特效
|
||||
/// 是否显示空间icon下的蓝色光圈特效
|
||||
/// </summary>
|
||||
/// <param name="show"></param>
|
||||
public void ShowSpaceEffect(bool show)
|
||||
|
@ -377,7 +377,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 显示分区块
|
||||
/// 显示分区块
|
||||
/// </summary>
|
||||
/// <param name="isshow"></param>
|
||||
public void ShowSpaceArea(bool isshow)
|
||||
|
@ -387,7 +387,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 播放切换页面的特效
|
||||
/// 播放切换页面的特效
|
||||
/// </summary>
|
||||
public void ShowChangePageEffect()
|
||||
{
|
||||
|
@ -396,9 +396,9 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 根据类型高亮设备
|
||||
/// 根据类型高亮设备
|
||||
/// </summary>
|
||||
/// <param name="index">索引从1开始</param>
|
||||
/// <param name="index">索引从1开始</param>
|
||||
public void HighLightDeviceOn(int index)
|
||||
{
|
||||
foreach (ModelItem device in devices) {
|
||||
|
@ -411,9 +411,9 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据设备类型关闭高亮
|
||||
/// 根据设备类型关闭高亮
|
||||
/// </summary>
|
||||
/// <param name="index">索引从1开始</param>
|
||||
/// <param name="index">索引从1开始</param>
|
||||
public void HighLightDeviceOff(int index)
|
||||
{
|
||||
foreach (ModelItem device in devices)
|
||||
|
@ -426,7 +426,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
}
|
||||
/// <summary>
|
||||
///关闭所有设备高亮
|
||||
///关闭所有设备高亮
|
||||
/// </summary>
|
||||
public void HighLightOff()
|
||||
{
|
||||
|
@ -439,7 +439,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 添加闪烁边缘光
|
||||
/// 添加闪烁边缘光
|
||||
/// </summary>
|
||||
private void AddHighLightComponent(GameObject obj)
|
||||
{
|
||||
|
@ -451,14 +451,14 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 摄像头进入房间内部,隐藏空间3DIcon,显示屋顶
|
||||
/// 摄像头进入房间内部,隐藏空间3DIcon,显示屋顶
|
||||
/// </summary>
|
||||
public void CameraNear(bool isNear)
|
||||
{
|
||||
//ShowSpaceIcon(!isNear);
|
||||
wuDing.gameObject.SetActive(isNear);
|
||||
|
||||
//当视角拉进时,缩小异常Icon
|
||||
//当视角拉进时,缩小异常Icon
|
||||
if (expIconList.Count>0)
|
||||
{
|
||||
float expIconScale = isNear ? 0.1f : 0.5f;
|
||||
|
@ -477,7 +477,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 综合管理允许单体化显示
|
||||
/// 综合管理允许单体化显示
|
||||
/// </summary>
|
||||
/// <param name="istrue"></param>
|
||||
public void CanSingle(bool istrue)
|
||||
|
@ -495,9 +495,9 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 高亮闪烁3秒后关闭
|
||||
/// 高亮闪烁3秒后关闭
|
||||
/// </summary>
|
||||
/// <param name="obj">高亮物体</param>
|
||||
/// <param name="obj">高亮物体</param>
|
||||
public void LightFlashCount(GameObject obj)
|
||||
{
|
||||
float a = 0;
|
||||
|
@ -510,10 +510,10 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 高亮闪烁
|
||||
/// 高亮闪烁
|
||||
/// </summary>
|
||||
/// <param name="obj">高亮物体</param>
|
||||
/// <param name="on">是否高亮</param>
|
||||
/// <param name="obj">高亮物体</param>
|
||||
/// <param name="on">是否高亮</param>
|
||||
public void LightFlash(GameObject obj,bool on)
|
||||
{
|
||||
if (!obj.GetComponent<Highlighter>())
|
||||
|
@ -526,18 +526,18 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
|
||||
#region 热力图(弃用)
|
||||
//热力图点位
|
||||
#region 热力图(弃用)
|
||||
//热力图点位
|
||||
public List<HeatPoint> heatPoints;
|
||||
//世界坐标
|
||||
//世界坐标
|
||||
public List<Vector3> m_Vector3s;
|
||||
//X:半径(0,2);Y:强度(0,1)
|
||||
//X:半径(0,2);Y:强度(0,1)
|
||||
public List<Vector2> m_Vector2s;
|
||||
//切换热力图时的特效
|
||||
//切换热力图时的特效
|
||||
private ParticleSystem _changeHeatmapEffect;
|
||||
|
||||
/// <summary>
|
||||
/// 随机热力图热点值(测试)
|
||||
/// 随机热力图热点值(测试)
|
||||
/// </summary>
|
||||
private void RandomHeatValue() {
|
||||
|
||||
|
@ -556,7 +556,7 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 显示和关闭热力图
|
||||
/// 显示和关闭热力图
|
||||
/// </summary>
|
||||
/// <param name="isShow"></param>
|
||||
public void ShowHeatmap(bool isShow)
|
||||
|
@ -565,7 +565,7 @@ public class ModelManager : MonoBehaviour
|
|||
{
|
||||
|
||||
|
||||
//播放切换热力图特效
|
||||
//播放切换热力图特效
|
||||
//if (!_changeHeatmapEffect)
|
||||
//{
|
||||
// _changeHeatmapEffect = GameObject.Instantiate(Resources.Load<GameObject>(ResourcePath._changeHeatmapEffect).GetComponent<ParticleSystem>());
|
||||
|
@ -586,7 +586,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
}
|
||||
/// <summary>
|
||||
/// 延时显示热力图,等特效播放两秒后显示
|
||||
/// 延时显示热力图,等特效播放两秒后显示
|
||||
/// </summary>
|
||||
private void InvokeShowHeatmap()
|
||||
{
|
||||
|
@ -597,7 +597,7 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
|
||||
/// <summary>
|
||||
/// 更新热力值
|
||||
/// 更新热力值
|
||||
/// </summary>
|
||||
public void UpdateHeatValue() {
|
||||
heatmap.SetHeatPoints(heatPoints.Select((v) => new HeatPoint()
|
||||
|
@ -609,11 +609,11 @@ public class ModelManager : MonoBehaviour
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 随机动态更新热力值
|
||||
/// 随机动态更新热力值
|
||||
/// </summary>
|
||||
public void RandomUpdateHeatValue()
|
||||
{
|
||||
//随机其中一个值
|
||||
//随机其中一个值
|
||||
int randomIndex=Random.Range(0, heatPoints.Count());
|
||||
heatPoints[randomIndex] = new HeatPoint()
|
||||
{
|
||||
|
@ -632,9 +632,9 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
#endregion
|
||||
|
||||
#region 热力图
|
||||
#region 热力图
|
||||
/// <summary>
|
||||
/// 显示热力图
|
||||
/// 显示热力图
|
||||
/// </summary>
|
||||
public void ShowHeatPoint()
|
||||
{
|
||||
|
@ -642,7 +642,7 @@ public class ModelManager : MonoBehaviour
|
|||
Main.intance.heatPointDes.SetActive(true);
|
||||
}
|
||||
/// <summary>
|
||||
/// 隐藏热力图
|
||||
/// 隐藏热力图
|
||||
/// </summary>
|
||||
public void HideHeatPoint()
|
||||
{
|
||||
|
@ -656,42 +656,42 @@ public class ModelManager : MonoBehaviour
|
|||
|
||||
public enum ModelType
|
||||
{
|
||||
Device,//设备
|
||||
Worker,//人员
|
||||
SpacePoint,//空间点
|
||||
ExpEvent,//异常事件
|
||||
Model,//模型
|
||||
Client,//客户
|
||||
counter//柜台
|
||||
Device,//设备
|
||||
Worker,//人员
|
||||
SpacePoint,//空间点
|
||||
ExpEvent,//异常事件
|
||||
Model,//模型
|
||||
Client,//客户
|
||||
counter//柜台
|
||||
}
|
||||
|
||||
public enum DeviceType
|
||||
{
|
||||
NONE,//不为设备
|
||||
YuShouLiZhongDuan,//预受理终端
|
||||
JiaoFeiJi,//缴费机
|
||||
YeWuJi,//业务机
|
||||
FaPiaoDaYinJi,//发票打印机
|
||||
GongPai,//工牌
|
||||
WangShangGuoWangYunZhongDuan,//网上国网云终端
|
||||
SheXiangTou//摄像头
|
||||
NONE,//不为设备
|
||||
YuShouLiZhongDuan,//预受理终端
|
||||
JiaoFeiJi,//缴费机
|
||||
YeWuJi,//业务机
|
||||
FaPiaoDaYinJi,//发票打印机
|
||||
GongPai,//工牌
|
||||
WangShangGuoWangYunZhongDuan,//网上国网云终端
|
||||
SheXiangTou//摄像头
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class HeatPoint
|
||||
{
|
||||
/// <summary>
|
||||
/// 世界坐标系位置
|
||||
/// 世界坐标系位置
|
||||
/// </summary>
|
||||
public Vector3 point;
|
||||
|
||||
/// <summary>
|
||||
/// 半径
|
||||
/// 半径
|
||||
/// </summary>
|
||||
public float radius;
|
||||
|
||||
/// <summary>
|
||||
/// 强度
|
||||
/// 强度
|
||||
/// </summary>
|
||||
public float intensity;
|
||||
}
|
|
@ -56,7 +56,7 @@
|
|||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.nuget.newtonsoft-json": {
|
||||
"version": "2.0.0",
|
||||
"version": "3.0.2",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
|
@ -72,11 +72,13 @@
|
|||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.services.core": {
|
||||
"version": "1.0.1",
|
||||
"version": "1.3.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.unitywebrequest": "1.0.0"
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.0.2",
|
||||
"com.unity.modules.androidjni": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
--- !u!30 &1
|
||||
GraphicsSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 13
|
||||
serializedVersion: 14
|
||||
m_Deferred:
|
||||
m_Mode: 1
|
||||
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
|
||||
|
@ -28,6 +28,7 @@ GraphicsSettings:
|
|||
m_LensFlare:
|
||||
m_Mode: 1
|
||||
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_VideoShadersIncludeMode: 2
|
||||
m_AlwaysIncludedShaders:
|
||||
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
|
||||
|
@ -36,8 +37,8 @@ GraphicsSettings:
|
|||
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_PreloadedShaders: []
|
||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
||||
type: 0}
|
||||
m_PreloadShadersBatchTimeLimit: -1
|
||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_CustomRenderPipeline: {fileID: 0}
|
||||
m_TransparencySortMode: 0
|
||||
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
|
||||
|
@ -57,7 +58,9 @@ GraphicsSettings:
|
|||
m_FogKeepExp: 1
|
||||
m_FogKeepExp2: 1
|
||||
m_AlbedoSwatchInfos: []
|
||||
m_LightsUseLinearIntensity: 0
|
||||
m_LightsUseColorTemperature: 0
|
||||
m_LightsUseLinearIntensity: 1
|
||||
m_LightsUseColorTemperature: 1
|
||||
m_DefaultRenderingLayerMask: 257
|
||||
m_LogWhenShaderIsCompiled: 0
|
||||
m_AllowEnlightenSupportForUpgradedProject: 0
|
||||
m_SRPDefaultSettings:
|
||||
UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: ac0316ca287ba459492b669ff1317a6f, type: 2}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
--- !u!129 &1
|
||||
PlayerSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 22
|
||||
serializedVersion: 23
|
||||
productGUID: 33f18e88e3237d545894d0cb02ef698d
|
||||
AndroidProfiler: 0
|
||||
AndroidFilterTouchesWhenObscured: 0
|
||||
|
@ -156,6 +156,7 @@ PlayerSettings:
|
|||
enable360StereoCapture: 0
|
||||
isWsaHolographicRemotingEnabled: 0
|
||||
enableFrameTimingStats: 0
|
||||
enableOpenGLProfilerGPURecorders: 1
|
||||
useHDRDisplay: 0
|
||||
D3DHDRBitDepth: 0
|
||||
m_ColorGamuts: 00000000
|
||||
|
@ -171,7 +172,7 @@ PlayerSettings:
|
|||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 0
|
||||
AndroidBundleVersionCode: 1
|
||||
AndroidMinSdkVersion: 19
|
||||
AndroidMinSdkVersion: 22
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 1
|
||||
aotOptions:
|
||||
|
@ -227,6 +228,7 @@ PlayerSettings:
|
|||
iOSLaunchScreeniPadCustomStoryboardPath:
|
||||
iOSDeviceRequirements: []
|
||||
iOSURLSchemes: []
|
||||
macOSURLSchemes: []
|
||||
iOSBackgroundModes: 0
|
||||
iOSMetalForceHardShadows: 0
|
||||
metalEditorSupport: 1
|
||||
|
@ -295,7 +297,6 @@ PlayerSettings:
|
|||
- m_BuildTarget: WebGL
|
||||
m_StaticBatching: 0
|
||||
m_DynamicBatching: 0
|
||||
m_BuildTargetSecurityBuild: []
|
||||
m_BuildTargetGraphicsJobs:
|
||||
- m_BuildTarget: MacStandaloneSupport
|
||||
m_GraphicsJobs: 0
|
||||
|
@ -331,7 +332,7 @@ PlayerSettings:
|
|||
m_BuildTargetGraphicsAPIs:
|
||||
- m_BuildTarget: AndroidPlayer
|
||||
m_APIs: 150000000b000000
|
||||
m_Automatic: 0
|
||||
m_Automatic: 1
|
||||
- m_BuildTarget: iOSSupport
|
||||
m_APIs: 10000000
|
||||
m_Automatic: 1
|
||||
|
@ -358,6 +359,7 @@ PlayerSettings:
|
|||
m_BuildTargetGroupLightmapEncodingQuality: []
|
||||
m_BuildTargetGroupLightmapSettings: []
|
||||
m_BuildTargetNormalMapEncoding: []
|
||||
m_BuildTargetDefaultTextureCompressionFormat: []
|
||||
playModeTestRunnerEnabled: 0
|
||||
runPlayModeTestAsEditModeTest: 0
|
||||
actionOnDotNetUnhandledException: 1
|
||||
|
@ -376,6 +378,7 @@ PlayerSettings:
|
|||
switchScreenResolutionBehavior: 2
|
||||
switchUseCPUProfiler: 0
|
||||
switchUseGOLDLinker: 0
|
||||
switchLTOSetting: 0
|
||||
switchApplicationID: 0x01004b9000490000
|
||||
switchNSODependencies:
|
||||
switchTitleNames_0:
|
||||
|
@ -506,7 +509,9 @@ PlayerSettings:
|
|||
switchPlayerConnectionEnabled: 1
|
||||
switchUseNewStyleFilepaths: 0
|
||||
switchUseMicroSleepForYield: 1
|
||||
switchEnableRamDiskSupport: 0
|
||||
switchMicroSleepForYieldTime: 25
|
||||
switchRamDiskSpaceSize: 12
|
||||
ps4NPAgeRating: 12
|
||||
ps4NPTitleSecret:
|
||||
ps4NPTrophyPackPath:
|
||||
|
@ -577,7 +582,6 @@ PlayerSettings:
|
|||
ps4videoRecordingFeaturesUsed: 0
|
||||
ps4contentSearchFeaturesUsed: 0
|
||||
ps4CompatibilityPS5: 0
|
||||
ps4AllowPS5Detection: 0
|
||||
ps4GPU800MHz: 1
|
||||
ps4attribEyeToEyeDistanceSettingVR: 0
|
||||
ps4IncludedModules: []
|
||||
|
@ -603,19 +607,20 @@ PlayerSettings:
|
|||
webGLThreadsSupport: 0
|
||||
webGLDecompressionFallback: 0
|
||||
scriptingDefineSymbols:
|
||||
1: UNITY_POST_PROCESSING_STACK_V2
|
||||
7: UNITY_POST_PROCESSING_STACK_V2
|
||||
13: UNITY_POST_PROCESSING_STACK_V2
|
||||
14: UNITY_POST_PROCESSING_STACK_V2
|
||||
19: UNITY_POST_PROCESSING_STACK_V2
|
||||
21: UNITY_POST_PROCESSING_STACK_V2
|
||||
25: UNITY_POST_PROCESSING_STACK_V2
|
||||
27: UNITY_POST_PROCESSING_STACK_V2
|
||||
28: UNITY_POST_PROCESSING_STACK_V2
|
||||
29: UNITY_POST_PROCESSING_STACK_V2
|
||||
30: UNITY_POST_PROCESSING_STACK_V2
|
||||
32: UNITY_POST_PROCESSING_STACK_V2
|
||||
33: UNITY_POST_PROCESSING_STACK_V2
|
||||
Android: UNITY_POST_PROCESSING_STACK_V2
|
||||
CloudRendering: UNITY_POST_PROCESSING_STACK_V2
|
||||
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
|
||||
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
|
||||
Lumin: UNITY_POST_PROCESSING_STACK_V2
|
||||
Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2
|
||||
PS4: UNITY_POST_PROCESSING_STACK_V2
|
||||
PS5: UNITY_POST_PROCESSING_STACK_V2
|
||||
Stadia: UNITY_POST_PROCESSING_STACK_V2
|
||||
Standalone: UNITY_POST_PROCESSING_STACK_V2
|
||||
WebGL: UNITY_POST_PROCESSING_STACK_V2
|
||||
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
|
||||
XboxOne: UNITY_POST_PROCESSING_STACK_V2
|
||||
tvOS: UNITY_POST_PROCESSING_STACK_V2
|
||||
additionalCompilerArguments: {}
|
||||
platformArchitecture: {}
|
||||
scriptingBackend: {}
|
||||
|
@ -625,7 +630,6 @@ PlayerSettings:
|
|||
suppressCommonWarnings: 1
|
||||
allowUnsafeCode: 0
|
||||
useDeterministicCompilation: 1
|
||||
useReferenceAssemblies: 1
|
||||
enableRoslynAnalyzers: 1
|
||||
additionalIl2CppArgs:
|
||||
scriptingRuntimeVersion: 1
|
||||
|
@ -662,6 +666,7 @@ PlayerSettings:
|
|||
metroFTAName:
|
||||
metroFTAFileTypes: []
|
||||
metroProtocolName:
|
||||
vcxProjDefaultLanguage:
|
||||
XboxOneProductId:
|
||||
XboxOneUpdateKey:
|
||||
XboxOneSandboxId:
|
||||
|
@ -712,4 +717,6 @@ PlayerSettings:
|
|||
organizationId:
|
||||
cloudEnabled: 0
|
||||
legacyClampBlendShapeWeights: 0
|
||||
playerDataPath:
|
||||
forceSRGBBlit: 1
|
||||
virtualTexturingSupportEnabled: 0
|
||||
|
|
Loading…
Reference in New Issue