PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【适配】相机、安全区适配、删除无用配表

iOS_release
zhangaotian 2024-07-18 13:03:55 +08:00
parent 9268d2197d
commit d9f92150f1
23 changed files with 106 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Forest/Assets/Art/Material/Outline.mat
View File

@ -126,7 +126,7 @@ Material:
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
- _lineWidth: 3
- _lineWidth: 5
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}

152
Forest/Assets/Config/Data/build_builditemconfig.json
View File

@ -1,152 +0,0 @@
[
{
"ID": 10001,
"Name": "Island",
"ThematicID": 1,
"SeriesID": 1,
"BuildGroupID": 1,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Icon/{0}.png"
},
{
"ID": 10002,
"Name": "Tree1",
"ThematicID": 1,
"SeriesID": 1,
"BuildGroupID": 2,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Icon/{0}.png"
},
{
"ID": 10003,
"Name": "Tree2",
"ThematicID": 1,
"SeriesID": 1,
"BuildGroupID": 3,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Icon/{0}.png"
},
{
"ID": 10004,
"Name": "Tree3",
"ThematicID": 1,
"SeriesID": 1,
"BuildGroupID": 4,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Icon/{0}.png"
},
{
"ID": 10005,
"Name": "Grass",
"ThematicID": 1,
"SeriesID": 1,
"BuildGroupID": 5,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_1/Icon/{0}.png"
},
{
"ID": 10006,
"Name": "Island",
"ThematicID": 2,
"SeriesID": 1,
"BuildGroupID": 1,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Icon/{0}.png"
},
{
"ID": 10007,
"Name": "Tree1",
"ThematicID": 2,
"SeriesID": 1,
"BuildGroupID": 2,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Icon/{0}.png"
},
{
"ID": 10008,
"Name": "Tree2",
"ThematicID": 2,
"SeriesID": 1,
"BuildGroupID": 3,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Icon/{0}.png"
},
{
"ID": 10009,
"Name": "Tree3",
"ThematicID": 2,
"SeriesID": 1,
"BuildGroupID": 4,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Icon/{0}.png"
},
{
"ID": 10010,
"Name": "Grass",
"ThematicID": 2,
"SeriesID": 1,
"BuildGroupID": 5,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_2/Icon/{0}.png"
},
{
"ID": 10011,
"Name": "Island",
"ThematicID": 3,
"SeriesID": 1,
"BuildGroupID": 1,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Icon/{0}.png"
},
{
"ID": 10012,
"Name": "Tree1",
"ThematicID": 3,
"SeriesID": 1,
"BuildGroupID": 2,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Icon/{0}.png"
},
{
"ID": 10013,
"Name": "Tree2",
"ThematicID": 3,
"SeriesID": 1,
"BuildGroupID": 3,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Icon/{0}.png"
},
{
"ID": 10014,
"Name": "Tree3",
"ThematicID": 3,
"SeriesID": 1,
"BuildGroupID": 4,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Icon/{0}.png"
},
{
"ID": 10015,
"Name": "Grass",
"ThematicID": 3,
"SeriesID": 1,
"BuildGroupID": 5,
"NormalPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Normal/{0}.png",
"PickPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Pick/{0}.png",
"IconPath": "Assets/Art/Texture/MainBuild/BuildItem/Thematic_3/Icon/{0}.png"
}
]

7
Forest/Assets/Config/Data/build_builditemconfig.json.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: e37c572b6462f4ae4966f375120c32e4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Forest/Assets/Config/Data/build_buildseriesconfig.json
View File

@ -1,14 +0,0 @@
[
{
"ID": 1,
"ThematicCount": 3,
"BuildGroupCount": 5,
"UnlockCondition": [
20,
45,
75,
110,
145
]
}
]

7
Forest/Assets/Config/Data/build_buildseriesconfig.json.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 8152806c520c446d9b7a792b01bdbdb3
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

13
Forest/Assets/Scenes/Build/Build_1.unity
View File

@ -3396,6 +3396,7 @@ GameObject:
- component: {fileID: 1336868188}
- component: {fileID: 1336868187}
- component: {fileID: 1336868189}
- component: {fileID: 1336868190}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -3513,6 +3514,18 @@ MonoBehaviour:
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!114 &1336868190
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1336868185}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fff49514adc6448d0a4cbea3ff37308b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1347511407
GameObject:
m_ObjectHideFlags: 0

60
Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs
View File

@ -7,6 +7,7 @@ using Gameplay.Manager;
using Framework.Manager;
using Sirenix.OdinInspector;
using System.Collections.Generic;
using PhxhSDK;
public class BuildBoot : MonoBehaviour
{
@ -220,6 +221,11 @@ public class BuildBoot : MonoBehaviour
}
}
//适配安全区
private GameObject _topLiuHai;
private GameObject _bottomLiuHai;
private Vector2 _offsets;
//物品栏
private BuildBar _buildBar;
private Button _btnBarClose;
@ -256,6 +262,8 @@ public class BuildBoot : MonoBehaviour
private void Start()
{
InitScreenAdaption();
UpdateScreenAdaption();
UpdateBuildDisplay();
}
@ -315,6 +323,51 @@ public class BuildBoot : MonoBehaviour
#region UI相关
/// <summary>
/// 初始化屏幕适配
/// </summary>
private void InitScreenAdaption()
{
var offset = DeviceHelper.GetHeightOffset();
_bottomLiuHai = transform.Find("BuildUIRoot/UIMainBuild/UI_LiuHaiBottom").gameObject;
_topLiuHai = transform.Find("BuildUIRoot/UIMainBuild/UI_LiuHaiTop").gameObject;
if (_topLiuHai)
{
var rectTrans = _topLiuHai.GetComponent<RectTransform>();
var originPos = rectTrans.anchoredPosition;
_offsets = new Vector2(originPos.y - offset.x, 0);
}
if (_bottomLiuHai)
{
var rectTrans = _bottomLiuHai.GetComponent<RectTransform>();
var originPos = rectTrans.anchoredPosition;
_offsets = new Vector2(_offsets.x, originPos.y + offset.y);
}
}
/// <summary>
/// 更新屏幕适配
/// </summary>
private void UpdateScreenAdaption()
{
if (_topLiuHai)
{
var rectTrans = _topLiuHai.GetComponent<RectTransform>();
var originPos = rectTrans.anchoredPosition;
rectTrans.anchoredPosition = new Vector2(originPos.x, _offsets.x);
}
if (_bottomLiuHai)
{
var rectTrans = _bottomLiuHai.GetComponent<RectTransform>();
var originPos = rectTrans.anchoredPosition;
rectTrans.anchoredPosition = new Vector2(originPos.x, _offsets.y);
}
}
/// <summary>
/// 初始化UI
/// </summary>
@ -402,7 +455,12 @@ public class BuildBoot : MonoBehaviour
_pickItem.SetActive(false);
_buildBar.Close();
if (_curNode == null || _curOption == null) return;
if (_curNode == null || _curOption == null)
{
_curBubble.SetActive(true);
return;
}
BuildManager.Instance.SaveNodeInfo(_curNode.Name, _curOption.Name);
}

14
Forest/Assets/Scripts/Framework/GameBuild/BuildCamera.cs Normal file
View File

@ -0,0 +1,14 @@
using UnityEngine;
public class BuildCamera : MonoBehaviour
{
private Camera _camera;
private void Awake()
{
_camera = transform.GetComponent<Camera>();
var size = _camera.orthographicSize;
_camera.orthographicSize = size * GlobalConstants.DesignResolutionWidth /
GlobalConstants.DesignResolutionHeight * Screen.height / Screen.width;
}
}

2
Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildSeriesConfig.cs.meta → Forest/Assets/Scripts/Framework/GameBuild/BuildCamera.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6146e420859df410bbf1c53c2a9b05a9
guid: fff49514adc6448d0a4cbea3ff37308b
MonoImporter:
externalObjects: {}
serializedVersion: 2

3
Forest/Assets/Scripts/Framework/GlobalConstants.cs
View File

@ -1,4 +1,7 @@
public static class GlobalConstants
{
public const float DesignResolutionWidth = 1080;
public const float DesignResolutionHeight = 1920;
public const string UserBuildSaveKey = "UserBuildInfo";
}

8
Forest/Assets/Scripts/Gameplay/DataTable/Build.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 556d810f9585b4f1fbb16ca0562721f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

72
Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildItemConfig.cs
View File

@ -1,72 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Bright.Serialization;
using System.Collections.Generic;
using SimpleJSON;
namespace cfg.Build
{
public sealed partial class BuildItemConfig
{
private readonly Dictionary<int, Build.DataBuildItem> _dataMap;
private readonly List<Build.DataBuildItem> _dataList;
public BuildItemConfig(JSONNode _json)
{
_dataMap = new Dictionary<int, Build.DataBuildItem>();
_dataList = new List<Build.DataBuildItem>();
foreach(JSONNode _row in _json.Children)
{
var _v = Build.DataBuildItem.DeserializeDataBuildItem(_row);
_dataList.Add(_v);
_dataMap.Add(_v.ID, _v);
}
PostInit();
}
public Dictionary<int, Build.DataBuildItem> DataMap => _dataMap;
public List<Build.DataBuildItem> DataList => _dataList;
public Build.DataBuildItem GetOrDefault(int key) => _dataMap.TryGetValue(key, out var v) ? v : null;
public Build.DataBuildItem Get(int key) {
if (_dataMap.TryGetValue(key, out var v)) {
return v;
} else {
UnityEngine.Debug.LogError($"table BuildItemConfig key not found: {key}");
return null;
}
}
public Build.DataBuildItem this[int key] => _dataMap[key];
public void Resolve(Dictionary<string, object> _tables)
{
foreach(var v in _dataList)
{
v.Resolve(_tables);
}
PostResolve();
}
public void TranslateText(System.Func<string, string, string> translator)
{
foreach(var v in _dataList)
{
v.TranslateText(translator);
}
}
partial void PostInit();
partial void PostResolve();
}
}

11
Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildItemConfig.cs.meta
View File

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

72
Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildSeriesConfig.cs
View File

@ -1,72 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Bright.Serialization;
using System.Collections.Generic;
using SimpleJSON;
namespace cfg.Build
{
public sealed partial class BuildSeriesConfig
{
private readonly Dictionary<int, Build.DataBuildSeries> _dataMap;
private readonly List<Build.DataBuildSeries> _dataList;
public BuildSeriesConfig(JSONNode _json)
{
_dataMap = new Dictionary<int, Build.DataBuildSeries>();
_dataList = new List<Build.DataBuildSeries>();
foreach(JSONNode _row in _json.Children)
{
var _v = Build.DataBuildSeries.DeserializeDataBuildSeries(_row);
_dataList.Add(_v);
_dataMap.Add(_v.ID, _v);
}
PostInit();
}
public Dictionary<int, Build.DataBuildSeries> DataMap => _dataMap;
public List<Build.DataBuildSeries> DataList => _dataList;
public Build.DataBuildSeries GetOrDefault(int key) => _dataMap.TryGetValue(key, out var v) ? v : null;
public Build.DataBuildSeries Get(int key) {
if (_dataMap.TryGetValue(key, out var v)) {
return v;
} else {
UnityEngine.Debug.LogError($"table BuildSeriesConfig key not found: {key}");
return null;
}
}
public Build.DataBuildSeries this[int key] => _dataMap[key];
public void Resolve(Dictionary<string, object> _tables)
{
foreach(var v in _dataList)
{
v.Resolve(_tables);
}
PostResolve();
}
public void TranslateText(System.Func<string, string, string> translator)
{
foreach(var v in _dataList)
{
v.TranslateText(translator);
}
}
partial void PostInit();
partial void PostResolve();
}
}

112
Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildItem.cs
View File

@ -1,112 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Bright.Serialization;
using System.Collections.Generic;
using SimpleJSON;
namespace cfg.Build
{
public sealed partial class DataBuildItem : Bright.Config.BeanBase
{
public DataBuildItem(JSONNode _json)
{
{ if(!_json["ID"].IsNumber) { throw new SerializationException(); } ID = _json["ID"]; }
{ if(!_json["Name"].IsString) { throw new SerializationException(); } Name = _json["Name"]; }
{ if(!_json["ThematicID"].IsNumber) { throw new SerializationException(); } ThematicID = _json["ThematicID"]; }
{ if(!_json["SeriesID"].IsNumber) { throw new SerializationException(); } SeriesID = _json["SeriesID"]; }
{ if(!_json["BuildGroupID"].IsNumber) { throw new SerializationException(); } BuildGroupID = _json["BuildGroupID"]; }
{ if(!_json["NormalPath"].IsString) { throw new SerializationException(); } NormalPath = _json["NormalPath"]; }
{ if(!_json["PickPath"].IsString) { throw new SerializationException(); } PickPath = _json["PickPath"]; }
{ if(!_json["IconPath"].IsString) { throw new SerializationException(); } IconPath = _json["IconPath"]; }
PostInit();
}
public DataBuildItem(int ID, string Name, int ThematicID, int SeriesID, int BuildGroupID, string NormalPath, string PickPath, string IconPath )
{
this.ID = ID;
this.Name = Name;
this.ThematicID = ThematicID;
this.SeriesID = SeriesID;
this.BuildGroupID = BuildGroupID;
this.NormalPath = NormalPath;
this.PickPath = PickPath;
this.IconPath = IconPath;
PostInit();
}
public static DataBuildItem DeserializeDataBuildItem(JSONNode _json)
{
return new Build.DataBuildItem(_json);
}
/// <summary>
/// 建造物品ID
/// </summary>
public int ID { get; private set; }
/// <summary>
/// 物品名称
/// </summary>
public string Name { get; private set; }
/// <summary>
/// 主题ID
/// </summary>
public int ThematicID { get; private set; }
/// <summary>
/// 系列ID
/// </summary>
public int SeriesID { get; private set; }
/// <summary>
/// 物品组ID
/// </summary>
public int BuildGroupID { get; private set; }
/// <summary>
/// 物品路径
/// </summary>
public string NormalPath { get; private set; }
/// <summary>
/// 物品选中时表现路径
/// </summary>
public string PickPath { get; private set; }
/// <summary>
/// 图标路径
/// </summary>
public string IconPath { get; private set; }
public const int __ID__ = 1004346967;
public override int GetTypeId() => __ID__;
public void Resolve(Dictionary<string, object> _tables)
{
PostResolve();
}
public void TranslateText(System.Func<string, string, string> translator)
{
}
public override string ToString()
{
return "{ "
+ "ID:" + ID + ","
+ "Name:" + Name + ","
+ "ThematicID:" + ThematicID + ","
+ "SeriesID:" + SeriesID + ","
+ "BuildGroupID:" + BuildGroupID + ","
+ "NormalPath:" + NormalPath + ","
+ "PickPath:" + PickPath + ","
+ "IconPath:" + IconPath + ","
+ "}";
}
partial void PostInit();
partial void PostResolve();
}
}

11
Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildItem.cs.meta
View File

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

84
Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildSeries.cs
View File

@ -1,84 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Bright.Serialization;
using System.Collections.Generic;
using SimpleJSON;
namespace cfg.Build
{
public sealed partial class DataBuildSeries : Bright.Config.BeanBase
{
public DataBuildSeries(JSONNode _json)
{
{ if(!_json["ID"].IsNumber) { throw new SerializationException(); } ID = _json["ID"]; }
{ if(!_json["ThematicCount"].IsNumber) { throw new SerializationException(); } ThematicCount = _json["ThematicCount"]; }
{ if(!_json["BuildGroupCount"].IsNumber) { throw new SerializationException(); } BuildGroupCount = _json["BuildGroupCount"]; }
{ var __json0 = _json["UnlockCondition"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; UnlockCondition = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } UnlockCondition[__index0++] = __v0; } }
PostInit();
}
public DataBuildSeries(int ID, int ThematicCount, int BuildGroupCount, int[] UnlockCondition )
{
this.ID = ID;
this.ThematicCount = ThematicCount;
this.BuildGroupCount = BuildGroupCount;
this.UnlockCondition = UnlockCondition;
PostInit();
}
public static DataBuildSeries DeserializeDataBuildSeries(JSONNode _json)
{
return new Build.DataBuildSeries(_json);
}
/// <summary>
/// 系列ID
/// </summary>
public int ID { get; private set; }
/// <summary>
/// 主题数量
/// </summary>
public int ThematicCount { get; private set; }
/// <summary>
/// 物品组数量
/// </summary>
public int BuildGroupCount { get; private set; }
/// <summary>
/// 解锁关卡
/// </summary>
public int[] UnlockCondition { get; private set; }
public const int __ID__ = -917380933;
public override int GetTypeId() => __ID__;
public void Resolve(Dictionary<string, object> _tables)
{
PostResolve();
}
public void TranslateText(System.Func<string, string, string> translator)
{
}
public override string ToString()
{
return "{ "
+ "ID:" + ID + ","
+ "ThematicCount:" + ThematicCount + ","
+ "BuildGroupCount:" + BuildGroupCount + ","
+ "UnlockCondition:" + Bright.Common.StringUtil.CollectionToString(UnlockCondition) + ","
+ "}";
}
partial void PostInit();
partial void PostResolve();
}
}

11
Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildSeries.cs.meta
View File

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

14
Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs
View File

@ -19,8 +19,6 @@ public sealed partial class Tables
public StringCfg.StringConfig StringConfig {get; }
public AD.ADConfig ADConfig {get; }
public Prop.PropConfig PropConfig {get; }
public Build.BuildItemConfig BuildItemConfig {get; }
public Build.BuildSeriesConfig BuildSeriesConfig {get; }
public Tables(System.Func<string, JSONNode> loader)
{
@ -31,17 +29,11 @@ public sealed partial class Tables
tables.Add("AD.ADConfig", ADConfig);
PropConfig = new Prop.PropConfig(loader("prop_propconfig"));
tables.Add("Prop.PropConfig", PropConfig);
BuildItemConfig = new Build.BuildItemConfig(loader("build_builditemconfig"));
tables.Add("Build.BuildItemConfig", BuildItemConfig);
BuildSeriesConfig = new Build.BuildSeriesConfig(loader("build_buildseriesconfig"));
tables.Add("Build.BuildSeriesConfig", BuildSeriesConfig);
PostInit();
StringConfig.Resolve(tables);
ADConfig.Resolve(tables);
PropConfig.Resolve(tables);
BuildItemConfig.Resolve(tables);
BuildSeriesConfig.Resolve(tables);
PostResolve();
}
@ -49,16 +41,12 @@ public sealed partial class Tables
loader("stringcfg_stringconfig");
loader("ad_adconfig");
loader("prop_propconfig");
loader("build_builditemconfig");
loader("build_buildseriesconfig");
}
public static void AfterLoaded(Action<string> loader) {
loader("stringcfg_stringconfig");
loader("ad_adconfig");
loader("prop_propconfig");
loader("build_builditemconfig");
loader("build_buildseriesconfig");
}
public void TranslateText(System.Func<string, string, string> translator)
@ -66,8 +54,6 @@ public sealed partial class Tables
StringConfig.TranslateText(translator);
ADConfig.TranslateText(translator);
PropConfig.TranslateText(translator);
BuildItemConfig.TranslateText(translator);
BuildSeriesConfig.TranslateText(translator);
}
partial void PostInit();

38
Tool/Luban/.cache.meta
View File

@ -1,28 +1,20 @@
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_builditemconfig.json,6075FDA09E32518F3E635C72B56BE7BB,5390,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildseriesconfig.json,42EAC994C82DC8ECBF7E095FB6A39,156,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,9A1616ADF3898E6E92CA8CFC8B5A6DB3,7497,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildItemConfig.cs,4714A01BBC36D6A99C9B955B333A51,2059,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildSeriesConfig.cs,EAC945DD99AC18E8BB8BEC47F39463A,2087,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildItem.cs,84FCA11123B22C3DE7285A6E56DF6499,3697,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuildSeries.cs,6A95F8649FE3B730BEC3CE2C3877849,2860,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1721113276759
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,39B71A95C87B6A23CC35B8E8F3C595,2753,1721113276758
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1721278771328
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,9A1616ADF3898E6E92CA8CFC8B5A6DB3,7497,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1721278771327
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,D0163D3F43E7627ABD0AEBC1439C079,11188,1720508366753
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,9829DD8D7AC51F277CAF46197425EA35,11066,1721278757353
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,C664BD5E7C8E22397FB8CDF12EAED4E,9832,1719548816307
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/BuildItemConfig.xlsx,59F98AB50F4738F745894959F31AAC,10350,1720508366752
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/BuildSeriesConfig.xlsx,CF1411D7DEAFE70A2D82CDB4D746577,9511,1720508366753
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,D2AE14881D4FD3C270BE9F271379FC,13019,1721113260612

BIN
Tool/Luban/Datas/BuildItemConfig.xlsx
View File

Binary file not shown.

BIN
Tool/Luban/Datas/BuildSeriesConfig.xlsx
View File

Binary file not shown.

BIN
Tool/Luban/Datas/__tables__.xlsx
View File

Binary file not shown.