diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel03.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel03.prefab index 99edd77b..b70e74b9 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel03.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel03.prefab @@ -69,7 +69,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e1a080a64894cc14baaa78794c1bd78c, type: 3} + m_Sprite: {fileID: 21300000, guid: 8a7a0b7ab21d34f418036ae048036190, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -155,7 +155,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 175.04906, y: -58} + m_AnchoredPosition: {x: 175.04906, y: -61} m_SizeDelta: {x: 350.09814, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1734941488510288323 diff --git a/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json new file mode 100644 index 00000000..100ceb40 --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json @@ -0,0 +1,662 @@ +[ + { + "ID": "90000", + "Note": "火势漫延速度", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "1", + "Int2": "20", + "Int3": "-1", + "Float1": "0.5", + "Float2": "4", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90001", + "Note": "转移伤员的读条时间", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "3", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90002", + "Note": "报警电话110", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "110", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "110对应的音频文件路径", + "String2": "", + "String3": "" + }, + { + "ID": "90003", + "Note": "报警电话120", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "120", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "120对应的音频文件路径", + "String2": "", + "String3": "" + }, + { + "ID": "90004", + "Note": "报警电话119", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "119", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "119对应的音频文件路径", + "String2": "", + "String3": "" + }, + { + "ID": "90005", + "Note": "可用于随机障碍物的区域", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "3017", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "3|6", + "VectorInt2": "1004|1005|1006", + "VectorInt3": "0|1|2", + "VectorInt4": "40|40|20", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90006", + "Note": "消火栓喷淋距离", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "15", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90007", + "Note": "初始火势值", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "1|2|6", + "VectorInt2": "10|25|40", + "VectorInt3": "100|100|100", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90008", + "Note": "NPC处于烟雾覆盖范围时降低健康值的频率", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "5", + "Int2": "5", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90009", + "Note": "每个可燃物被引燃额外增加的火势值", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "10", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90010", + "Note": "需要创建替代角色的职业及替代角色的选择", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "8006", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90011", + "Note": "消防队到达时间(演练结束)", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "600", + "Int2": "220", + "Int3": "60", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90012", + "Note": "各楼层教室老师收到的疏散顺序提示文本ID", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "1|2|3|4|5", + "VectorInt2": "20003|20004|20005|20006|20007", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90013", + "Note": "需要创建替代角色的职业及替代角色的选择", + "Scene": "9002", + "PlayScript": "5002", + "Int1": "8011", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90014", + "Note": "惊颤NPC转移点", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "1,1,1|3,3,3|2,2,2", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90015", + "Note": "广播通报事故唤醒学生参数", + "Scene": "9002", + "PlayScript": "5002", + "Int1": "1", + "Int2": "3", + "Int3": "-1", + "Float1": "0.2", + "Float2": "0.9", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90016", + "Note": "总指挥\"无法用于疏散的楼道\"的选择对应给予提示的选项", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "10195", + "Int2": "10196", + "Int3": "10197", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "10144|10150|10156|10162", + "VectorInt2": "10145|10151|10157|10163", + "VectorInt3": "10146|10152|10158|10164", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90017", + "Note": "下楼队形生效的区域", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "1004|1005|1006", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90018", + "Note": "外部增援NPC相关参数", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "90", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "10903|10901|10013", + "VectorInt2": "10902|10902|10014", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90019", + "Note": "开始扣健康值的火源距离", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "2", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90020", + "Note": "穿戴后被烟雾覆盖不会掉健康值的道具", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "3006|3008", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90021", + "Note": "未断电时使用消火栓喷洒时的触电几率", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "0.5", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90022", + "Note": "爆燃事件发生时xx米范围内的角色负伤/昏迷", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "8", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90023", + "Note": "错误操作导致水枪乱喷时，消火栓交互判定范围内的角色的受伤几率", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "0.5", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90024", + "Note": "演练经过xx秒后，惊颤状态持续yy秒的NPC转变为负伤状态。", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "300", + "Int2": "60", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90025", + "Note": "夜间能见度(单位:米)", + "Scene": "9002", + "PlayScript": "5002", + "Int1": "2", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90026", + "Note": "门把手温度上升粒度", + "Scene": "9002", + "PlayScript": "5002", + "Int1": "1", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90027", + "Note": "已掉线人物保留时间", + "Scene": "-1", + "PlayScript": "-1", + "Int1": "30", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90028", + "Note": "NPC被消防水枪的水柱冲到的减速比例", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "0.85", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90029", + "Note": "警戒线有效性判定参数", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "15", + "Int2": "5", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90030", + "Note": "救护车到场时间", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "150", + "Int2": "-1", + "Int3": "-1", + "Float1": "-1", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90031", + "Note": "灭火器喷洒距离", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "-1", + "Int2": "-1", + "Int3": "-1", + "Float1": "2.5", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + }, + { + "ID": "90032", + "Note": "扑救计算参数", + "Scene": "9003", + "PlayScript": "5001", + "Int1": "60", + "Int2": "10", + "Int3": "-1", + "Float1": "0.7", + "Float2": "-1", + "Float3": "-1", + "VectorInt1": "-1", + "VectorInt2": "-1", + "VectorInt3": "-1", + "VectorInt4": "-1", + "VectorInt5": "-1", + "String1": "", + "String2": "", + "String3": "" + } +] \ No newline at end of file diff --git a/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json.meta b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json.meta new file mode 100644 index 00000000..65456572 --- /dev/null +++ b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27ecc4e37cb448e45a2611c086cdfb90 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index 5e7b96bf..3bfe6572 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -674,6 +674,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -778,6 +782,10 @@ PrefabInstance: propertyPath: m_Name value: Command_End objectReference: {fileID: 0} + - target: {fileID: 1986279549238718699, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2991637681471873777, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 0