summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <215380520@qq.com>2023-05-26 19:12:36 +0800
committerchai <215380520@qq.com>2023-05-26 19:12:36 +0800
commit38e177b0fdf130d6a361ab51c80b5b56ee83f28e (patch)
tree004cbaedc5a7be0b84bc4e05335800775f74e642
parent5bb5da4caebfdc8627e331b4eb5c53457316ec44 (diff)
*misc
-rw-r--r--WorldlineKeepers/Assets/Scenes/0_Test.unity48
-rw-r--r--WorldlineKeepers/Assets/Scenes/1_Entry.unity1345
-rw-r--r--WorldlineKeepers/Assets/Scripts/Data/CSVReader.cs94
-rw-r--r--WorldlineKeepers/Assets/Scripts/Data/DataManager.cs2
-rw-r--r--WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs19
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/FastBoxCollider.cs8
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/FastCircleCollider.cs8
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager.cs4
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager_StaticTree.cs38
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/PhysicsQuadtree.cs3
-rw-r--r--WorldlineKeepers/Assets/Scripts/Physics/TestSpirits.cs1
-rw-r--r--WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs6
-rw-r--r--WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs3
-rw-r--r--WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs12
-rw-r--r--WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs3
-rw-r--r--WorldlineKeepers/Assets/Scripts/StaticDefine.cs1
-rw-r--r--WorldlineKeepers/Assets/Scripts/UI/PanelBase.cs20
-rw-r--r--WorldlineKeepers/Assets/Scripts/UI/Panels.meta8
-rw-r--r--WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries.meta8
-rw-r--r--WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs28
-rw-r--r--WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs.meta11
-rw-r--r--WorldlineKeepers/Assets/Scripts/Utils/AsyncUtils.cs5
22 files changed, 1615 insertions, 60 deletions
diff --git a/WorldlineKeepers/Assets/Scenes/0_Test.unity b/WorldlineKeepers/Assets/Scenes/0_Test.unity
index 5b24157..fca2f27 100644
--- a/WorldlineKeepers/Assets/Scenes/0_Test.unity
+++ b/WorldlineKeepers/Assets/Scenes/0_Test.unity
@@ -9985,9 +9985,6 @@ GameObject:
m_Component:
- component: {fileID: 1552119910}
- component: {fileID: 1552119912}
- - component: {fileID: 1552119909}
- - component: {fileID: 1552119911}
- - component: {fileID: 1552119913}
- component: {fileID: 1552119914}
m_Layer: 0
m_Name: Main
@@ -9996,18 +9993,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &1552119909
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1552119908}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5e9d405b1bd5e604db9cc8638d465aaf, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!4 &1552119910
Transform:
m_ObjectHideFlags: 0
@@ -10023,18 +10008,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 68
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1552119911
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1552119908}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 807579a6a3913a7488bd4be81ce79a12, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!114 &1552119912
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10047,18 +10020,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e1448edde341f4f44b6959c045b6600b, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &1552119913
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1552119908}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0825a89e4815bc94eb58cd23aa6f4814, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!114 &1552119914
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10073,11 +10034,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
TimeBetweenSlowUpdateCalls: 0.14285715
ProfilerDebugAmount: 0
+ AutoTriggerManualTimeframe: 1
UpdateCoroutines: 0
FixedUpdateCoroutines: 0
LateUpdateCoroutines: 0
SlowUpdateCoroutines: 0
- _instanceID: 0
+ RealtimeUpdateCoroutines: 0
+ EditorUpdateCoroutines: 0
+ EditorSlowUpdateCoroutines: 0
+ EndOfFrameCoroutines: 0
+ ManualTimeframeCoroutines: 0
+ localTime: 0
+ deltaTime: 0
--- !u!1 &1566097397
GameObject:
m_ObjectHideFlags: 0
diff --git a/WorldlineKeepers/Assets/Scenes/1_Entry.unity b/WorldlineKeepers/Assets/Scenes/1_Entry.unity
index 63c8977..bbaf40e 100644
--- a/WorldlineKeepers/Assets/Scenes/1_Entry.unity
+++ b/WorldlineKeepers/Assets/Scenes/1_Entry.unity
@@ -123,6 +123,238 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &8402885
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8402888}
+ - component: {fileID: 8402887}
+ - component: {fileID: 8402886}
+ - component: {fileID: 8402889}
+ m_Layer: 0
+ m_Name: Main
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &8402886
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8402885}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2d2433f4570c1404da40af9ea0b12741, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ TimeBetweenSlowUpdateCalls: 0.14285715
+ ProfilerDebugAmount: 0
+ AutoTriggerManualTimeframe: 1
+ UpdateCoroutines: 0
+ FixedUpdateCoroutines: 0
+ LateUpdateCoroutines: 0
+ SlowUpdateCoroutines: 0
+ RealtimeUpdateCoroutines: 0
+ EditorUpdateCoroutines: 0
+ EditorSlowUpdateCoroutines: 0
+ EndOfFrameCoroutines: 0
+ ManualTimeframeCoroutines: 0
+ localTime: 0
+ deltaTime: 0
+--- !u!114 &8402887
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8402885}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e1448edde341f4f44b6959c045b6600b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &8402888
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8402885}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 946.75037, y: 574.75757, z: -5.148009}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8402889
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8402885}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 42ab9985cd771d24caccb1941aa97895, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &80420714
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 80420715}
+ - component: {fileID: 80420717}
+ - component: {fileID: 80420716}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &80420715
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80420714}
+ 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: 1881958259}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &80420716
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80420714}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9053\u573A"
+--- !u!222 &80420717
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80420714}
+ m_CullTransparentMesh: 1
+--- !u!1 &177501009
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 177501012}
+ - component: {fileID: 177501011}
+ - component: {fileID: 177501010}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &177501010
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 177501009}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_SendPointerHoverToParent: 1
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &177501011
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 177501009}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!4 &177501012
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 177501009}
+ 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_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &305075650
GameObject:
m_ObjectHideFlags: 0
@@ -207,3 +439,1116 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &340920893
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 340920894}
+ - component: {fileID: 340920896}
+ - component: {fileID: 340920895}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &340920894
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340920893}
+ 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: 1860863931}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &340920895
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340920893}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9053\u573A"
+--- !u!222 &340920896
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 340920893}
+ m_CullTransparentMesh: 1
+--- !u!1 &526934581
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 526934582}
+ - component: {fileID: 526934585}
+ - component: {fileID: 526934584}
+ - component: {fileID: 526934583}
+ m_Layer: 5
+ m_Name: Button (Legacy) (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &526934582
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 526934581}
+ 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: 629532265}
+ m_Father: {fileID: 1300391700}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 80, y: -64.08168}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &526934583
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 526934581}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 526934584}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &526934584
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 526934581}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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!222 &526934585
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 526934581}
+ m_CullTransparentMesh: 1
+--- !u!1 &562168711
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 562168712}
+ - component: {fileID: 562168715}
+ - component: {fileID: 562168714}
+ - component: {fileID: 562168713}
+ m_Layer: 5
+ m_Name: Button (Legacy) (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &562168712
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562168711}
+ 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: 839316803}
+ m_Father: {fileID: 1300391700}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 80, y: -113.16336}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &562168713
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562168711}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 562168714}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &562168714
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562168711}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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!222 &562168715
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562168711}
+ m_CullTransparentMesh: 1
+--- !u!1 &629532264
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 629532265}
+ - component: {fileID: 629532267}
+ - component: {fileID: 629532266}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &629532265
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 629532264}
+ 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: 526934582}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &629532266
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 629532264}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9053\u573A"
+--- !u!222 &629532267
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 629532264}
+ m_CullTransparentMesh: 1
+--- !u!1 &725163531
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 725163535}
+ - component: {fileID: 725163534}
+ - component: {fileID: 725163533}
+ - component: {fileID: 725163532}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &725163532
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 725163531}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &725163533
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 725163531}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 1
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 960, y: 540}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &725163534
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 725163531}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &725163535
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 725163531}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1300391700}
+ m_Father: {fileID: 0}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!1 &839316802
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 839316803}
+ - component: {fileID: 839316805}
+ - component: {fileID: 839316804}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &839316803
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 839316802}
+ 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: 562168712}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &839316804
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 839316802}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9053\u573A"
+--- !u!222 &839316805
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 839316802}
+ m_CullTransparentMesh: 1
+--- !u!1 &1300391699
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1300391700}
+ - component: {fileID: 1300391701}
+ - component: {fileID: 1300391702}
+ m_Layer: 5
+ m_Name: Panel_Entries
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1300391700
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1300391699}
+ 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: 1680182846}
+ - {fileID: 526934582}
+ - {fileID: 562168712}
+ - {fileID: 1860863931}
+ - {fileID: 1881958259}
+ m_Father: {fileID: 725163535}
+ m_RootOrder: 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: 1.1897, y: -7.1381}
+ m_SizeDelta: {x: 169.6939, y: 245.4084}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1300391701
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1300391699}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
+--- !u!114 &1300391702
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1300391699}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e8482d947d64cf14ca37ceb33dbeaa62, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_BtnDojo: {fileID: 1680182847}
+--- !u!1 &1557685774
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1557685775}
+ - component: {fileID: 1557685777}
+ - component: {fileID: 1557685776}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1557685775
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1557685774}
+ 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: 1680182846}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1557685776
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1557685774}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9053\u573A"
+--- !u!222 &1557685777
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1557685774}
+ m_CullTransparentMesh: 1
+--- !u!1 &1680182845
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1680182846}
+ - component: {fileID: 1680182849}
+ - component: {fileID: 1680182848}
+ - component: {fileID: 1680182847}
+ m_Layer: 5
+ m_Name: Button (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1680182846
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1680182845}
+ 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: 1557685775}
+ m_Father: {fileID: 1300391700}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1680182847
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1680182845}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1680182848}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1680182848
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1680182845}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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!222 &1680182849
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1680182845}
+ m_CullTransparentMesh: 1
+--- !u!1 &1860863930
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1860863931}
+ - component: {fileID: 1860863934}
+ - component: {fileID: 1860863933}
+ - component: {fileID: 1860863932}
+ m_Layer: 5
+ m_Name: Button (Legacy) (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1860863931
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1860863930}
+ 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: 340920894}
+ m_Father: {fileID: 1300391700}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 80, y: -162.24504}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1860863932
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1860863930}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1860863933}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1860863933
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1860863930}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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!222 &1860863934
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1860863930}
+ m_CullTransparentMesh: 1
+--- !u!1 &1881958258
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1881958259}
+ - component: {fileID: 1881958262}
+ - component: {fileID: 1881958261}
+ - component: {fileID: 1881958260}
+ m_Layer: 5
+ m_Name: Button (Legacy) (4)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1881958259
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1881958258}
+ 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: 80420715}
+ m_Father: {fileID: 1300391700}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 80, y: -211.32672}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1881958260
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1881958258}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1881958261}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1881958261
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1881958258}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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!222 &1881958262
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1881958258}
+ m_CullTransparentMesh: 1
diff --git a/WorldlineKeepers/Assets/Scripts/Data/CSVReader.cs b/WorldlineKeepers/Assets/Scripts/Data/CSVReader.cs
index 312eba8..207656b 100644
--- a/WorldlineKeepers/Assets/Scripts/Data/CSVReader.cs
+++ b/WorldlineKeepers/Assets/Scripts/Data/CSVReader.cs
@@ -1,4 +1,6 @@
using JetBrains.Annotations;
+using LitJson;
+using Newtonsoft.Json.Serialization;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -16,8 +18,27 @@ namespace WK.Data
private static Dictionary<string/*key*/, int/*index*/> m_KeyMapping = new Dictionary<string, int>();
private static List<List<string>> m_Rows = new List<List<string>>();
+ /// <summary>
+ /// 解析csv表格,并返回列表
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
+ /// <param name="content"></param>
+ /// <returns></returns>
public static List<T> Read<T>(string content) where T : new()
{
+ List<T> result = new List<T>();
+ Read<T>(result, content);
+ return result;
+ }
+
+ /// <summary>
+ /// 解析csv表格,并返回数量
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
+ /// <param name="content"></param>
+ /// <returns></returns>
+ public static int Read<T>(List<T> target, string content) where T : new()
+ {
m_KeyMapping.Clear();
m_Rows.Clear();
@@ -28,7 +49,7 @@ namespace WK.Data
{
m_KeyMapping.Add(keys[i], i);
}
- List<T> result = new List<T>();
+ int count = 0;
Type type = typeof(T);
for (int i = 1; i < m_Rows.Count; ++i)
{
@@ -36,18 +57,79 @@ namespace WK.Data
continue;
List<string> row = m_Rows[i];
T obj = new T();
- foreach(var key in m_KeyMapping)
+ foreach (var key in m_KeyMapping)
{
int index = key.Value;
var fieldInfo = type.GetField(key.Key);
- if(fieldInfo != null)
+ if (fieldInfo != null)
{
- fieldInfo.SetValue(obj, Convert.ChangeType(row[index], fieldInfo.FieldType));
+ Type fieldType = fieldInfo.FieldType;
+ if (fieldType.IsEnum) // 如果是枚举,先转成int
+ {
+ int value = int.Parse(row[index]);
+ fieldInfo.SetValue(obj, value);
+ }
+ else
+ {
+ fieldInfo.SetValue(obj, Convert.ChangeType(row[index], fieldInfo.FieldType));
+ }
}
}
- result.Add(obj);
+ target.Add(obj);
+ count++;
}
- return result;
+ return count;
+ }
+
+ /// <summary>
+ /// 解析csv表格,并按key存储到字典里,返回数量
+ /// </summary>
+ /// <typeparam name="TKey"></typeparam>
+ /// <typeparam name="TValue"></typeparam>
+ /// <param name="target"></param>
+ /// <param name="content"></param>
+ /// <param name="keyName"></param>
+ /// <returns></returns>
+ public static int ReadDictionary<TKey, TValue>(Dictionary<TKey, TValue> target, string content, string keyName) where TValue : new()
+ {
+ List<TValue> data = CSVReader.Read<TValue>(content);
+ if (data == null || data.Count == 0)
+ return 0;
+ Type type_key = typeof(TKey);
+ Type type_value = typeof(TValue);
+ FieldInfo field = type_value.GetField(keyName);
+ Type type_field = field.FieldType;
+ int count = 0;
+ for (int i = 0; i < data.Count; ++i)
+ {
+ TValue d = data[i];
+
+ TKey key = default(TKey);
+ if (type_key.IsEnum)
+ {
+ if(type_field == typeof(string))
+ {
+ key = (TKey)Enum.Parse(type_key, field.GetValue(d).ToString());
+ }
+ else if(type_field == typeof(int))
+ {
+ key = (TKey)field.GetValue(d);
+ }
+ }
+ else
+ {
+ key = (TKey)field.GetValue(d);
+ }
+ if (key == null)
+ {
+ LogHelper.LogError("CSVReader.ReadDictionary(): key is null");
+ continue;
+ }
+
+ target.Add(key, d);
+ count++;
+ }
+ return count;
}
}
diff --git a/WorldlineKeepers/Assets/Scripts/Data/DataManager.cs b/WorldlineKeepers/Assets/Scripts/Data/DataManager.cs
index 1c148ee..2667736 100644
--- a/WorldlineKeepers/Assets/Scripts/Data/DataManager.cs
+++ b/WorldlineKeepers/Assets/Scripts/Data/DataManager.cs
@@ -17,7 +17,7 @@ namespace WK.Data
private Dictionary<string/*uid*/, BuffMetadata> m_BuffMetadata = new Dictionary<string, BuffMetadata>();
private Dictionary<string/*uid*/, CharacterMetadata> m_CharacterMetadata = new Dictionary<string, CharacterMetadata>();
- private Dictionary<int, MetadataFile> m_Filelist = new Dictionary<int, MetadataFile>();
+ private Dictionary<EFileKey, MetadataFile> m_Filelist = new Dictionary<EFileKey, MetadataFile>();
public CharacterStatsMetadata GetCharacterStats(string uid)
{
diff --git a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs
index 40b00a7..75de5f3 100644
--- a/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs
+++ b/WorldlineKeepers/Assets/Scripts/Data/DataManager_Load.cs
@@ -26,8 +26,6 @@ namespace WK.Data
yield return Timing.WaitForSeconds(StaticDefine.IntervalLoadFile);
}
- #region 加载
-
/// <summary>
/// fielist
/// </summary>
@@ -36,15 +34,18 @@ namespace WK.Data
TextAsset text = ResourceManager.Instance.LoadAsset<TextAsset>(StaticDefine.FileList);
string content = text.text;
List<MetadataFile> files = CSVReader.Read<MetadataFile>(content);
- for (int i = 0; i < files.Count; ++i)
- {
- MetadataFile file = files[i];
- int key = (int)Enum.Parse(typeof(EFileKey), file.key);
- m_Filelist.Add(key, file);
- }
+ //for (int i = 0; i < files.Count; ++i)
+ //{
+ // MetadataFile file = files[i];
+ // int key = (int)Enum.Parse(typeof(EFileKey), file.key);
+ // m_Filelist.Add(key, file);
+ //}
+
+ CSVReader.ReadDictionary<EFileKey, MetadataFile>(m_Filelist, content, "key");
+
+ Debug.Log(m_Filelist.Count);
}
- #endregion
}
} \ No newline at end of file
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/FastBoxCollider.cs b/WorldlineKeepers/Assets/Scripts/Physics/FastBoxCollider.cs
index df84e0d..a644b69 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/FastBoxCollider.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/FastBoxCollider.cs
@@ -60,6 +60,10 @@ public class FastBoxCollider : MonoBehaviour, IQuadTreeObject
{
PhysicsManager.Instance.AddHurtboxes(this);
}
+ else if (m_Type == ColliderType.StaticCollider)
+ {
+ PhysicsManager.Instance.AddStaticCollider(this);
+ }
}
public void OnDestroy()
@@ -72,6 +76,10 @@ public class FastBoxCollider : MonoBehaviour, IQuadTreeObject
{
PhysicsManager.Instance.RemoveHurtbox(this);
}
+ else if (m_Type == ColliderType.StaticCollider)
+ {
+ PhysicsManager.Instance.RemoveStaticCollider(this);
+ }
}
private void OnDrawGizmos()
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/FastCircleCollider.cs b/WorldlineKeepers/Assets/Scripts/Physics/FastCircleCollider.cs
index dde49f9..5f04a9f 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/FastCircleCollider.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/FastCircleCollider.cs
@@ -60,6 +60,10 @@ public class FastCircleCollider : MonoBehaviour, IQuadTreeObject
{
PhysicsManager.Instance.AddHurtboxes(this);
}
+ else if(m_Type == ColliderType.StaticCollider)
+ {
+ PhysicsManager.Instance.AddStaticCollider(this);
+ }
}
public void OnDestroy()
@@ -72,6 +76,10 @@ public class FastCircleCollider : MonoBehaviour, IQuadTreeObject
{
PhysicsManager.Instance.RemoveHurtbox(this);
}
+ else if(m_Type == ColliderType.StaticCollider)
+ {
+ PhysicsManager.Instance.RemoveStaticCollider(this);
+ }
}
private void OnDrawGizmos()
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager.cs b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager.cs
index b726d6b..182ea16 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager.cs
@@ -8,11 +8,11 @@ public enum ColliderType
{
Collider,
Hurtbox,
+ StaticCollider,
}
public partial class PhysicsManager : Singleton<PhysicsManager>
{
- // 四叉树筛选结果
public List<IQuadTreeObject> sharedRetriveResults => m_SharedRetriveResults;
private List<IQuadTreeObject> m_SharedRetriveResults = new List<IQuadTreeObject>();
@@ -28,6 +28,8 @@ public partial class PhysicsManager : Singleton<PhysicsManager>
return RetriveColliders;
else if (type == ColliderType.Hurtbox)
return RetriveHurtboxes;
+ else if (type == ColliderType.StaticCollider)
+ return RetriveStaticColliders;
else
return null;
}
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager_StaticTree.cs b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager_StaticTree.cs
index c759e32..b89da29 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager_StaticTree.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsManager_StaticTree.cs
@@ -1,10 +1,48 @@
+using mh;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+/// <summary>
+/// 不经常改变位置和大小的collider认为是静态collider,不会每帧重建
+/// </summary>
public partial class PhysicsManager : Singleton<PhysicsManager>
{
+ private PhysicsQuadtree m_StaticCollisionQuadtree;
+ public Vector4 staticCollisionQuadtreeRange
+ {
+ set
+ {
+ m_StaticCollisionQuadtree.quadtreeRange = value;
+ }
+ }
+
+ public void AddStaticCollider(IQuadTreeObject collider)
+ {
+ m_StaticCollisionQuadtree.AddObject(collider);
+ }
+
+ public void RemoveStaticCollider(IQuadTreeObject collider)
+ {
+ m_StaticCollisionQuadtree.RemoveObject(collider);
+ }
+
+ public bool RetriveStaticColliders(ref List<IQuadTreeObject> returnObjs, IQuadTreeObject obj)
+ {
+ return m_StaticCollisionQuadtree.Retrive(ref returnObjs, obj);
+ }
+
+ public bool RetriveStaticColliders(ref List<IQuadTreeObject> returnObjs, Vector4 bound)
+ {
+ return m_StaticCollisionQuadtree.Retrive(ref returnObjs, bound);
+ }
+
+ public bool RetriveStaticColliders(Vector4 bound)
+ {
+ m_SharedRetriveResults.Clear();
+ return m_StaticCollisionQuadtree.Retrive(ref m_SharedRetriveResults, bound);
+ }
}
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsQuadtree.cs b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsQuadtree.cs
index 5cd374e..9fa8c2f 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/PhysicsQuadtree.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/PhysicsQuadtree.cs
@@ -40,6 +40,9 @@ class PhysicsQuadtree
m_Objects.Remove(obj);
}
+ /// <summary>
+ /// 閲嶅缓鍥涘弶鏍
+ /// </summary>
public void UpdateQuadtree()
{
m_Quadtree.Clear(false);
diff --git a/WorldlineKeepers/Assets/Scripts/Physics/TestSpirits.cs b/WorldlineKeepers/Assets/Scripts/Physics/TestSpirits.cs
index 3f313ae..8e46d3d 100644
--- a/WorldlineKeepers/Assets/Scripts/Physics/TestSpirits.cs
+++ b/WorldlineKeepers/Assets/Scripts/Physics/TestSpirits.cs
@@ -12,7 +12,6 @@ public class TestSpirits : MonoBehaviour
private const int kMaxCount = 500;
- // Start is called before the first frame update
void Start()
{
int count = kMaxCount - spirits.Count;
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
index 19b3535..183310e 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
@@ -24,6 +24,12 @@ namespace WK
public override void OnUpdate(float deltaTime)
{
}
+
+ protected void GotoStage(EGameStage target)
+ {
+ owner.AsyncLoadStage(target);
+ }
+
}
}
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
index a28e56d..d19a06d 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
@@ -33,7 +33,7 @@ namespace WK
stages[(int)EGameStage.Battle] = m_Statemachine.RegisterState(new GameStage_Battle());
stages[(int)EGameStage.Dojo] = m_Statemachine.RegisterState(new GameStage_Dojo());
- m_Statemachine.Start(stages[(int)EGameStage.Dojo]);
+ m_Statemachine.Start(stages[(int)EGameStage.Launch]);
}
public void OnStart()
@@ -42,6 +42,7 @@ namespace WK
public void OnUpdate()
{
+ m_Statemachine.Update(Time.deltaTime);
}
public void OnFixedUpdate()
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs
index 08cec82..2956dca 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Launch.cs
@@ -1,6 +1,10 @@
+using MovementEffects;
using System.Collections;
using System.Collections.Generic;
+using System.Data;
+using Unity.VisualScripting;
using UnityEngine;
+using WK.Data;
namespace WK
{
@@ -8,8 +12,12 @@ namespace WK
public class GameStage_Launch : GameStageBase
{
+ CoroutineHandle m_CoLoadData;
+
public override IEnumerator<float> OnStart()
{
+ m_CoLoadData = DataManager.Instance.AsyncLoadAll();
+
yield break;
}
@@ -20,6 +28,10 @@ namespace WK
public override void OnUpdate(float deltaTime)
{
+ if (!m_CoLoadData.IsRunning)
+ {
+ //GotoStage(EGameStage.Dojo);
+ }
}
}
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs
index 8a1d5eb..54ec304 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Main.cs
@@ -5,6 +5,9 @@ using UnityEngine;
namespace WK
{
+ /// <summary>
+ /// 主界面
+ /// </summary>
public class GameStage_Main : GameStageBase
{
diff --git a/WorldlineKeepers/Assets/Scripts/StaticDefine.cs b/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
index 05755ec..947882e 100644
--- a/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
+++ b/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
@@ -17,6 +17,7 @@ namespace WK
public static string RoninPath = "characters/ronin/ronin.json";
+ // 场景
public static string Scene_Dojo = "Scenes/3_Dojo";
public static string Scene_Stage = "Scenes/4_Stage";
diff --git a/WorldlineKeepers/Assets/Scripts/UI/PanelBase.cs b/WorldlineKeepers/Assets/Scripts/UI/PanelBase.cs
index f0b25f7..c2391ca 100644
--- a/WorldlineKeepers/Assets/Scripts/UI/PanelBase.cs
+++ b/WorldlineKeepers/Assets/Scripts/UI/PanelBase.cs
@@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-namespace WK
+namespace WK.UI
{
/// <summary>
@@ -11,6 +11,24 @@ namespace WK
public class PanelBase : MonoBehaviour
{
+ protected void Awake()
+ {
+ OnAwake();
+ }
+
+ protected void Start()
+ {
+ OnStart();
+ }
+
+ protected virtual void OnAwake()
+ {
+ }
+
+ protected virtual void OnStart()
+ {
+ }
+
}
}
diff --git a/WorldlineKeepers/Assets/Scripts/UI/Panels.meta b/WorldlineKeepers/Assets/Scripts/UI/Panels.meta
new file mode 100644
index 0000000..1b40c62
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/UI/Panels.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bf1825c84278f794785dba326debd24e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries.meta b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries.meta
new file mode 100644
index 0000000..902d189
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f29ad0540e5669c4dabe77941585683a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs
new file mode 100644
index 0000000..24522aa
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace WK.UI
+{
+
+ public class PanelEntries : PanelBase
+ {
+ public Button m_BtnDojo;
+
+ protected override void OnAwake()
+ {
+ base.OnAwake();
+
+ m_BtnDojo.onClick.AddListener(OnClickDojo);
+ }
+
+ private void OnClickDojo()
+ {
+ GameStageManager.Instance.AsyncLoadStage(EGameStage.Dojo);
+ }
+
+
+ }
+
+}; \ No newline at end of file
diff --git a/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs.meta b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs.meta
new file mode 100644
index 0000000..532b19f
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/UI/Panels/PanelEntries/PanelEntries.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8482d947d64cf14ca37ceb33dbeaa62
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/WorldlineKeepers/Assets/Scripts/Utils/AsyncUtils.cs b/WorldlineKeepers/Assets/Scripts/Utils/AsyncUtils.cs
index 14bbc86..a6f97ea 100644
--- a/WorldlineKeepers/Assets/Scripts/Utils/AsyncUtils.cs
+++ b/WorldlineKeepers/Assets/Scripts/Utils/AsyncUtils.cs
@@ -7,6 +7,11 @@ namespace WK
{
public static class AsyncUtils
{
+ /// <summary>
+ /// 异步处理任务
+ /// </summary>
+ /// <param name="asyncAct"></param>
+ /// <returns></returns>
public static CoroutineHandle AsyncAction(IEnumerator<float> asyncAct)
{
var handle = Timing.Instance.RunCoroutineOnInstance(asyncAct);