From 893f7368c16e6fdd6b2a7fe15e12f76c451617b3 Mon Sep 17 00:00:00 2001 From: lq <3298408835@qq.com> Date: Sun, 1 Dec 2024 04:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=A4=A7=E9=83=A8=E5=88=86=E6=89=80=E9=9C=80?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/PanelPrefabs/TemplatePanel.prefab | 389 +++++++++--- .../Prefabs/itemPrefabs/btnDutyChoose.prefab | 4 + .../Prefabs/itemPrefabs/fireItem.prefab | 10 +- .../Assets/Prefabs/itemPrefabs/panel 1.prefab | 596 ++++++++++++++++++ .../Prefabs/itemPrefabs/panel 1.prefab.meta | 7 + .../Assets/Resources/JsonAsset/Matial.json | 274 ++++++++ .../Resources/JsonAsset/Matial.json.meta | 7 + .../Assets/Resources/JsonAsset/Scene.json | 11 + .../Resources/JsonAsset/Scene.json.meta | 7 + xiaofang/Assets/Scenes/Schedule_03.unity | 108 +++- .../Assets/Script/JSONReader/JSONReader.cs | 84 ++- xiaofang/Assets/Script/Scheduled_03/Panel.cs | 62 +- xiaofang/Assets/Script/UI/DutyItem.cs | 38 ++ xiaofang/Assets/Script/UI/MaterialItem.cs | 1 + .../Assets/Script/UI/PanelUI/DatePanel.cs | 19 + .../Script/UI/PanelUI/EvacuationPanel.cs | 3 +- .../Assets/Script/UI/PanelUI/MaterialPanel.cs | 33 +- .../Script/UI/PanelUI/SelectScenePanel.cs | 34 +- xiaofang/Assets/Script/UI/SceneItem.cs | 39 +- .../Assets/Script/UI/createTemplateInfo.cs | 7 +- 20 files changed, 1614 insertions(+), 119 deletions(-) create mode 100644 xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab create mode 100644 xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab.meta create mode 100644 xiaofang/Assets/Resources/JsonAsset/Matial.json create mode 100644 xiaofang/Assets/Resources/JsonAsset/Matial.json.meta create mode 100644 xiaofang/Assets/Resources/JsonAsset/Scene.json create mode 100644 xiaofang/Assets/Resources/JsonAsset/Scene.json.meta diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/TemplatePanel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/TemplatePanel.prefab index 7463fce9..dadc7c27 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/TemplatePanel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/TemplatePanel.prefab @@ -1,5 +1,85 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1028068417804802485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6796369628167954800} + - component: {fileID: 2642210862222795222} + - component: {fileID: 7639512502900933620} + 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 &6796369628167954800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028068417804802485} + 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: 4270128029709949603} + m_RootOrder: 1 + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2642210862222795222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028068417804802485} + m_CullTransparentMesh: 1 +--- !u!114 &7639512502900933620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028068417804802485} + 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: 0 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &3746951257667673990 GameObject: m_ObjectHideFlags: 0 @@ -461,7 +541,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3746951259200738643} - - {fileID: 3746951258995501819} + - {fileID: 4270128029709949603} m_Father: {fileID: 3746951257667673989} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -549,86 +629,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3746951258995501820 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3746951258995501819} - - component: {fileID: 3746951258995501817} - - component: {fileID: 3746951258995501818} - 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 &3746951258995501819 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3746951258995501820} - 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: 3746951258624620777} - m_RootOrder: 1 - 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.0041656, y: 0.000099182} - m_SizeDelta: {x: 634.57, y: 64.194} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3746951258995501817 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3746951258995501820} - m_CullTransparentMesh: 1 ---- !u!114 &3746951258995501818 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3746951258995501820} - 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.98490566, g: 0.98490566, b: 0.98490566, 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: 35 - 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: "\u6F14\u7EC3\u6A21\u677F 2022/02/33" --- !u!1 &3746951259079573442 GameObject: m_ObjectHideFlags: 0 @@ -779,3 +779,230 @@ RectTransform: m_AnchoredPosition: {x: 0.60086, y: -287.05} m_SizeDelta: {x: 1135.1, y: 158.59} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4182102213655976799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2846203009971150950} + - component: {fileID: 3745219076670622187} + - component: {fileID: 7253411640476237527} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2846203009971150950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182102213655976799} + 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: 4270128029709949603} + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3745219076670622187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182102213655976799} + m_CullTransparentMesh: 1 +--- !u!114 &7253411640476237527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4182102213655976799} + 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: 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 35 + 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: "\u6F14\u7EC3\u6A21\u677F 2022/02/33" +--- !u!1 &8068488091473256204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4270128029709949603} + - component: {fileID: 264394471487241688} + - component: {fileID: 6208762089447794077} + - component: {fileID: 5587339775055527864} + m_Layer: 5 + m_Name: InputField (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4270128029709949603 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068488091473256204} + 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: 2846203009971150950} + - {fileID: 6796369628167954800} + m_Father: {fileID: 3746951258624620777} + m_RootOrder: 1 + 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.0050201, y: 0.000099182} + m_SizeDelta: {x: 634.57, y: 64.194} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &264394471487241688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068488091473256204} + m_CullTransparentMesh: 1 +--- !u!114 &6208762089447794077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068488091473256204} + 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.42745098} + 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: 10911, 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!114 &5587339775055527864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8068488091473256204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, 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: 6208762089447794077} + m_TextComponent: {fileID: 7639512502900933620} + m_Placeholder: {fileID: 7253411640476237527} + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 0 + m_CharacterLimit: 0 + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab index 9dd47baf..e9d3ffa3 100644 --- a/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab +++ b/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab @@ -254,3 +254,7 @@ MonoBehaviour: m_EditorClassIdentifier: dutyImage: {fileID: 3344224971186253052} dutyNameText: {fileID: 3344224971532102837} + button: {fileID: 3344224971532102794} + defaultColor: {r: 1, g: 1, b: 1, a: 1} + addedColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + selectedColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/fireItem.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/fireItem.prefab index d39a5ad1..a810cc3e 100644 --- a/xiaofang/Assets/Prefabs/itemPrefabs/fireItem.prefab +++ b/xiaofang/Assets/Prefabs/itemPrefabs/fireItem.prefab @@ -315,7 +315,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2891910624983636378} + - m_Target: {fileID: 749430105399374562} m_TargetAssemblyTypeName: MaterialItem, Assembly-CSharp m_MethodName: SubtractNum m_Mode: 1 @@ -336,7 +336,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2891910624983636376} - - component: {fileID: 2891910624983636378} + - component: {fileID: 749430105399374562} m_Layer: 5 m_Name: fireItem m_TagString: Untagged @@ -367,7 +367,7 @@ RectTransform: m_AnchoredPosition: {x: 160, y: -192.7375} m_SizeDelta: {x: 320, y: 385.475} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2891910624983636378 +--- !u!114 &749430105399374562 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -384,6 +384,8 @@ MonoBehaviour: materialNameText: {fileID: 2891910625436945438} hightImage: {fileID: 5883054567082841025} materialNum: 0 + materialName: + materialId: --- !u!1 &2891910625318117413 GameObject: m_ObjectHideFlags: 0 @@ -777,7 +779,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2891910624983636378} + - m_Target: {fileID: 749430105399374562} m_TargetAssemblyTypeName: MaterialItem, Assembly-CSharp m_MethodName: AddNum m_Mode: 1 diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab new file mode 100644 index 00000000..24a3d24a --- /dev/null +++ b/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab @@ -0,0 +1,596 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6740850323187360108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850323187360111} + - component: {fileID: 6740850323187360110} + - component: {fileID: 6740850323187360097} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850323187360111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323187360108} + 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: 6740850324834266126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6740850323187360110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323187360108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 450, y: 50} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &6740850323187360097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323187360108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &6740850323496789722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850323496789725} + - component: {fileID: 6740850323496789727} + - component: {fileID: 6740850323496789724} + m_Layer: 5 + m_Name: top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850323496789725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323496789722} + 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: 6740850324519681752} + m_Father: {fileID: 6740850324693622956} + 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: 448, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6740850323496789727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323496789722} + m_CullTransparentMesh: 1 +--- !u!114 &6740850323496789724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850323496789722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 368c48a90b48ff2499f478b931dcd178, 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 &6740850324519681753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850324519681752} + - component: {fileID: 6740850324519681754} + - component: {fileID: 6740850324519681755} + m_Layer: 5 + m_Name: sceneName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850324519681752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324519681753} + 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: 6740850323496789725} + 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!222 &6740850324519681754 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324519681753} + m_CullTransparentMesh: 1 +--- !u!114 &6740850324519681755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324519681753} + 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: 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "3-2\u73ED\u6559\u5BA4" +--- !u!1 &6740850324693622957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850324693622956} + - component: {fileID: 6740850324693622958} + - component: {fileID: 6740850324693622959} + - component: {fileID: 6740850324693622945} + - component: {fileID: 9016252888809016807} + m_Layer: 5 + m_Name: panel 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850324693622956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324693622957} + 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: 6740850323496789725} + - {fileID: 6740850324834475489} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 258, y: -285} + m_SizeDelta: {x: 460, y: 570} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6740850324693622958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324693622957} + m_CullTransparentMesh: 1 +--- !u!114 &6740850324693622959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324693622957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9a50facdb71f3df4ea2fbb49538061d3, 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 &6740850324693622945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324693622957} + 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: 15 + m_Bottom: 0 + m_ChildAlignment: 4 + 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 &9016252888809016807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324693622957} + 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: 6740850324693622959} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11500000, guid: bf46134b79a6f364eb7461349a15ee8a, type: 3} + m_TargetAssemblyTypeName: ManagerPanel, Assembly-CSharp + m_MethodName: + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 6740850324693622957} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &6740850324834266127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850324834266126} + - component: {fileID: 6740850324834266115} + - component: {fileID: 6740850324834266112} + - component: {fileID: 6740850324834266113} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850324834266126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834266127} + 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: 6740850323187360111} + m_Father: {fileID: 6740850324834475489} + 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: -31.2175} + m_SizeDelta: {x: 0, y: -67.7284} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6740850324834266115 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834266127} + m_CullTransparentMesh: 1 +--- !u!114 &6740850324834266112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834266127} + 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: 10917, 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!114 &6740850324834266113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834266127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &6740850324834475502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6740850324834475489} + - component: {fileID: 6740850324834475490} + - component: {fileID: 6740850324834475491} + - component: {fileID: 6740850324834475488} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6740850324834475489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834475502} + 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: 6740850324834266126} + m_Father: {fileID: 6740850324693622956} + 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: 448, y: 459.67} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6740850324834475490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834475502} + m_CullTransparentMesh: 1 +--- !u!114 &6740850324834475491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834475502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c20820ef6bd3f0d47b34f9f2ec44ce6a, 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 &6740850324834475488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6740850324834475502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6740850323187360111} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 6740850324834266126} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab.meta b/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab.meta new file mode 100644 index 00000000..4e42b3cf --- /dev/null +++ b/xiaofang/Assets/Prefabs/itemPrefabs/panel 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a4ea317bd96b8784491e7444b5053111 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/JsonAsset/Matial.json b/xiaofang/Assets/Resources/JsonAsset/Matial.json new file mode 100644 index 00000000..bfd98755 --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/Matial.json @@ -0,0 +1,274 @@ +[ + { + "ID": 3001, + "Note": "消防水枪", + "Type": 1, + "Name": 3001, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_001", + "ResPath": "\\ASSETS\\a001.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3002, + "Note": "消防水带", + "Type": 1, + "Name": 3002, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_002", + "ResPath": "\\ASSETS\\a002.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": "14,20", + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3003, + "Note": "灭火器", + "Type": 1, + "Name": 3003, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": "8002|8003", + "Icon": "icon_003", + "ResPath": "\\ASSETS\\a003.Prefeb", + "ConsumableType": 1, + "Durations": 30, + "Attribute": "15,30", + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3004, + "Note": "消防水桶", + "Type": 2, + "Name": 3004, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_004", + "ResPath": "\\ASSETS\\a004.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3005, + "Note": "灭火战斗服", + "Type": 3, + "Name": 3005, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_005", + "ResPath": "\\ASSETS\\a005.Prefeb", + "ConsumableType": 2, + "Durations": -1, + "Attribute": "5,20", + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3006, + "Note": "防护面具", + "Type": 3, + "Name": 3006, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_006", + "ResPath": "\\ASSETS\\a006.Prefeb", + "ConsumableType": 3, + "Durations": -1, + "Attribute": "5,40", + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3007, + "Note": "防护手套", + "Type": 3, + "Name": 3007, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_007", + "ResPath": "\\ASSETS\\a007.Prefeb", + "ConsumableType": 2, + "Durations": -1, + "Attribute": "5,20", + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3008, + "Note": "正压式空气呼吸器", + "Type": 3, + "Name": 3008, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_008", + "ResPath": "\\ASSETS\\a008.Prefeb", + "ConsumableType": 3, + "Durations": 300, + "Attribute": -1, + "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3009, + "Note": "隔离警示带", + "Type": 4, + "Name": 3009, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_009", + "ResPath": "\\ASSETS\\a009.Prefeb", + "ConsumableType": 1, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3010, + "Note": "锥形事故标志柱", + "Type": 4, + "Name": 3010, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": "8008|8009", + "Icon": "icon_010", + "ResPath": "\\ASSETS\\a010.Prefeb", + "ConsumableType": 1, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3011, + "Note": "警戒标志杆", + "Type": 4, + "Name": 3011, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": "8008|8009", + "Icon": "icon_011", + "ResPath": "\\ASSETS\\a011.Prefeb", + "ConsumableType": 1, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3012, + "Note": "头戴式照明灯", + "Type": 5, + "Name": 3012, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_012", + "ResPath": "\\ASSETS\\a012.Prefeb", + "ConsumableType": 2, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3013, + "Note": "手电筒", + "Type": 5, + "Name": 3013, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_013", + "ResPath": "\\ASSETS\\a013.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3014, + "Note": "对讲机", + "Type": 4, + "Name": 3014, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": -1, + "Icon": "icon_014", + "ResPath": "\\ASSETS\\a014.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3015, + "Note": "急救医疗箱", + "Type": 7, + "Name": 3015, + "Weight": 1, + "Scene ": 9003, + "RoleLimit": "8004|8005", + "Icon": "icon_015", + "ResPath": "\\ASSETS\\a015.Prefeb", + "ConsumableType": 1, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8001,1|8002,1|8003,0|8004,0|8005,0|8006,0", + "PutInStore": 1 + }, + { + "ID": 3016, + "Note": "易燃物1", + "Type": 0, + "Name": 3016, + "Weight": 2, + "Scene ": 9003, + "RoleLimit": 8006, + "Icon": "icon_016", + "ResPath": "\\ASSETS\\a016.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": "16,1", + "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0", + "PutInStore": 0 + }, + { + "ID": 3017, + "Note": "可转移的障碍物", + "Type": 0, + "Name": 3017, + "Weight": 2, + "Scene ": 9003, + "RoleLimit": 8006, + "Icon": "icon_017", + "ResPath": "\\ASSETS\\a017.Prefeb", + "ConsumableType": 0, + "Durations": -1, + "Attribute": -1, + "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0", + "PutInStore": 0 + } +] \ No newline at end of file diff --git a/xiaofang/Assets/Resources/JsonAsset/Matial.json.meta b/xiaofang/Assets/Resources/JsonAsset/Matial.json.meta new file mode 100644 index 00000000..f686a7d6 --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/Matial.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d98cb351d1a87dc4887a37106b9745d4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/JsonAsset/Scene.json b/xiaofang/Assets/Resources/JsonAsset/Scene.json new file mode 100644 index 00000000..9952d8ce --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/Scene.json @@ -0,0 +1,11 @@ +[ + { + "ID": 9003, + "Name": 40001, + "Type": 1, + "IncidentType": "5001|5002|5003", + "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003", + "AreaList": "1000|1001|1002|1003", + "Storeroom": 1011 + } +] \ No newline at end of file diff --git a/xiaofang/Assets/Resources/JsonAsset/Scene.json.meta b/xiaofang/Assets/Resources/JsonAsset/Scene.json.meta new file mode 100644 index 00000000..c797d13d --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/Scene.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06c09fd1c8b0a0a45951a1065189d922 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index 66bd1441..34f9e425 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -500,6 +500,7 @@ MonoBehaviour: materialContent: {fileID: 5745561353059433383} addBtn: {fileID: 0} subtractBtn: {fileID: 0} + jsonReader1: {fileID: 1417128757} --- !u!1 &287151818 GameObject: m_ObjectHideFlags: 0 @@ -1591,10 +1592,22 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 267.551 objectReference: {fileID: 0} + - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} + propertyPath: dataText + value: + objectReference: {fileID: 1423464739} + - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} + propertyPath: submitText + value: + objectReference: {fileID: 1654905067} - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} propertyPath: submitPanel value: objectReference: {fileID: 700683837} + - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} + propertyPath: submitInputField + value: + objectReference: {fileID: 1031005525} - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} propertyPath: preservationToggle value: @@ -2866,6 +2879,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7253411640476237527, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_FontData.m_MinSize + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_FontData.m_FontSize + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 7639512502900933620, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8068488091473256204, guid: e55a074b1a79a9045804c800bf094463, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e55a074b1a79a9045804c800bf094463, type: 3} --- !u!224 &700683836 stripped @@ -4009,7 +4054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.x - value: 21 + value: 20.00499 objectReference: {fileID: 0} - target: {fileID: 1031840000928267012, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y @@ -5613,6 +5658,10 @@ PrefabInstance: propertyPath: datePanel value: objectReference: {fileID: 468742199} + - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3} propertyPath: jsonReader value: @@ -6396,6 +6445,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024742103} m_CullTransparentMesh: 1 +--- !u!114 &1031005525 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5587339775055527864, guid: e55a074b1a79a9045804c800bf094463, type: 3} + m_PrefabInstance: {fileID: 700683835} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1034927192 GameObject: m_ObjectHideFlags: 0 @@ -8638,7 +8698,7 @@ GameObject: - component: {fileID: 1417128758} - component: {fileID: 1417128757} m_Layer: 0 - m_Name: GameObject + m_Name: JsonObj m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8659,6 +8719,8 @@ MonoBehaviour: npcJsonFile: {fileID: 4900000, guid: a854e20393334f04a8fc75e06404fe4f, type: 3} locationJsonFile: {fileID: 4900000, guid: 4d6cd655327e27c4b88c2033169c8fed, type: 3} eventJsonFile: {fileID: 4900000, guid: 2ef075e4830019a42b84d8d05d13d81c, type: 3} + matialJsonFile: {fileID: 4900000, guid: d98cb351d1a87dc4887a37106b9745d4, type: 3} + sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3} --- !u!4 &1417128758 Transform: m_ObjectHideFlags: 0 @@ -8674,6 +8736,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1423464739 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8789802340828738424, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} + m_PrefabInstance: {fileID: 468742196} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1432888496 GameObject: m_ObjectHideFlags: 0 @@ -9423,7 +9496,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -9529,6 +9602,17 @@ RectTransform: m_AnchoredPosition: {x: 702.4275, y: -380} m_SizeDelta: {x: 360.7686, y: 747.91} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1654905067 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7253411640476237527, guid: e55a074b1a79a9045804c800bf094463, type: 3} + m_PrefabInstance: {fileID: 700683835} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1667194939 PrefabInstance: m_ObjectHideFlags: 0 @@ -10573,6 +10657,10 @@ PrefabInstance: propertyPath: panel value: objectReference: {fileID: 618256462} + - target: {fileID: 2102021661377337229, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} + propertyPath: jsonReader + value: + objectReference: {fileID: 1417128757} - target: {fileID: 4764228630647718977, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13621,7 +13709,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7318934474615281455} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 617308873} + m_TargetAssemblyTypeName: ManagerPanel, Assembly-CSharp + m_MethodName: OnCloseWindowsBtn + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!222 &7318934474615281454 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs index c19a54dc..a081296d 100644 --- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs +++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs @@ -7,9 +7,13 @@ public class JSONReader : MonoBehaviour public TextAsset npcJsonFile; // NPC public TextAsset locationJsonFile; // Location public TextAsset eventJsonFile; + public TextAsset matialJsonFile; + public TextAsset sceneJsonFile; public Dictionary npcDictionary = new Dictionary(); public Dictionary locationDictionary = new Dictionary(); public Dictionary eventDictionary = new Dictionary(); + public Dictionary matialDictionary = new Dictionary(); + public Dictionary sceneDictionary = new Dictionary(); void Awake() { @@ -17,9 +21,29 @@ public class JSONReader : MonoBehaviour npcDictionary = ParseJSON(npcJsonFile.text); locationDictionary = LocationParseJSON(locationJsonFile.text); eventDictionary = EventParseJSON(eventJsonFile.text); - foreach (var npc in npcDictionary) + matialDictionary = MatialParseJSON(matialJsonFile.text); + sceneDictionary = SceneParseJSON(sceneJsonFile.text); + foreach (var npc in locationDictionary) { - //Debug.Log($"NPC ID: {npc.Value.ID} Name: {npc.Value.Name}"); + Debug.Log("111111111111"+npc.Value.RoleLimit); + // ͨŷָ RoleLimit ֶ + string roleLimit = npc.Value.RoleLimit; + + // RoleLimit ǿַնŷָ + if (!string.IsNullOrEmpty(roleLimit)) + { + string[] roleLimits = roleLimit.Split(','); + + // ӡָĽɫ + foreach (string role in roleLimits) + { + Debug.Log("RoleLimit Item: " + role); + } + } + else + { + Debug.Log("RoleLimit is empty for NPC ID: " + npc.Key); + } } //ӡ NPC @@ -70,6 +94,32 @@ public class JSONReader : MonoBehaviour return locationDictionary; } + public Dictionary MatialParseJSON(string json) + { + MatialData[] locationArray = JsonHelper.FromJson(json); + Dictionary locationDictionary = new Dictionary(); + + foreach (var location in locationArray) + { + locationDictionary[location.ID] = location; + } + + return locationDictionary; + } + + public Dictionary SceneParseJSON(string json) + { + SceneData[] locationArray = JsonHelper.FromJson(json); + Dictionary locationDictionary = new Dictionary(); + + foreach (var location in locationArray) + { + locationDictionary[location.ID] = location; + } + + return locationDictionary; + } + // ӡ NPC //void PrintNPCData(Dictionary npcDictionary) //{ @@ -164,4 +214,34 @@ public class EventData public string Role; public string DisasterLocation; } +[System.Serializable] +public class MatialData +{ + public int ID; + public string Note; + public int Type; + public int Name; + public int Weight; + public int Scene; + public string RoleLimit; + public string Icon; + public string ResPath; + public int ConsumableType; + public int Durations; + public string Attribute; + public string IsPickup; + public int PutInStore; +} +[System.Serializable] +public class SceneData +{ + public int ID; + public int Name; + public int Type; + public string IncidentType; + public string ObjList; + public string AreaList; + public int Storeroom; +} + diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs index 64f563a6..26f501a2 100644 --- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs +++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -96,7 +97,7 @@ public class Panel : MonoBehaviour GameObject item = GameObject.Instantiate(dutyPrefab, dutyCount); DutyItem dutyItem = item.GetComponent(); dutyItem.dutyNameText.text = npcData.Value.Note; - Debug.Log("$$$$$$$$$$$$$$" + dutyItem.dutyNameText.text); + //Debug.Log("$$$$$$$$$$$$$$" + dutyItem.dutyNameText.text); peopleList.Add(item);// ÿʵĽɫӵб } } @@ -109,9 +110,62 @@ public class Panel : MonoBehaviour GameObject item = GameObject.Instantiate(scenePrefab, sceneCount); SceneItem sceneItem = item.GetComponent(); sceneItem.sceneName.text = npcData.Value.Note; - Debug.Log("$$$$$$$$$$$$$$" + sceneItem.sceneName.text); - peopleList.Add(item);// ÿʵĽɫӵб + // ͨ|ָ RoleLimit ֶ + string roleLimit = npcData.Value.RoleLimit; + + if (!string.IsNullOrEmpty(roleLimit)) + { + // Ȱ|ָ + string[] roleLimitSections = roleLimit.Split('|'); + + // ÿ֣|ָõ飩 + foreach (string section in roleLimitSections) + { + // жϵǰǷ "-1" + if (section.Contains("-1")) + { + Debug.Log("ɫΪ-1Ϊޣ"); + sceneItem.limitNum = int.MaxValue; + continue; // ǰ֣к + } + + // ÿٰ,ָ + string[] roleLimits = section.Split(','); + + // жǷ㹻Ԫأ3 + if (roleLimits.Length >= 3) + { + // ȡԪزж + string thirdElement = roleLimits[2]; + Debug.Log("Ԫصֵǣ" + thirdElement); + sceneItem.limitNum = int.Parse(thirdElement); + + // жϵԪصֵ + if (thirdElement == "ijضֵ") // "ijضֵ" Ը + { + Debug.Log("Ԫ"); + } + else + { + Debug.Log("Ԫز"); + } + } + else + { + Debug.Log("ǰݲ3Ԫأ޷Ԫأ"); + } + } + } + else + { + Debug.Log("RoleLimit is empty for NPC ID: " + npcData.Key); + } + + // ÿʵĽɫӵб + peopleList.Add(item); } + + } //Աť @@ -123,7 +177,7 @@ public class Panel : MonoBehaviour } foreach (var sceneEntry in sceneDataDictionary) { - Debug.Log($": {sceneEntry.Key}: {sceneEntry.Value.Count}"); + //Debug.Log($": {sceneEntry.Key}: {sceneEntry.Value.Count}"); GameObject managerPanelInstance = Instantiate(ManagerPanelPrefab, panelContent); //ManagerPanel managerPanelScript = managerPanelInstance.GetComponentInParent(); Text sceneText= managerPanelInstance.transform.Find("top/sceneName").GetComponent(); diff --git a/xiaofang/Assets/Script/UI/DutyItem.cs b/xiaofang/Assets/Script/UI/DutyItem.cs index feb622a9..b36d2a38 100644 --- a/xiaofang/Assets/Script/UI/DutyItem.cs +++ b/xiaofang/Assets/Script/UI/DutyItem.cs @@ -7,6 +7,17 @@ public class DutyItem : MonoBehaviour { public Image dutyImage; public Text dutyNameText; + public Button button; + public Color defaultColor = Color.white; // Ĭɫ + public Color addedColor = Color.gray; // ɫ + public Color selectedColor = Color.yellow; // ѡɫ + + public string dutyName { get; private set; } // ɫ + private bool isAdded; // Ƿ + private bool isSelected; // Ƿѡ + + public delegate void ClickHandler(); + public event ClickHandler onClick; // ¼ // Start is called before the first frame update void Start() { @@ -18,4 +29,31 @@ public class DutyItem : MonoBehaviour { } + public void Setup(string name, bool added) + { + dutyName = name; + dutyNameText.text = name; + SetAdded(added); + button.onClick.AddListener(OnButtonClick); + } + // ״̬ + public void SetAdded(bool added) + { + isAdded = added; + dutyNameText.color = isAdded ? addedColor : defaultColor; + } + + // ѡ״̬ + public void SetSelected(bool selected) + { + isSelected = selected; + dutyNameText.fontSize = isSelected ? 24 : 14; // ѡк + dutyNameText.color = isSelected ? selectedColor : (isAdded ? addedColor : defaultColor); + } + + // ť¼ + private void OnButtonClick() + { + onClick?.Invoke(); + } } diff --git a/xiaofang/Assets/Script/UI/MaterialItem.cs b/xiaofang/Assets/Script/UI/MaterialItem.cs index d3d964a6..db326002 100644 --- a/xiaofang/Assets/Script/UI/MaterialItem.cs +++ b/xiaofang/Assets/Script/UI/MaterialItem.cs @@ -14,6 +14,7 @@ public class MaterialItem : MonoBehaviour [Header("")] public int materialNum = 0; // public string materialName; // + public string materialId; // Start is called before the first frame update void Start() diff --git a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs index b3b63e37..fd75e211 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.UI; @@ -13,6 +14,11 @@ public class DatePanel : MonoBehaviour public Text SchoolText; //¹Уı public Text PlaceText; //¹ʵصı public Text NumberText; //ı + + public InputField submitInputField; + public Text submitText; + public Text inputText; + public Text dataText; // Start is called before the first frame update void Start() { @@ -34,13 +40,26 @@ public class DatePanel : MonoBehaviour bool isActive = calendarPanel.activeSelf; calendarPanel.SetActive(!isActive); } + + //ύť public void OnClickSubmitPanel() { if(preservationToggle.isOn==true) { submitPanel.gameObject.SetActive(true); + submitText.text = "ģ"+ dataText.text; + if(inputText==null) + { + createTemplateInfo.Instance.auth_CreateTemplate.templateName = submitInputField.text; + } + else + { + createTemplateInfo.Instance.auth_CreateTemplate.templateName = inputText.text; + } } } + + //ģȷť public void OnClickSurePanel() { submitPanel.gameObject.SetActive(false); diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs index 2e17c1b9..b94fa314 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs @@ -11,6 +11,7 @@ public class EvacuationPanel : MonoBehaviour public GameObject classPrefab; public Transform content; public Text topText; + [Header("ѧ")] public InputField StuCountInputField; public Button CountsubmitBtn; @@ -48,7 +49,6 @@ public class EvacuationPanel : MonoBehaviour personnelItem.personnelNum.text = sceneEntry.Value.Count.ToString(); } - } //жǷ1 void CheckInput(string input) @@ -94,4 +94,5 @@ public class EvacuationPanel : MonoBehaviour classItem.JuesechoicePop = JuesechoicePop; } } + } diff --git a/xiaofang/Assets/Script/UI/PanelUI/MaterialPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/MaterialPanel.cs index 0d5278d0..cb3e8af8 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/MaterialPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/MaterialPanel.cs @@ -13,7 +13,7 @@ public class MaterialPanel : MonoBehaviour // ڴ洢ɵƷ private List materialItems = new List(); - + public JSONReader jsonReader1; // Start is called before the first frame update void Start() { @@ -29,24 +29,37 @@ public class MaterialPanel : MonoBehaviour // ʼƷԤ壬̬Ʒ public void SetMaterialPrefab() { - for (int i = 0; i < 8; i++) // 8Ʒ + foreach (var materialData in jsonReader1.matialDictionary) { - GameObject item = Instantiate(materialPrefab, materialContent); // ʵƷ - MaterialItem materialItem = item.GetComponent(); // ȡƷĽű - - materialItems.Add(materialItem); // Ʒӵб - - // ƷƺݣеĻ - materialItem.materialName = "Ʒ" + (i + 1); // Ʒ - materialItem.materialNameText.text = materialItem.materialName; // UIе + GameObject item = GameObject.Instantiate(materialPrefab, materialContent); + MaterialItem materialItem = item.GetComponent(); + materialItem.materialNameText.text = materialData.Value.Note; + Debug.Log(materialData.Value.Note); + //Debug.Log("$$$$$$$$$$$$$$" + dutyItem.dutyNameText.text); + //materialItems.Add(item);// ÿʵĽɫӵб } + //for (int i = 0; i < 8; i++) // 8Ʒ + //{ + // GameObject item = Instantiate(materialPrefab, materialContent); // ʵƷ + // MaterialItem materialItem = item.GetComponent(); // ȡƷĽű + + // materialItems.Add(materialItem); // Ʒӵб + + // // ƷƺݣеĻ + // materialItem.materialName = "Ʒ" + (i + 1); // Ʒ + // materialItem.materialNameText.text = materialItem.materialName; // UIе + //} } // ȡƷύ public void SubmitMaterialData() { + int index = 0; foreach (var materialItem in materialItems) { + createTemplateInfo.Instance.auth_CreateTemplate.materialList[index].materialId = materialItem.materialId; + createTemplateInfo.Instance.auth_CreateTemplate.materialList[index].num = materialItem.materialNum; + index++; Debug.Log(materialItem.materialName + " : " + materialItem.GetMaterialNum()); } } diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs index b8ff20e4..71547762 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs @@ -67,12 +67,30 @@ public class SelectScenePanel : MonoBehaviour //̬سѡԤ public void InstantiateScenePrefab() { + //int index = 0; + //foreach (var sceneData in jsonReader.sceneDictionary) + //{ + // GameObject slot = GameObject.Instantiate(scenePrefab, sceneList); + // SceneItem item = slot.GetComponent(); + // item.sceneName.text = sceneData.Value.Name.ToString(); + // item.sceneId= sceneData.Value.ID; + // if (item.IsOpen) + // { + // item.maskImage.gameObject.SetActive(false); + // } + // Toggle toggle = slot.GetComponent(); + // if (toggle != null) + // { + // toggle.group = sceneGroup; + // toggleList[index++] = toggle; + // sceneItemList.Add(item); + // } + //} for (int i = 0; i < 6; i++) { GameObject slot = GameObject.Instantiate(scenePrefab, sceneList); SceneItem item = slot.GetComponent(); - item.sceneName.text = "" + i; if (item.IsOpen) @@ -128,6 +146,7 @@ public class SelectScenePanel : MonoBehaviour GameObject slot = GameObject.Instantiate(eventPrefab, eventList); EventInfo item = slot.GetComponent(); item.eventName.text = eventData.Value.Note; + item.eventId = eventData.Value.ID; Toggle toggle = slot.GetComponent(); if (toggle != null) @@ -158,8 +177,8 @@ public class SelectScenePanel : MonoBehaviour this.schoolName = item.schoolName.text; } } - Debug.Log("###############1:" + this.schoolId); - Debug.Log("###############2:" + this.schoolName); + //Debug.Log("###############1:" + this.schoolId); + //Debug.Log("###############2:" + this.schoolName); } //ѡ @@ -173,6 +192,7 @@ public class SelectScenePanel : MonoBehaviour { // ó this.sceneName = item.sceneName.text; // ȡ Text ı + createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString(); sceneSelected = true; break; // ҵѡеij˳ѭ } @@ -193,6 +213,7 @@ public class SelectScenePanel : MonoBehaviour { // ó this.eventName = item.eventName.text; // ȡ Text ı + createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.eventId.ToString(); Debug.Log(this.eventName); eventSelected = true; break; // ҵѡеij˳ѭ @@ -326,7 +347,8 @@ public class SelectScenePanel : MonoBehaviour } } - public void SetFirstChoise(Toggle[] toggles)//ĬѡһToggle + //ĬѡһToggle + public void SetFirstChoise(Toggle[] toggles) { // ȡToggleGroupеToggle @@ -367,7 +389,7 @@ public class SelectScenePanel : MonoBehaviour { if (item.isOpen == false) { - item.GetComponent().interactable = false; + item.GetComponent().interactable = true; if (item.GetComponent().isOn) { item.GetComponent().isOn = false; @@ -389,7 +411,7 @@ public class SelectScenePanel : MonoBehaviour { if (item.isOpen == false) { - item.GetComponent().interactable = false; + item.GetComponent().interactable = true; if (item.GetComponent().isOn) { item.GetComponent().isOn = false; diff --git a/xiaofang/Assets/Script/UI/SceneItem.cs b/xiaofang/Assets/Script/UI/SceneItem.cs index 8acc2a85..e5132d7c 100644 --- a/xiaofang/Assets/Script/UI/SceneItem.cs +++ b/xiaofang/Assets/Script/UI/SceneItem.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -5,14 +6,18 @@ using UnityEngine.UI; public class SceneItem : MonoBehaviour { + public int sceneId; public Text sceneName; public Image sceneImage; public Image maskImage; + public string roleLimit;// + public int limitNum;// + public JSONReader jsonReader; public bool IsOpen { get; set; } = true; // Start is called before the first frame update void Start() { - + jsonReader = GameObject.Find("JsonObj").GetComponent(); } // Update is called once per frame @@ -20,4 +25,36 @@ public class SceneItem : MonoBehaviour { } + //ָ + public void SetData() + { + foreach (var npc in jsonReader.locationDictionary) + { + Debug.Log("111111111111" + npc.Value.RoleLimit); + // ͨŷָ RoleLimit ֶ + string roleLimit = npc.Value.RoleLimit; + + // RoleLimit ǿַնŷָ + if (!string.IsNullOrEmpty(roleLimit)) + { + string[] roleLimits = roleLimit.Split(','); + + // ָĽɫ + foreach (string role in roleLimits) + { + Debug.Log("RoleLimit Item: " + role); + + // жϽɫǷΪ -1 + if (role == "-1") + { + Debug.Log("ɫΪ-1Ϊޣ"); + } + } + } + else + { + Debug.Log("RoleLimit is empty for NPC ID: " + npc.Key); + } + } + } } diff --git a/xiaofang/Assets/Script/UI/createTemplateInfo.cs b/xiaofang/Assets/Script/UI/createTemplateInfo.cs index 9aacbd39..a5d83cb4 100644 --- a/xiaofang/Assets/Script/UI/createTemplateInfo.cs +++ b/xiaofang/Assets/Script/UI/createTemplateInfo.cs @@ -4,14 +4,9 @@ using UnityEngine; public class createTemplateInfo : Singleton { - public string templateName;//ģ - public string sceneId;// - public string subjectId;//Ŀ - public string isTemplate;//Ƿ񱣴Ϊģ - public string mode;//ģʽ + public auth_createTemplate auth_CreateTemplate=new auth_createTemplate(); public List playerList;//б public List npcList;//Npcб - public List materialList;//豸б // Start is called before the first frame update void Start() {