tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地铁

Browse Source
This commit is contained in:
dingyuntian
2025-06-08 23:46:23 +08:00
parent e194fb9fbc
commit 9ae715c71a
73 changed files with 7522 additions and 11134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset
+10
View File
@@ -52,6 +52,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9e274398ccb6b6e42bddf6a661a15cc7
m_Address: "Sprite/\u5730\u94C1\u533B\u751F"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 95e3e40f4665fe247b8fe50a88243030
m_Address: "Sprite/\u5730\u94C1\u706B\u5C71"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
Assets/AddressableAssetsData/AssetGroups/Art Resources.asset
+10
View File
@@ -72,6 +72,16 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3c0d119c1a62bb840846a0e7c58197f7
m_Address: "Subway/\u767D\u5929\u7A97\u5916"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 660c87b6732769b49a9b7119b54ede83
m_Address: "Subway/\u591C\u665A\u7A97\u5916"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
m_SchemaSet:
Assets/Editor/Inspector/ActorManagerEditor.cs
+29
View File
@@ -0,0 +1,29 @@
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
[CustomEditor(typeof(ActorManager))]
public class ActorManagerEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
var example = (ActorManager)target;
EditorGUILayout.BeginHorizontal();
// 保存按钮
if (GUILayout.Button("加载角色(仅调试)"))
{
example.InitAllDefault();
}
// 加载按钮
if (GUILayout.Button("销毁角色(仅调试)"))
{
example.DestroyEditorTemp();
}
EditorGUILayout.EndHorizontal();
}
}
}
Assets/Editor/Inspector/ActorManagerEditor.cs.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a26f39f29d894a04abdd507b2bc3cd17
timeCreated: 1749396776
Assets/Editor/Inspector/BubbleEditor.cs
+29
View File
@@ -0,0 +1,29 @@
using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
{
[CustomEditor(typeof(Bubble))]
public class BubbleEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
var example = (Bubble)target;
EditorGUILayout.BeginHorizontal();
// 保存按钮
if (GUILayout.Button("保存"))
{
example.SaveStyle();
}
// 加载按钮
if (GUILayout.Button("加载"))
{
example.LoadStyle();
}
EditorGUILayout.EndHorizontal();
}
}
}
Assets/Editor/Inspector/BubbleEditor.cs.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e31b37a9f61345a087925a463504a2a1
timeCreated: 1749293279
Assets/Prefabs/Bubbles/Bubble.prefab
+7 -5
View File
@@ -226,7 +226,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 300
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
@@ -408,7 +408,7 @@ RectTransform:
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -356}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!222 &988812176523574123
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -437,8 +437,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -33813716, guid: 0515a5bc97036aa47849e568298fb24b, type: 3}
m_Type: 0
m_Sprite: {fileID: -416965605, guid: 51bdc3878d1c5d840a88b624b61732fc, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -461,7 +461,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 30
m_Right: 45
m_Right: 30
m_Top: 30
m_Bottom: 50
m_ChildAlignment: 3
@@ -503,3 +503,5 @@ MonoBehaviour:
idx: 0
maxWidth: 0
minWidth: 0
testBubbleStyle: {fileID: 11400000, guid: f745f6e3243640b49a9be01c6adc8aa4, type: 2}
testPivotType: 6
Assets/Prefabs/Bubbles/Option 1.prefab
+1 -1
View File
@@ -71,7 +71,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 1397449721, guid: 0515a5bc97036aa47849e568298fb24b, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Assets/Prefabs/Bubbles/Option 2.prefab
+1 -1
View File
@@ -226,7 +226,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 1951320343, guid: 0515a5bc97036aa47849e568298fb24b, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Assets/Prefabs/Bubbles/Option 3.prefab
+1 -1
View File
@@ -226,7 +226,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 1951320343, guid: 0515a5bc97036aa47849e568298fb24b, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Assets/Prefabs/Chip.prefab
-118
View File
@@ -1,118 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5156684866132484758
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1534215507139354666}
- component: {fileID: 4716682777183481428}
- component: {fileID: 3185345194222605711}
- component: {fileID: 6191094306318057957}
- component: {fileID: 3780671847453009019}
- component: {fileID: 7781398267755699300}
m_Layer: 5
m_Name: Chip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1534215507139354666
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4716682777183481428
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_CullTransparentMesh: 1
--- !u!114 &3185345194222605711
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
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: 7551521024174299546, guid: fd04c28739017964789d58d573f9fabb, 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 &6191094306318057957
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates: []
--- !u!225 &3780671847453009019
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &7781398267755699300
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b36bace72ce9abd428b57245502e33b3, type: 3}
m_Name:
m_EditorClassIdentifier:
offset: {x: 0, y: 0, z: 0}
Assets/Prefabs/FixSystemPrefabs/Screen System.prefab
+801 -886
View File
File diff suppressed because it is too large Load Diff
Assets/Prefabs/UFView.prefab
-583
View File
@@ -1,583 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &74183103218020837
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6454053694003376608}
m_Layer: 0
m_Name: CrewsContainer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6454053694003376608
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 74183103218020837}
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: 3411795748385949522}
- {fileID: 6374078654609302022}
- {fileID: 1470892322276515990}
m_Father: {fileID: 8742626255465472854}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.06000045, y: -0.0049998313}
m_SizeDelta: {x: 1.3671011, y: 0.91139996}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &808561626657459958
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7026434589317768376}
- component: {fileID: 5336385182390847493}
- component: {fileID: 4264049056200554943}
m_Layer: 0
m_Name: UFView
m_TagString: DialogueObject
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7026434589317768376
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808561626657459958}
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: 2478813231330110074}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.027899742, y: -0.018600225}
m_SizeDelta: {x: 2.36, y: 2.13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5336385182390847493
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808561626657459958}
m_CullTransparentMesh: 1
--- !u!114 &4264049056200554943
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 808561626657459958}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 2971124301436807032, guid: fd04c28739017964789d58d573f9fabb, 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 &5156684866132484758
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1534215507139354666}
- component: {fileID: 4716682777183481428}
- component: {fileID: 3185345194222605711}
- component: {fileID: 6191094306318057957}
- component: {fileID: 3780671847453009019}
- component: {fileID: 7781398267755699300}
m_Layer: 5
m_Name: UFView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1534215507139354666
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
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: 2478813231330110074}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 3, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4716682777183481428
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_CullTransparentMesh: 1
--- !u!114 &3185345194222605711
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
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: 0}
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: 7551521024174299546, guid: fd04c28739017964789d58d573f9fabb, 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 &6191094306318057957
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates: []
--- !u!225 &3780671847453009019
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &7781398267755699300
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5156684866132484758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b36bace72ce9abd428b57245502e33b3, type: 3}
m_Name:
m_EditorClassIdentifier:
offset: {x: 0, y: 0, z: 0}
--- !u!1 &5751569007722709521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6374078654609302022}
- component: {fileID: 1773425656785651189}
- component: {fileID: 6265875836566808362}
m_Layer: 0
m_Name: "UF\u76D6\u5B50\u5DE6\u4E0A\u89D2\u87BA\u4E1D"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6374078654609302022
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5751569007722709521}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.92999995, y: 0.92999995, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6454053694003376608}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.083, y: 0.098}
m_SizeDelta: {x: 0.18, y: 0.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1773425656785651189
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5751569007722709521}
m_CullTransparentMesh: 1
--- !u!114 &6265875836566808362
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5751569007722709521}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 6258712427660675809, guid: fd04c28739017964789d58d573f9fabb, 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 &7831068159816005168
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8742626255465472854}
- component: {fileID: 5327922177007382021}
- component: {fileID: 1629280199065801571}
- component: {fileID: 2138644086780562346}
m_Layer: 0
m_Name: "UF\u76D6\u5B50"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8742626255465472854
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7831068159816005168}
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: 6454053694003376608}
m_Father: {fileID: 2478813231330110074}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.013949871, y: 0}
m_SizeDelta: {x: 2.29, y: 2.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5327922177007382021
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7831068159816005168}
m_CullTransparentMesh: 1
--- !u!114 &1629280199065801571
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7831068159816005168}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 620034903413008229, guid: fd04c28739017964789d58d573f9fabb, 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!225 &2138644086780562346
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7831068159816005168}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &7956278543578196859
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1470892322276515990}
- component: {fileID: 1835874550154049482}
- component: {fileID: 8604695911182875580}
m_Layer: 0
m_Name: "UF\u76D6\u5B50\u53F3\u4E0B\u89D2\u87BA\u4E1D"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1470892322276515990
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7956278543578196859}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.92999995, y: 0.92999995, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6454053694003376608}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.742, y: -0.952}
m_SizeDelta: {x: 0.18, y: 0.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1835874550154049482
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7956278543578196859}
m_CullTransparentMesh: 1
--- !u!114 &8604695911182875580
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7956278543578196859}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 6258712427660675809, guid: fd04c28739017964789d58d573f9fabb, 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 &8996598385892109105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2478813231330110074}
m_Layer: 0
m_Name: UF
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2478813231330110074
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8996598385892109105}
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: 7026434589317768376}
- {fileID: 8742626255465472854}
m_Father: {fileID: 1534215507139354666}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2.1018002, y: 1.9064999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9011019359676005952
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3411795748385949522}
- component: {fileID: 987803320051751914}
- component: {fileID: 2957994506664639280}
m_Layer: 0
m_Name: "UF\u76D6\u5B50\u5DE6\u4E0A\u89D2\u87BA\u4E1D_1"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3411795748385949522
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9011019359676005952}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.92999995, y: 0.92999995, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6454053694003376608}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.258, y: 0.926}
m_SizeDelta: {x: 0.18, y: 0.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &987803320051751914
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9011019359676005952}
m_CullTransparentMesh: 1
--- !u!114 &2957994506664639280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9011019359676005952}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 6258712427660675809, guid: fd04c28739017964789d58d573f9fabb, 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
Assets/RawResources/Art/地铁相关/夜间窗外.meta → Assets/RawResources/Actor/地铁人物.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 35f068d4fb4e1c740b507ffd1f713a73
guid: 0c16b245ccd6c3d44b482e15a01d767b
folderAsset: yes
DefaultImporter:
externalObjects: {}
Assets/RawResources/Actor/地铁人物/地铁医生.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Actor/地铁人物/地铁医生.png.meta
+175
View File
@@ -0,0 +1,175 @@
fileFormatVersion: 2
guid: 9e274398ccb6b6e42bddf6a661a15cc7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0}
spritePixelsToUnits: 21.5
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Idle
rect:
serializedVersion: 2
x: 0
y: 0
width: 111
height: 119
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f1f33528f62b1c8448feed515e29d1aa
internalID: -86781235
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Idle: -86781235
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/RawResources/Actor/地铁人物/地铁火山.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Actor/地铁人物/地铁火山.png.meta
+175
View File
@@ -0,0 +1,175 @@
fileFormatVersion: 2
guid: 95e3e40f4665fe247b8fe50a88243030
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0}
spritePixelsToUnits: 21.5
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Idle
rect:
serializedVersion: 2
x: 0
y: 0
width: 131
height: 139
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 06e3bcda70adb1945b6b6ee7c6107c73
internalID: -43643558
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Idle: -43643558
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/RawResources/Art/主场景.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/主场景.psd.meta
-1480
View File
File diff suppressed because it is too large Load Diff
Assets/RawResources/Art/地铁相关/夜晚窗外.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/地铁相关/夜晚窗外.psd.meta
+1342
View File
File diff suppressed because it is too large Load Diff
Assets/RawResources/Art/地铁相关/夜间窗外/夜间窗外.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/地铁相关/夜间车厢.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/地铁相关/白天窗外.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/地铁相关/夜间窗外/夜间窗外.psd.meta → Assets/RawResources/Art/地铁相关/白天窗外.psd.meta
+679 -452
View File
File diff suppressed because it is too large Load Diff
Assets/RawResources/Art/地铁相关/车厢.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/地铁相关/夜间车厢.psd.meta → Assets/RawResources/Art/地铁相关/车厢.psd.meta
+58 -120
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: de4f49ebcdf6a544481610209df170e4
guid: 96ad799eaea3df349a7d095f94631bee
importerOverride:
nativeImporterType: 2089858483
scriptedImporterType:
@@ -98,7 +98,7 @@ ScriptedImporter:
uvTransform: {x: 0, y: 0}
spritePosition: {x: 0, y: 0}
mosaicSpriteImportData:
- name: "\u524D\u6392\u5EA7\u4F4D"
- name: "\u524D\u6392\u5EA7\u6905"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -106,10 +106,10 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 4
y: 452
y: 228
width: 714
height: 24
spriteID: c7f2205415a762e41a37bba8b9315e82
spriteID: a3912a2bfb6c7e144be3dfd6d91de611
spriteBone: []
spriteOutline: []
vertices: []
@@ -117,7 +117,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 452}
uvTransform: {x: 4, y: 228}
spritePosition: {x: 0, y: 0}
- name: "\u6276\u624BA"
originalName:
@@ -130,7 +130,7 @@ ScriptedImporter:
y: 4
width: 17
height: 19
spriteID: 34d89eb0224d246438582901eb0d985b
spriteID: e615515ddf447b4469ee9e7b642499a2
spriteBone: []
spriteOutline: []
vertices: []
@@ -151,7 +151,7 @@ ScriptedImporter:
y: 4
width: 31
height: 34
spriteID: 5c43a18c0c7d01b40bd2edae2430339d
spriteID: 406186bfb74d02e4eaec8dbce5b2de37
spriteBone: []
spriteOutline: []
vertices: []
@@ -161,7 +161,7 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 726, y: 4}
spritePosition: {x: 384, y: 181}
- name: "\u6276\u624B"
- name: "\u680F\u6746"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -169,10 +169,10 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 4
y: 484
y: 260
width: 435
height: 14
spriteID: ab578ac0481bb594a964eb77553ed55c
spriteID: 765730de7c407aa439e42df86a903a85
spriteBone: []
spriteOutline: []
vertices: []
@@ -180,7 +180,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 484}
uvTransform: {x: 4, y: 260}
spritePosition: {x: 184, y: 170}
- name: "\u8F66\u53A2"
originalName:
@@ -193,7 +193,7 @@ ScriptedImporter:
y: 4
width: 714
height: 216
spriteID: 5a87c0768da00074b93707308961c37e
spriteID: 20ce7d1b34e2ee54fade37d8719cd3be
spriteBone: []
spriteOutline: []
vertices: []
@@ -203,29 +203,8 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 4, y: 4}
spritePosition: {x: 0, y: 0}
- name: night
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 4
y: 228
width: 714
height: 216
spriteID: ca1683603b7875440b901466e94bdfe1
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 228}
spritePosition: {x: 0, y: 0}
rigSpriteImportData:
- name: "\u524D\u6392\u5EA7\u4F4D"
- name: "\u524D\u6392\u5EA7\u6905"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -233,10 +212,10 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 4
y: 452
y: 228
width: 714
height: 24
spriteID: a3d25c5d12bca2d429c0113278e172ba
spriteID: 76f136495d7b4a14cbee09f09b568e70
spriteBone: []
spriteOutline: []
vertices: []
@@ -244,7 +223,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 452}
uvTransform: {x: 4, y: 228}
spritePosition: {x: 0, y: 0}
- name: "\u6276\u624BA"
originalName:
@@ -257,7 +236,7 @@ ScriptedImporter:
y: 4
width: 17
height: 19
spriteID: 78d7e6eef7492a74599092b6181b4fa6
spriteID: 471a574fff4255e47bb00ead417b237b
spriteBone: []
spriteOutline: []
vertices: []
@@ -278,7 +257,7 @@ ScriptedImporter:
y: 4
width: 31
height: 34
spriteID: 159e185fa2fa9e34e8c1ba9160f23818
spriteID: 1c11d5347b4c0f54197d3a16db698e55
spriteBone: []
spriteOutline: []
vertices: []
@@ -288,7 +267,7 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 726, y: 4}
spritePosition: {x: 384, y: 181}
- name: "\u6276\u624B"
- name: "\u680F\u6746"
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
@@ -296,10 +275,10 @@ ScriptedImporter:
rect:
serializedVersion: 2
x: 4
y: 484
y: 260
width: 435
height: 14
spriteID: 69857b739f2393546aedc4d8475c1bf5
spriteID: c8b3df150890a8146a168da747203ce2
spriteBone: []
spriteOutline: []
vertices: []
@@ -307,7 +286,7 @@ ScriptedImporter:
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 484}
uvTransform: {x: 4, y: 260}
spritePosition: {x: 184, y: 170}
- name: "\u8F66\u53A2"
originalName:
@@ -320,7 +299,7 @@ ScriptedImporter:
y: 4
width: 714
height: 216
spriteID: b7464981e912cdb40a93ed45e48afc32
spriteID: c4677bcfba499794ea01da42943758d4
spriteBone: []
spriteOutline: []
vertices: []
@@ -330,27 +309,6 @@ ScriptedImporter:
tessellationDetail: 0
uvTransform: {x: 4, y: 4}
spritePosition: {x: 0, y: 0}
- name: night
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 4
y: 228
width: 714
height: 216
spriteID: 2dcc2a611adc181428d69553568c0f12
spriteBone: []
spriteOutline: []
vertices: []
spritePhysicsOutline: []
indices:
edges: []
tessellationDetail: 0
uvTransform: {x: 4, y: 228}
spritePosition: {x: 0, y: 0}
characterData:
bones: []
parts: []
@@ -433,7 +391,7 @@ ScriptedImporter:
documentAlignment: 0
importHiddenLayers: 0
layerMappingOption: 2
generatePhysicsShape: 0
generatePhysicsShape: 1
paperDollMode: 0
keepDupilcateSpriteName: 1
skeletonAssetReferenceID:
@@ -442,15 +400,15 @@ ScriptedImporter:
spriteCategoryList:
categories: []
spritePackingTag:
resliceFromLayer: 1
resliceFromLayer: 0
mosaicPSDLayers:
- name: "\u524D\u6392\u5EA7\u4F4D"
spriteName: "\u524D\u6392\u5EA7\u4F4D"
- name: "\u524D\u6392\u5EA7\u6905"
spriteName: "\u524D\u6392\u5EA7\u6905"
isGroup: 0
parentIndex: -1
spriteID: c7f2205415a762e41a37bba8b9315e82
layerID: 7
mosaicPosition: {x: 4, y: 452}
spriteID: a3912a2bfb6c7e144be3dfd6d91de611
layerID: 6
mosaicPosition: {x: 4, y: 228}
flatten: 0
isImported: 1
isVisible: 1
@@ -458,8 +416,8 @@ ScriptedImporter:
spriteName: "\u6276\u624BA"
isGroup: 0
parentIndex: -1
spriteID: 34d89eb0224d246438582901eb0d985b
layerID: 6
spriteID: e615515ddf447b4469ee9e7b642499a2
layerID: 5
mosaicPosition: {x: 765, y: 4}
flatten: 0
isImported: 1
@@ -468,19 +426,19 @@ ScriptedImporter:
spriteName: "\u6276\u624BB"
isGroup: 0
parentIndex: -1
spriteID: 5c43a18c0c7d01b40bd2edae2430339d
layerID: 5
spriteID: 406186bfb74d02e4eaec8dbce5b2de37
layerID: 4
mosaicPosition: {x: 726, y: 4}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u6276\u624B"
spriteName: "\u6276\u624B"
- name: "\u680F\u6746"
spriteName: "\u680F\u6746"
isGroup: 0
parentIndex: -1
spriteID: ab578ac0481bb594a964eb77553ed55c
layerID: 4
mosaicPosition: {x: 4, y: 484}
spriteID: 765730de7c407aa439e42df86a903a85
layerID: 3
mosaicPosition: {x: 4, y: 260}
flatten: 0
isImported: 1
isVisible: 1
@@ -488,30 +446,20 @@ ScriptedImporter:
spriteName: "\u8F66\u53A2"
isGroup: 0
parentIndex: -1
spriteID: 5a87c0768da00074b93707308961c37e
layerID: 3
mosaicPosition: {x: 4, y: 4}
flatten: 0
isImported: 1
isVisible: 1
- name: night
spriteName: night
isGroup: 0
parentIndex: -1
spriteID: ca1683603b7875440b901466e94bdfe1
spriteID: 20ce7d1b34e2ee54fade37d8719cd3be
layerID: 2
mosaicPosition: {x: 4, y: 228}
mosaicPosition: {x: 4, y: 4}
flatten: 0
isImported: 1
isVisible: 1
rigPSDLayers:
- name: "\u524D\u6392\u5EA7\u4F4D"
spriteName: "\u524D\u6392\u5EA7\u4F4D"
- name: "\u524D\u6392\u5EA7\u6905"
spriteName: "\u524D\u6392\u5EA7\u6905"
isGroup: 0
parentIndex: -1
spriteID: a3d25c5d12bca2d429c0113278e172ba
layerID: 7
mosaicPosition: {x: 4, y: 452}
spriteID: 76f136495d7b4a14cbee09f09b568e70
layerID: 6
mosaicPosition: {x: 4, y: 228}
flatten: 0
isImported: 1
isVisible: 1
@@ -519,8 +467,8 @@ ScriptedImporter:
spriteName: "\u6276\u624BA"
isGroup: 0
parentIndex: -1
spriteID: 78d7e6eef7492a74599092b6181b4fa6
layerID: 6
spriteID: 471a574fff4255e47bb00ead417b237b
layerID: 5
mosaicPosition: {x: 765, y: 4}
flatten: 0
isImported: 1
@@ -529,19 +477,19 @@ ScriptedImporter:
spriteName: "\u6276\u624BB"
isGroup: 0
parentIndex: -1
spriteID: 159e185fa2fa9e34e8c1ba9160f23818
layerID: 5
spriteID: 1c11d5347b4c0f54197d3a16db698e55
layerID: 4
mosaicPosition: {x: 726, y: 4}
flatten: 0
isImported: 1
isVisible: 1
- name: "\u6276\u624B"
spriteName: "\u6276\u624B"
- name: "\u680F\u6746"
spriteName: "\u680F\u6746"
isGroup: 0
parentIndex: -1
spriteID: 69857b739f2393546aedc4d8475c1bf5
layerID: 4
mosaicPosition: {x: 4, y: 484}
spriteID: c8b3df150890a8146a168da747203ce2
layerID: 3
mosaicPosition: {x: 4, y: 260}
flatten: 0
isImported: 1
isVisible: 1
@@ -549,26 +497,16 @@ ScriptedImporter:
spriteName: "\u8F66\u53A2"
isGroup: 0
parentIndex: -1
spriteID: b7464981e912cdb40a93ed45e48afc32
layerID: 3
mosaicPosition: {x: 4, y: 4}
flatten: 0
isImported: 1
isVisible: 1
- name: night
spriteName: night
isGroup: 0
parentIndex: -1
spriteID: 2dcc2a611adc181428d69553568c0f12
spriteID: c4677bcfba499794ea01da42943758d4
layerID: 2
mosaicPosition: {x: 4, y: 228}
mosaicPosition: {x: 4, y: 4}
flatten: 0
isImported: 1
isVisible: 1
sharedRigPSDLayers: []
pSDLayerImportSetting: []
importFileNodeState: 1
platformSettingsDirtyTick: 638844863247658105
platformSettingsDirtyTick: 638849240163810786
spriteSizeExpandChanged: 0
generateGOHierarchy: 0
textureAssetName:
Assets/RawResources/Art/对话框/对话框带框.png.meta
+6 -6
View File
@@ -160,13 +160,13 @@ TextureImporter:
name: Bottom
rect:
serializedVersion: 2
x: 387
x: 386
y: 350
width: 344
height: 101
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 11, y: 21, z: 9, w: 8}
border: {x: 14, y: 21, z: 13, w: 8}
outline: []
physicsShape: []
tessellationDetail: 0
@@ -187,7 +187,7 @@ TextureImporter:
height: 99
alignment: 6
pivot: {x: 0, y: 0}
border: {x: 12, y: 17, z: 9, w: 7}
border: {x: 12, y: 17, z: 10, w: 9}
outline: []
physicsShape: []
tessellationDetail: 0
@@ -244,9 +244,9 @@ TextureImporter:
name: Left
rect:
serializedVersion: 2
x: 743
x: 742
y: 236
width: 356
width: 357
height: 88
alignment: 4
pivot: {x: 0, y: 0.5}
@@ -307,7 +307,7 @@ TextureImporter:
name: TopLeft
rect:
serializedVersion: 2
x: 756
x: 755
y: 109
width: 343
height: 98
Assets/Scenes/SubWayNew.unity.meta → Assets/RawResources/Art/开盖动画.meta
+2 -1
View File
@@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: bc69e925289f0394d8291342ccbf5206
guid: c8805e9d6a063254089355bd35013444
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
Assets/RawResources/Art/开盖位置1.anim → Assets/RawResources/Art/开盖动画/开盖位置1.anim
View File
Assets/RawResources/Art/开盖位置1.anim.meta → Assets/RawResources/Art/开盖动画/开盖位置1.anim.meta
View File
Assets/RawResources/Art/开盖位置2.anim → Assets/RawResources/Art/开盖动画/开盖位置2.anim
View File
Assets/RawResources/Art/开盖位置2.anim.meta → Assets/RawResources/Art/开盖动画/开盖位置2.anim.meta
View File
Assets/RawResources/Art/开盖位置3.anim → Assets/RawResources/Art/开盖动画/开盖位置3.anim
View File
Assets/RawResources/Art/开盖位置3.anim.meta → Assets/RawResources/Art/开盖动画/开盖位置3.anim.meta
View File
Assets/RawResources/Art/开盖入场.anim → Assets/RawResources/Art/开盖动画/开盖入场.anim
View File
Assets/RawResources/Art/开盖入场.anim.meta → Assets/RawResources/Art/开盖动画/开盖入场.anim.meta
View File
Assets/RawResources/Art/开盖淡出.anim → Assets/RawResources/Art/开盖动画/开盖淡出.anim
View File
Assets/RawResources/Art/开盖淡出.anim.meta → Assets/RawResources/Art/开盖动画/开盖淡出.anim.meta
View File
Assets/RawResources/Art/开盖移动.anim → Assets/RawResources/Art/开盖动画/开盖移动.anim
View File
Assets/RawResources/Art/开盖移动.anim.meta → Assets/RawResources/Art/开盖动画/开盖移动.anim.meta
View File
Assets/Scenes/ClinicOut.unity
+10
View File
@@ -198,6 +198,8 @@ MonoBehaviour:
weight: 4
flipX: 1
flipY: 0
playOnAwake: 1
initMode: 0
isDistanceMode: 1
existTime: 0
existDistance: 30
@@ -536,6 +538,8 @@ MonoBehaviour:
weight: 1
flipX: 0
flipY: 0
playOnAwake: 1
initMode: 0
isDistanceMode: 1
existTime: 0
existDistance: 50
@@ -1540,6 +1544,8 @@ MonoBehaviour:
weight: 1
flipX: 1
flipY: 0
playOnAwake: 1
initMode: 0
isDistanceMode: 1
existTime: 0
existDistance: 22
@@ -6970,6 +6976,8 @@ MonoBehaviour:
weight: 1
flipX: 0
flipY: 0
playOnAwake: 1
initMode: 0
isDistanceMode: 1
existTime: 0
existDistance: 22
@@ -7049,6 +7057,8 @@ MonoBehaviour:
weight: 4
flipX: 0
flipY: 0
playOnAwake: 1
initMode: 0
isDistanceMode: 1
existTime: 0
existDistance: 30
Assets/Scenes/PeipeiFixScene.unity
+1130 -808
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+629 -629
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/SubWay.unity
+2084 -3947
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/SubWayNew.unity
-2032
View File
File diff suppressed because it is too large Load Diff
Assets/ScriptableObjects/BubbleStyle/Border Style.asset
+21
View File
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
m_Name: Border Style
m_EditorClassIdentifier:
bubblePadding: {x: 30, y: 30, z: 30, w: 50}
linePadding: {x: 30, y: 10, z: 20, w: 10}
lineFontSize: 30
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 32
hasActorName: 1
bubbleSpriteAddress: "BubbleSprite/\u5BF9\u8BDD\u6846\u5E26\u6846"
Assets/Prefabs/Chip.prefab.meta → Assets/ScriptableObjects/BubbleStyle/Border Style.asset.meta
+3 -2
View File
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 4dedd22662cba1c409b19152b0d04df1
PrefabImporter:
guid: f745f6e3243640b49a9be01c6adc8aa4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/ScriptableObjects/BubbleStyle/Default Bottom Style.asset
+1
View File
@@ -17,4 +17,5 @@ MonoBehaviour:
lineFontSize: 30
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 32
hasActorName: 1
bubbleSpriteAddress: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"
Assets/ScriptableObjects/BubbleStyle/Default Top Style.asset
+1
View File
@@ -17,4 +17,5 @@ MonoBehaviour:
lineFontSize: 30
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 32
hasActorName: 1
bubbleSpriteAddress: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"
Assets/ScriptableObjects/BubbleStyle/Mini Left Style.asset
+1
View File
@@ -17,4 +17,5 @@ MonoBehaviour:
lineFontSize: 18
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 20
hasActorName: 1
bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846 "
Assets/ScriptableObjects/BubbleStyle/Subway Style.asset
+21
View File
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
m_Name: Subway Style
m_EditorClassIdentifier:
bubblePadding: {x: 30, y: 40, z: 55, w: 30}
linePadding: {x: 30, y: 10, z: 20, w: 10}
lineFontSize: 30
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 32
hasActorName: 0
bubbleSpriteAddress: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"
Assets/Prefabs/UFView.prefab.meta → Assets/ScriptableObjects/BubbleStyle/Subway Style.asset.meta
+3 -2
View File
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 118a27260e16cb4439c8bb630f07ad31
PrefabImporter:
guid: 35c8acdf9f163414cbf0701f45793e94
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+8 -2
View File
@@ -118,7 +118,7 @@ namespace AibisDream.FixSystem
var data = clinicSystem.bubbleSlotGroup.CollectData();
BubbleGroup.Instance.LoadBubbles(data);
Debug.Log("气泡加载完成");
DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.ClinicBubble);
DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.StandardBubble);
}
public IEnumerator Exit()
@@ -151,7 +151,7 @@ namespace AibisDream.FixSystem
bodyModuleSystem.SwitchModuleGroup(moduleState);
}
if (lightSystem != null && !lightSystem.IsSystemOn())
if (lightSystem && !lightSystem.IsSystemOn())
{
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModuleCenter);
@@ -165,6 +165,12 @@ namespace AibisDream.FixSystem
bodyModuleSystem.ResetPlug();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// 加载气泡
var data = FixSystemCenter.SystemDic.Get<ScreenSystem>().BubbleSlotGroup.CollectData();
BubbleGroup.Instance.LoadBubbles(data);
DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.Screen);
// 开启交互
bodyModuleSystem.EnableSystem();
}
Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+3 -1
View File
@@ -21,6 +21,8 @@ namespace AibisDream.FixSystem
private GameObject _textItemPrefab;
private Queue<TypewriterByCharacter> _lineQueue;
public BubbleSlotGroup BubbleSlotGroup { get; private set; }
public TaskScreen TaskScreen { get; private set; }
public int maxLineNum = 10;
@@ -38,7 +40,7 @@ namespace AibisDream.FixSystem
TaskScreen = GetComponentInChildren<TaskScreen>();
_lineQueue = new Queue<TypewriterByCharacter>();
_textItemPrefab = ResourceKit.LoadAssetSync<GameObject>(ConstRef.ScreenTextName);
// TODO 调整估算文本框的宽度
BubbleSlotGroup = GetComponentInChildren<BubbleSlotGroup>();
}
private void Register()
Assets/Scripts/Framework/OtherKit/RandomSelector.cs
+3
View File
@@ -92,6 +92,7 @@ namespace AibisDream.Framework
var itemList = items.ToList();
_items = new List<T>(itemList.Count);
_batchWeight = new List<int>(itemList.Count);
int sum = 0;
foreach (var item in itemList)
@@ -107,6 +108,8 @@ namespace AibisDream.Framework
_items.Add(item);
}
}
_curBatchWeight = new List<int>(_batchWeight);
_totalWeight = sum;
_currentWeight = sum;
Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs
+33 -2
View File
@@ -23,9 +23,25 @@ namespace AibisDream
public override void OnSingletonInit()
{
InitRefs();
DestroyEditorTemp();
InitDefaultActor();
}
public void DestroyEditorTemp()
{
foreach (Transform child in _actorRoot)
{
#if UNITY_EDITOR
if (!Application.isPlaying)
{
DestroyImmediate(child.gameObject);
continue;
}
#endif
Destroy(child.gameObject);
}
}
private void InitDefaultActor()
{
foreach (var slot in _slotDict.Values.Where(slot => slot.hasDefaultActor))
@@ -47,13 +63,28 @@ namespace AibisDream
_actorFactory = new ActorFactory(_actorRoot);
}
public void InitActor(string actorName, string slotName, ActorType actorType)
#if UNITY_EDITOR
public void InitAllDefault()
{
InitRefs();
DestroyEditorTemp();
foreach (var slot in _slotDict.Values)
{
var actor = InitActor(slot.defaultActorName, slot.slotName, slot.defaultActorType);
actor.Show();
}
}
#endif
public AbsActor InitActor(string actorName, string slotName, ActorType actorType)
{
var slot = _slotDict[slotName];
// 生成新组件
var actor = _actorFactory.CreateActor(actorName, slot, actorType);
// 保存
_actorDict.Add(actorName, actor);
return actor;
}
public bool TryFindActor(string actorOrSlot, out AbsActor actor)
Assets/Scripts/SceneManagement/EnvironmentKit/AbsScenePart.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace AibisDream
protected TimesOfDay curTime;
protected Weather curWeather;
public abstract void Init(TimesOfDay time, Weather weather);
public abstract void Init(TimesOfDay time, Weather weather = Weather.Sunny);
public abstract void OnTimeChange(TimesOfDay time);
public abstract void OnWeatherChange(Weather weather);
}
Assets/Scripts/SceneManagement/EnvironmentKit/ActiveScenePart.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace AibisDream
{
[SerializeField] private ActivePartAsset[] activePartAssets;
public override void Init(TimesOfDay time, Weather weather)
public override void Init(TimesOfDay time, Weather weather = Weather.Sunny)
{
curWeather = weather;
OnTimeChange(time);
Assets/Scripts/SceneManagement/EnvironmentKit/AnimatorScenePart.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace AibisDream
{
private Animator _animator;
public override void Init(TimesOfDay timesOfDay, Weather weather)
public override void Init(TimesOfDay timesOfDay, Weather weather = Weather.Sunny)
{
_animator = GetComponent<Animator>();
Assets/Scripts/SceneManagement/EnvironmentKit/EnvironmentManager.cs
+45 -18
View File
@@ -7,42 +7,39 @@ namespace AibisDream
{
public class EnvironmentManager : Singleton<EnvironmentManager>
{
public bool initOnAwake = true;
public TimesOfDay defaultTime;
public Weather defaultWeather;
private AbsScenePart[] _absSceneParts;
public override void OnSingletonInit()
{
if (initOnAwake)
{
InitEnvironment(defaultTime, defaultWeather);
}
}
public void InitEnvironment(TimesOfDay timeOfDay, Weather weather)
{
_absSceneParts = GetComponentsInChildren<AbsScenePart>(true);
foreach (var part in _absSceneParts)
{
part.Init(defaultTime, defaultWeather);
part.Init(timeOfDay, weather);
}
}
public void SetTimeOfDay(string timeOfDay)
public void SetTimeOfDay(TimesOfDay timeOfDay)
{
if (!Enum.TryParse<TimesOfDay>(timeOfDay, out var time))
{
Debug.Log($"{timeOfDay}是不存在的时间");
return;
}
foreach (var part in _absSceneParts)
{
part.OnTimeChange(time);
part.OnTimeChange(timeOfDay);
}
}
public void SetWeather(string weatherType)
public void SetWeather(Weather weather)
{
if (!Enum.TryParse<Weather>(weatherType, out var weather))
{
Debug.Log($"{weatherType}是不存在的时间");
return;
}
foreach (var part in _absSceneParts)
{
part.OnWeatherChange(weather);
@@ -52,16 +49,46 @@ namespace AibisDream
public static class EnvironmentYarnCommand
{
[YarnCommand("init_emvironment")]
public static void InitEnvironment(string timeOfDay, string weatherType = "Sunny")
{
if (!Enum.TryParse<TimesOfDay>(timeOfDay, out var time))
{
Debug.Log($"{timeOfDay}是不存在的时间");
return;
}
if (!Enum.TryParse<Weather>(weatherType, out var weather))
{
Debug.Log($"{weatherType}是不存在的天气");
return;
}
EnvironmentManager.Instance.InitEnvironment(time, weather);
}
[YarnCommand("set_time_of_day")]
public static void SetTimeOfDay(string timeOfDay)
{
EnvironmentManager.Instance.SetTimeOfDay(timeOfDay);
if (!Enum.TryParse<TimesOfDay>(timeOfDay, out var time))
{
Debug.Log($"{timeOfDay}是不存在的时间");
return;
}
EnvironmentManager.Instance.SetTimeOfDay(time);
}
[YarnCommand("set_weather")]
public static void SetWeather(string weatherType)
{
EnvironmentManager.Instance.SetWeather(weatherType);
if (!Enum.TryParse<Weather>(weatherType, out var weather))
{
Debug.Log($"{weatherType}是不存在的天气");
return;
}
EnvironmentManager.Instance.SetWeather(weather);
}
}
}
Assets/Scripts/SceneManagement/EnvironmentKit/SpawnScenePart.cs
+85
View File
@@ -0,0 +1,85 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace AibisDream
{
[RequireComponent(typeof(Spawner))]
public class SpawnScenePart : AbsScenePart
{
private Spawner _spawner;
[SerializeField] private SpawnerPartAsset[] spawnerPartAssets;
public override void Init(TimesOfDay time, Weather weather = Weather.Sunny)
{
_spawner = GetComponent<Spawner>();
// 处理数据切换
curWeather = weather;
OnTimeChange(time);
// 切换完成后再行初始化
_spawner.Init();
}
public override void OnTimeChange(TimesOfDay time)
{
curTime = time;
var timeArray = spawnerPartAssets.Where(item => item.time == time).ToArray();
if (timeArray.Length == 0) return;
var res = timeArray.DefaultIfEmpty(timeArray[0]).First(item => item.weather == curWeather);
UpdateSpawner(res.mobileAddressData);
}
public override void OnWeatherChange(Weather weather)
{
curWeather = weather;
var weatherArray = spawnerPartAssets.Where(item => item.weather == weather).ToArray();
if (weatherArray.Length == 0) return;
var res = weatherArray.DefaultIfEmpty(weatherArray[0]).First(item => item.time == curTime);
UpdateSpawner(res.mobileAddressData);
}
private void UpdateSpawner(AddressArray[] addressArrays)
{
// 先把addressArray转为字典
var dict = addressArrays.ToDictionary(addressArray => addressArray.itemName);
// 处理Spawner
var newData = _spawner.mobileObjectDatas.Select(item => UpdateSpawnerData(item, dict)).ToArray();
_spawner.mobileObjectDatas = newData;
// 处理下面的初始化物体
var initObjects = GetComponentsInChildren<AbsMobileObject>();
foreach (var initObject in initObjects)
{
initObject.mobileObjectData = UpdateSpawnerData(initObject.mobileObjectData, dict);
}
}
private MobileObjectData UpdateSpawnerData(MobileObjectData mobileObjectData,
Dictionary<string, AddressArray> addressDict)
{
if (addressDict.TryGetValue(mobileObjectData.itemName, out var partAsset))
{
mobileObjectData.assetAddressArray = partAsset.assetAddressArray;
}
return mobileObjectData;
}
}
[Serializable]
public struct SpawnerPartAsset
{
public TimesOfDay time;
public Weather weather;
public AddressArray[] mobileAddressData;
}
[Serializable]
public struct AddressArray
{
public string itemName;
public string[] assetAddressArray;
}
}
Assets/Scripts/SceneManagement/EnvironmentKit/SpawnScenePart.cs.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 2973f622187142fd9230396685c3fdf6
timeCreated: 1749392263
Assets/Scripts/SceneManagement/EnvironmentKit/SpriteScenePart.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace AibisDream
[SerializeField] private SpritePartAsset[] spritePartAssets;
private SpriteRenderer _spriteRenderer;
public override void Init(TimesOfDay time, Weather weather)
public override void Init(TimesOfDay time, Weather weather = Weather.Sunny)
{
_spriteRenderer = GetComponent<SpriteRenderer>();
Assets/Scripts/SceneManagement/SpawnerKit/AbsMobileObject.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace AibisDream
{
public class AbsMobileObject : MonoBehaviour
{
[SerializeField] protected MobileObjectData mobileObjectData;
[SerializeField] public MobileObjectData mobileObjectData;
private Vector3 _initPos;
public bool IsActive { get; private set; }
Assets/Scripts/SceneManagement/SpawnerKit/BatchSpawner.cs
+1
View File
@@ -12,6 +12,7 @@ namespace AibisDream
protected override ISelector<MobileObjectData> CreateSelector(IEnumerable<MobileObjectData> datas)
{
Debug.Log("创建选择器");
return new BatchSelector<MobileObjectData>(datas, item => item.weight);
}
Assets/Scripts/SceneManagement/SpawnerKit/Spawner.cs
+45 -8
View File
@@ -1,13 +1,18 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using AibisDream.Framework;
using UnityEngine;
using Random = UnityEngine.Random;
namespace AibisDream
{
public class Spawner : MonoBehaviour
{
[SerializeField] private MobileObjectData[] mobileObjectDatas;
[SerializeField] public MobileObjectData[] mobileObjectDatas;
[SerializeField] public bool playOnAwake;
[SerializeField] private InitMode initMode;
[SerializeField] private bool isDistanceMode = true;
[SerializeField] private float existTime;
[SerializeField] private float existDistance;
@@ -24,10 +29,13 @@ namespace AibisDream
private void Awake()
{
Init();
if (playOnAwake)
{
Init();
}
}
private void Init()
public void Init()
{
// 先为Data赋一些公共值
var newMobileDatas = SetPublicVariable();
@@ -37,13 +45,30 @@ namespace AibisDream
factory = new MobileObjectFactory(transform);
// 收集初始物体
CollectDefaultMobiles();
// 间隔归零
curInterval = 0;
targetInterval = Random.Range(intervalRange.x, intervalRange.y);
// 生成第一个物体
Spawn();
targetInterval = Random.Range(intervalRange.x, intervalRange.y);
SpawnFirst();
}
protected void SpawnFirst()
{
switch (initMode)
{
case InitMode.Immediate:
curInterval = 0;
Spawn();
break;
case InitMode.Random:
curInterval = Random.Range(0, targetInterval);
break;
case InitMode.Next:
curInterval = 0;
break;
default:
throw new ArgumentOutOfRangeException();
}
}
protected virtual ISelector<MobileObjectData> CreateSelector(IEnumerable<MobileObjectData> datas)
{
return new RandomSelector<MobileObjectData>(datas, data => data.weight);
@@ -72,6 +97,11 @@ namespace AibisDream
factory.AddRecycleMobiles(initObjects);
foreach (var initObject in initObjects)
{
// 赋公共值
initObject.mobileObjectData.isDistanceMode = isDistanceMode;
initObject.mobileObjectData.existTime = existTime;
initObject.mobileObjectData.existDistance = existDistance;
// 启动
initObject.Init();
mobileObjects.Add(initObject);
initObject.OnDisposed += o => mobileObjects.Remove(o);
@@ -105,4 +135,11 @@ namespace AibisDream
mobileObj.OnDisposed += o => mobileObjects.Remove(o);
}
}
public enum InitMode
{
Immediate,
Random,
Next
}
}
Assets/Scripts/Style/BubbleStyle.cs
+7 -4
View File
@@ -11,17 +11,20 @@ namespace AibisDream
public Vector4 actorPadding;
public float actorFontSize;
public bool hasActorName;
public string bubbleSpriteAddress;
public RectOffset GetBubblePadding()
public RectOffset BubblePadding
{
return new RectOffset
get => new()
{
left = (int) bubblePadding.x,
left = (int)bubblePadding.x,
right = (int)bubblePadding.y,
top = (int)bubblePadding.z,
bottom = (int)bubblePadding.w
};
set => bubblePadding = new Vector4(value.left, value.right, value.top, value.bottom);
}
}
}
}
Assets/Scripts/SubWay/ParallaxManager.cs
-4
View File
@@ -2,8 +2,6 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using Yarn.Unity;
using AibisDream;
[System.Serializable]
@@ -34,7 +32,6 @@ public class ParallaxManager : MonoBehaviour
private Dictionary<string, List<GameObject>> objectPools = new Dictionary<string, List<GameObject>>(); // 物体池
private float previousSpeedMultiplier; // 用于记录上一次的值
[YarnCommand("EnterTunnel")]
public void EnterTunnel()
{
if (tunnelSprite != null && !isInTunnel)
@@ -54,7 +51,6 @@ public class ParallaxManager : MonoBehaviour
}
}
[YarnCommand("ExitTunnel")]
public void ExitTunnel()
{
if (tunnelSprite != null && isInTunnel)
Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
+30 -2
View File
@@ -42,7 +42,6 @@ namespace AibisDream
idx = data.idx;
maxWidth = data.maxWidth;
minWidth = data.minWidth;
_actorName.gameObject.SetActive(data.hasActorName);
transform.position = data.slotPosition;
// 设置style
SetStyle(data.bubbleStyle, data.pivotType);
@@ -51,11 +50,13 @@ namespace AibisDream
private void SetStyle(BubbleStyle bubbleStyle, PivotType pivotType)
{
// padding内容
_layoutGroup.padding = bubbleStyle.GetBubblePadding();
_layoutGroup.padding = bubbleStyle.BubblePadding;
_lineText.margin = bubbleStyle.linePadding;
_lineText.fontSize = bubbleStyle.lineFontSize;
_actorName.margin = bubbleStyle.actorPadding;
_actorName.fontSize = bubbleStyle.actorFontSize;
// 是否展示名称
_actorName.gameObject.SetActive(bubbleStyle.hasActorName);
// 锚点相关
_rect.pivot = CommonUtil.GetPivotByType(pivotType);
@@ -130,5 +131,32 @@ namespace AibisDream
LayoutRebuilder.ForceRebuildLayoutImmediate(_rect);
}
#if UNITY_EDITOR
public BubbleStyle testBubbleStyle;
public PivotType testPivotType;
public void LoadStyle()
{
InitRefs();
SetStyle(testBubbleStyle, testPivotType);
}
public void SaveStyle()
{
if (!testBubbleStyle) return;
InitRefs();
testBubbleStyle.linePadding = _lineText.margin;
testBubbleStyle.lineFontSize = _lineText.fontSize;
testBubbleStyle.actorPadding = _actorName.margin;
testBubbleStyle.actorFontSize = _actorName.fontSize;
testBubbleStyle.BubblePadding = _layoutGroup.padding;
testBubbleStyle.hasActorName = _actorName.gameObject.activeSelf;
}
#endif
}
}
Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs
-1
View File
@@ -73,7 +73,6 @@ namespace AibisDream
[HideInInspector] public Vector3 slotPosition;
public ActorRole actorRole;
public int idx;
public bool hasActorName;
public int maxWidth;
public int minWidth;
public BubbleStyle bubbleStyle;
Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs
+2 -3
View File
@@ -52,7 +52,7 @@ namespace AibisDream
var centerOption = transform.Find("Center Option").GetComponent<IDialogView>();
RegisterDialogView(DialogViewType.CenterOption, centerOption);
var bubbleGroup = transform.Find("Bubble Group").GetComponent<IDialogView>();
RegisterDialogView(DialogViewType.ClinicBubble, bubbleGroup);
RegisterDialogView(DialogViewType.StandardBubble, bubbleGroup);
_defaultView = _dialogViewDict[DialogViewType.OldBox];
}
@@ -327,7 +327,6 @@ namespace AibisDream
CenterText,
CenterOption,
Task,
ClinicBubble,
ModuleBubble
StandardBubble
}
}