Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

xiaofang/Assets/Prefabs/PanelPrefabs/Json.prefab

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6827591438678571862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6827591438678571861}
+  - component: {fileID: 6827591438678571860}
+  m_Layer: 5
+  m_Name: Json
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6827591438678571861
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6827591438678571862}
+  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: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6827591438678571860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6827591438678571862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13fa0701c49727a4c84282a40243e52d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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}
+  incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3}
+  NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3}
+  LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3}
+  SelectJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
+  TaskJsonFile: {fileID: 4900000, guid: 4dec25769ed4ed3469693b1c881248af, type: 3}
+  GlobalJsonFile: {fileID: 4900000, guid: 27ecc4e37cb448e45a2611c086cdfb90, type: 3}
+  SelectsJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}

xiaofang/Assets/Prefabs/PanelPrefabs/Json.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 327c725927f3f924d8923cc19bc83385
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Res/gsj/10_slices/Equip.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 47728dc606dc34441a85db04711e83d2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Res/gsj/deliver.prefab

@@ -0,0 +1,526 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4842533009926776088
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3188402660528916100}
+  - component: {fileID: 5727028296999874614}
+  - component: {fileID: 5403093801444741714}
+  - component: {fileID: 2248222607619621212}
+  m_Layer: 5
+  m_Name: DeliverButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3188402660528916100
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4842533009926776088}
+  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: 789108786177588001}
+  m_Father: {fileID: 140804409796972766}
+  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: 168, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5727028296999874614
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4842533009926776088}
+  m_CullTransparentMesh: 1
+--- !u!114 &5403093801444741714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4842533009926776088}
+  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: f00c6fdfced317b4d98533eca7e60fed, 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 &2248222607619621212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4842533009926776088}
+  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: 5403093801444741714}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5660568506454431829
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6346671626106420460}
+  - component: {fileID: 8765345861942613135}
+  - component: {fileID: 2707378851504437818}
+  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 &6346671626106420460
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5660568506454431829}
+  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: 1344565523992887896}
+  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 &8765345861942613135
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5660568506454431829}
+  m_CullTransparentMesh: 1
+--- !u!114 &2707378851504437818
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5660568506454431829}
+  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: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u67E5\u770B"
+--- !u!1 &6408225670573401606
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 789108786177588001}
+  - component: {fileID: 3871322773739438634}
+  - component: {fileID: 2463134131297873958}
+  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 &789108786177588001
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6408225670573401606}
+  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: 3188402660528916100}
+  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 &3871322773739438634
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6408225670573401606}
+  m_CullTransparentMesh: 1
+--- !u!114 &2463134131297873958
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6408225670573401606}
+  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: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EA4\u4ED8"
+--- !u!1 &7296586638788422419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 140804409796972766}
+  - component: {fileID: 3207785675274464867}
+  - component: {fileID: 6512459185944628114}
+  - component: {fileID: 450094224217807325}
+  - component: {fileID: 3526805197088923187}
+  m_Layer: 5
+  m_Name: deliver
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &140804409796972766
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7296586638788422419}
+  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: 1344565523992887896}
+  - {fileID: 3188402660528916100}
+  m_Father: {fileID: 0}
+  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: 17, y: 150}
+  m_SizeDelta: {x: 169.7412, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3207785675274464867
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7296586638788422419}
+  m_CullTransparentMesh: 1
+--- !u!114 &6512459185944628114
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7296586638788422419}
+  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: b19986ad7a153a644bd5919a9e1c7d80, 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 &450094224217807325
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7296586638788422419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &3526805197088923187
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7296586638788422419}
+  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: 11
+  m_ChildAlignment: 6
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &7696554480819597552
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1344565523992887896}
+  - component: {fileID: 8480614586773662398}
+  - component: {fileID: 362146874130030547}
+  - component: {fileID: 3554629869632253830}
+  m_Layer: 5
+  m_Name: LookButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1344565523992887896
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7696554480819597552}
+  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: 6346671626106420460}
+  m_Father: {fileID: 140804409796972766}
+  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: 168, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8480614586773662398
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7696554480819597552}
+  m_CullTransparentMesh: 1
+--- !u!114 &362146874130030547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7696554480819597552}
+  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: 8ef5dffff13eea442bfc560b3a89967b, 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 &3554629869632253830
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7696554480819597552}
+  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: 362146874130030547}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

xiaofang/Assets/Res/gsj/deliver.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5190d8784d9f43e44875d0255c22e69e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Res/gsj/scripts/Drill.cs

@@ -6,7 +6,7 @@ using UnityEngine.UI;
 public class Drill : MonoBehaviour
 {
     private Button ScheduledBtn;
-    public bool isadministrator; // 是否为管理员
+    private bool isadministrator=false; // 是否为管理员
     private bool eventAdded = false; // 防止重复添加事件
     public delegate void BoolChangedHandler(bool value);
     public event BoolChangedHandler OnBoolAChanged;
@@ -26,13 +26,15 @@ public class Drill : MonoBehaviour
         noRoomText.gameObject.SetActive(false); // 初始隐藏文本
 
         content = transform.Find("Mid/Scroll View/Viewport/Content");
+
     }
 
     void Update()
     {
+
         // 实时检测房间列表是否为空，控制 noRoomText 的可见性
         noRoomText.gameObject.SetActive(content.childCount == 0);
-
+        isadministrator=ReadRoom.instance.isadministrator;
         // 检测管理员状态是否发生变化
         if (isadministrator != lastIsAdministratorState)
         {
@@ -67,7 +69,7 @@ public class Drill : MonoBehaviour
     // 演练计划按钮点击事件
     void OnClickScheduleBtn()
     {
-        SceneManager.LoadScene(2);
+        //SceneManager.LoadScene(2);
         Debug.Log("点击了演练计划按钮！");
         // 这里可以添加具体逻辑
     }

xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs

@@ -12,12 +12,25 @@ public class ReadRoom : MonoBehaviour
     private List<GameRoomListData> roomDataList;
     public JSONReader js;
     public bool isenter=false;//主持人进入
+    public bool isadministrator = false;//是否是管理员
+    private bool isStartRoom = false;//主持人是否已经点击演练开始
     // Start is called before the first frame update
     void Start()
     {
         instance = this;
         gameRoomListInstance = FindObjectOfType<gameRoomList>();
     }
+    void OnEnable()
+    {
+        // 订阅事件
+        Starthost.OnBoolStart += HandleRoomControl;
+    }
+
+    void OnDisable()
+    {
+        // 取消订阅事件
+        Starthost.OnBoolStart -= HandleRoomControl;
+    }
     //主持人直接进入房间要获取的数据
     public async void head()
     {
@@ -25,6 +38,11 @@ public class ReadRoom : MonoBehaviour
 
         if (response != null && response.Data != null)
         {
+            if(GlobalData.ServerData.data.isCreater == "Y")
+            {
+                SceneManager.LoadScene("yhj");
+                isadministrator=true;   
+            }
             roomDataList = response.Data;
             Debug.Log($"获取到的房间数量：{roomDataList.Count}");
             // 获取当前日期
@@ -36,33 +54,47 @@ public class ReadRoom : MonoBehaviour
             // 调用方法，动态生成房间元素
             foreach (var room in roomDataList)
             {
-                if (room.Status == "进行中")
+                if (room.Status == "1"||room.Status=="0")
                 {
                     bool found = false; // 标记是否找到匹配的用户 ID
-
+                    if (!isStartRoom)
-                    for (int i = 0; i < room.PlayerList.Count; i++)
                     {
-                        if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && ("2024/12/20" == room.ReserveDate))
+                        for (int i = 0; i < room.PlayerList.Count; i++)
                         {
-                            Debug.Log("可以直接进入房间");
+
-                            SceneManager.LoadScene("Tmap 1");
+                            if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId))// && ("2024/12/20" == room.ReserveDate))
-                            isenter = true;
+                            {
-                            found = true; // 找到匹配用户 ID
+                                //传人物职业ID
-                            break; // 直接跳出循环
+                                //Player.CSZS.SetPlayerID(room.PlayerList[i].RoleId);
+                                Debug.Log("可以直接进入房间");
+                                SceneManager.LoadScene("Tmap 1");
+                                isenter = true;
+                                found = true; // 找到匹配用户 ID
+                                break; // 直接跳出循环
+                            }
                         }
                     }
-
+                    else
+                    {
+                        Debug.Log("主持人点击了开始演练,但没有进入场景,要进入大厅房间");
+                        SceneManager.LoadScene("yhj");
+                        break;
+                    }
                     // 如果没有找到匹配的用户 ID，跳转到 "yhj" 场景
                     if (!found)
                     {
                         Debug.Log("未找到匹配用户 ID，跳转到场景 'yhj'");
                         SceneManager.LoadScene("yhj");
+                        break;
                     }
+                    // 如果找到了匹配房间，不需要再检查其他房间
+                    if (found) break;
                 }
                 else
                 {
                     Debug.Log("状态不是 '进行中'，跳转到场景 'yhj'");
                     SceneManager.LoadScene("yhj");
+                    break;
                 }
             }
 
@@ -78,4 +110,8 @@ public class ReadRoom : MonoBehaviour
     {
         
     }
+    void HandleRoomControl(bool isStart)
+    {
+        isStartRoom = isStart;
+    }
 }

xiaofang/Assets/Res/gsj/scripts/Status.cs

@@ -23,7 +23,7 @@ public class Status : MonoBehaviour
     private Button repair;//修复按钮
     private Button cancelbooking;//取消预定按钮
     private bool eventAdded = false; // 防止重复添加事件
-    public bool isadministrator;//是否为管理员
+    private bool isadministrator;//是否为管理员
     public Drill drill;
 
     private string scenename;//场景名
@@ -67,7 +67,7 @@ public class Status : MonoBehaviour
         // 查找场景中的 gameRoomList 脚本实例
         gameRoomListInstance = FindObjectOfType<gameRoomList>();
 
-        
+        isadministrator = ReadRoom.instance.isadministrator;
     }
     public void SetRoomData(string roomId, string sceneId, string subjectId, string templateId, string statu)
     {

xiaofang/Assets/Res/gsj/scripts/UseObjects.cs

@@ -11,6 +11,7 @@ public class UseObjects : MonoBehaviour
     private Transform parentObject; // 父物体（包含所有子物体）
     private GameObject player;//玩家   
     public JSONReader js;
+    public List<MatialData> retrievedDataList = new List<MatialData>(); // 存储根据 ID 查询到的 MatialData 数据
     //警戒物品使用
     public GameObject warningPrefab;    // 警戒锥道具模型
     public GameObject polePrefab;       // 警戒杆道具模型
@@ -20,7 +21,7 @@ public class UseObjects : MonoBehaviour
     private List<GameObject> warningObjects = new List<GameObject>(); // 存储所有警戒类道具
     //物品交付
     public List<GameObject> potentialTargets; // 所有可能成为交付对象的目标列表
-    public Button deliverButton;              // 슥마객큐
+    public Transform deliverButton;              // 交付按钮
     public float deliveryRange = 1f;           // 交付范围半径
     private GameObject currentTarget;         // 当前最近的交付目标
     private bool islogistics;//角色是否为后勤保障组;
@@ -38,13 +39,14 @@ public class UseObjects : MonoBehaviour
 
     void Start()
     {
-        parentObject = GameObject.Find("fireEquip").transform;
+        parentObject = transform.Find("fireEquip");
         player=GameObject.FindGameObjectWithTag("Player");
         // 初始化模拟物品数据
         InitializeItemConfigs(3001);
         // 隐藏交付按钮
-        deliverButton.gameObject.SetActive(false);
+
-        deliverButton.onClick.AddListener(HandleDelivery);
+        //deliverButton.gameObject.SetActive(false);
+        //deliverButton.onClick.AddListener(HandleDelivery);
 
         // 为每个子物体添加点击事件
         foreach (Transform child in parentObject)
@@ -57,8 +59,15 @@ public class UseObjects : MonoBehaviour
             }
             // 初始化子物体状态
             Transform buttonPanel = child.Find("informationImage");
+            // 隐藏交付按钮
+            deliverButton = child.Find("deliver");
+            deliverButton.gameObject.SetActive(false);
+
             Transform highlight = child.Find("Image");
-            if (buttonPanel != null) buttonPanel.gameObject.SetActive(false);
+            if (buttonPanel != null)
+            {
+                buttonPanel.gameObject.SetActive(false);     
+            }
             if (highlight != null) highlight.gameObject.SetActive(false);
 
             // 绑定点击事件
@@ -110,9 +119,15 @@ public class UseObjects : MonoBehaviour
             if (matialData.ID==id)
             {
                 //获取物品数据
-               
+                retrievedDataList.Add(matialData); // 将匹配的数据添加到容器中
+                Debug.Log($"数据已找到: ID={matialData.ID}, Note={matialData.Note}, Type={matialData.Type}, Name={matialData.Name}");
             }       
         }
+        // 如果未找到数据
+        if (retrievedDataList.Count == 0)
+        {
+            Debug.LogWarning("未找到对应 ID 的数据！");
+        }
     }
 
     // 当子物体被点击时

xiaofang/Assets/Scenes/Tmap 4.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d4d01d85f5b86e47a7ebe6a883e066f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Scenes/yhj.unity

@@ -863,7 +863,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5e5a05a2a1e8fc54f84494c10939f22a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isadministrator: 1
 --- !u!114 &423561716
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2855,7 +2854,6 @@ MonoBehaviour:
   isEnd: 0
   isOngoing: 0
   isScheduled: 0
-  isadministrator: 0
   drill: {fileID: 0}
   RoomId: 
   status: 
@@ -2919,7 +2917,6 @@ MonoBehaviour:
   isEnd: 0
   isOngoing: 0
   isScheduled: 0
-  isadministrator: 0
   drill: {fileID: 0}
   RoomId: 
   status: 
@@ -3740,7 +3737,6 @@ MonoBehaviour:
   isEnd: 0
   isOngoing: 0
   isScheduled: 0
-  isadministrator: 0
   drill: {fileID: 0}
   RoomId: 
   status: 
@@ -3760,7 +3756,7 @@ GameObject:
   - component: {fileID: 1841064745}
   - component: {fileID: 1841064744}
   m_Layer: 5
-  m_Name: Canvas
+  m_Name: HostCanvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0