二级节点添加滚动栏。

返回场景后因为灭有移除消息监听导致报空引用。
修改场景中的裂纹跟位置偏移。

Assets/00JBHF/ADD(1).FBX.meta

@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: f8fd61b9db944f94ba82f05fc5d5d252
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    100002: YinCang_Che
+    100004: YinCang_XinZeng
+    400000: //RootNode
+    400002: YinCang_Che
+    400004: YinCang_XinZeng
+    2100000: CJ_DLS1
+    2100002: CJ_PuZhuang4
+    2100004: CJ_LuYa1
+    2100006: CJ_PuZhuang8
+    2100008: CJ_Lu1
+    2100010: CJ_PuZhuang3
+    2100012: CJ_PuZhuang1
+    2300000: YinCang_Che
+    2300002: YinCang_XinZeng
+    3300000: YinCang_Che
+    3300002: YinCang_XinZeng
+    4300000: YinCang_XinZeng
+    4300002: YinCang_Che
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/00JBHF/BF.FBX.meta

@@ -0,0 +1,146 @@
+fileFormatVersion: 2
+guid: 8f81398b807703f4d8e7fe4d8dc4cc7a
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: beng1
+    100002: beng2
+    100004: beng3
+    100006: beng4
+    100008: //RootNode
+    100010: BF_WZ
+    100012: guanxian
+    100014: TM
+    400000: beng1
+    400002: beng2
+    400004: beng3
+    400006: beng4
+    400008: //RootNode
+    400010: BF_WZ
+    400012: guanxian
+    400014: TM
+    2100000: BF_SX_Color
+    2100002: JBHF_GNFQ1
+    2100004: TM
+    2300000: beng1
+    2300002: beng2
+    2300004: beng3
+    2300006: beng4
+    2300008: BF_WZ
+    2300010: guanxian
+    2300012: TM
+    3300000: beng1
+    3300002: beng2
+    3300004: beng3
+    3300006: beng4
+    3300008: BF_WZ
+    3300010: guanxian
+    3300012: TM
+    4300000: beng3
+    4300002: beng4
+    4300004: guanxian
+    4300006: BF_WZ
+    4300008: TM
+    4300010: beng1
+    4300012: beng2
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: BF_SX_Color
+    second: {fileID: 2100000, guid: 91861b749c03ab14085bbb051422a402, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: JBHF_GNFQ1
+    second: {fileID: 2100000, guid: a5ea349a902de454bbace1c8c9bd13aa, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: TM
+    second: {fileID: 2100000, guid: 4521864d016210b4f9a998cbaf710636, type: 2}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/00JBHF/Textures/BF_SX_Color.jpg.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 4f930884ae7a85d45aca05ce4ff5c78a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/00JBHF/ZhuTi/Materials/BF_SX_Color.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91861b749c03ab14085bbb051422a402
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/00JBHF/ZhuTi/Materials/JBHF_GNFQ1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5ea349a902de454bbace1c8c9bd13aa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/00JBHF/ZhuTi/Materials/TM.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4521864d016210b4f9a998cbaf710636
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/BaseUI/BaseInstanceMono.cs

@@ -53,6 +53,7 @@ public abstract class BaseInstanceMono : MonoBehaviour
         MessageDispatcher.RemoveListener("CANCEL_SELECTED_COMMAND", Close);//ESC取消选中处理
         MessageDispatcher.RemoveListener("DELETE_ALL_COMMAND", Close);
         MessageDispatcher.RemoveListener("DELETE_COMMAND", Close);
+        MessageDispatcher.RemoveListener("RADIO_SELECTED_COMMAND", RadioSelect);//单选选中处理
     }
     private void OnDestroy()
     {

Assets/Scripts/DisasterSetting/FireSettingPanel.cs

@@ -362,7 +362,7 @@ public class FireSettingPanel : ResourceLoadPanel<FireSettingPanel>
                             }
                             else
                             {
-                                if (Mathf.Abs(hit.transform.position.y - NowObj.transform.position.y) > 2)
+                                if (Mathf.Abs(hit.transform.position.y - NowObj.transform.position.y) > 3)
                                     return;
                             }
                             if (PathPointList.Count == 0)//第一次设置或重置后再设置蔓延路径的情况

Assets/Scripts/Equip/Bag/BagPanel.cs

@@ -42,6 +42,7 @@ public class BagPanel : ResourceLoadPanel<BagPanel>
     {
         //隐藏背包时清空
         Empty();
+        MessageDispatcher.RemoveListener("BagChaneg", BagInfoChange);
     }
     private void OnDestroy()
     {

Assets/Scripts/Equip/EquipNumSelect/EquipNumSelectPanel.cs

@@ -28,6 +28,10 @@ public class EquipNumSelectPanel : ResourceLoadPanel<EquipNumSelectPanel>
     {
         MessageDispatcher.RemoveListener("EquipItemSelectMore", SelectMore);
     }
+    private void OnDestroy()
+    {
+        MessageDispatcher.RemoveListener("EquipItemSelectMore", SelectMore);
+    }
     private void SelectMore(IMessage obj)
     {
         Toggle sender = (Toggle)obj.Data;

Assets/Scripts/Power/FiremanSkill/XiaoFangYuanDrawLine.cs

@@ -810,7 +810,7 @@ public class XiaoFangYuanDrawLine : MonoBehaviour
         cloneObj.transform.parent = prlineObj.transform;
         cloneObj.transform.forward = (cloneObj.transform.position - placementPos).normalized;//改变线条的朝向
         float distance = Vector3.Distance(placementPos, placementPos2);//计算两点的距离
-        cloneObj.transform.localScale = new Vector3(6f, 6f, distance * jugelength);//延长线条，连接两点。
+        cloneObj.transform.localScale = new Vector3(24f, 24f, distance * jugelength);//延长线条，连接两点。
         cloneObj.GetComponent<DrawLinMessage>().Linelength = distance;
         cloneObj.GetComponent<DrawLinMessage>().AllLength = getDrawLine() + distance;
         Record(cloneObj.GetComponent<DrawLinMessage>(), false, true);

Assets/Scripts/Power/Task/ControlTruckArm.cs

@@ -188,6 +188,7 @@ public abstract class ControlTruckArm : MonoBehaviour
         MessageDispatcher.RemoveListener("PackUpTheLiftArm", PackUpTheLiftArm);
         MessageDispatcher.RemoveListener("FixedSupport", FixedSupport);
         MessageDispatcher.RemoveListener("RADIO_SELECTED_COMMAND", RadioSelect);
+        MessageDispatcher.RemoveListener("ReplayEvent", ReplayAgent);
     }
     void OnEnable()
     {

Assets/Scripts/Replay/NodeDetailShow.cs

@@ -13,7 +13,7 @@ public class NodeDetailShow : MonoBehaviour, IPointerClickHandler
     private float time;
     public TagShow TagShow;
     // Use this for initialization
-    void Start()
+    void Awake()
     {
         TagShow = GameObject.Find("Canvas/TopUI/TagPanel/TagShow") .GetComponent<TagShow>();
     }
@@ -45,10 +45,15 @@ public class NodeDetailShow : MonoBehaviour, IPointerClickHandler
     public void SetControl() 
     {
         control = false;
+        if (GameObject.Find("Canvas/TopUI/TagPanel/TagShow")) 
+        {
+            TagShow= GameObject.Find("Canvas/TopUI/TagPanel/TagShow").GetComponent<TagShow>();
             TagShow.tagDetail.SetActive(false);
             TagShow.tagMessage.SetActive(false);
             TagShow.gameObject.SetActive(false);
 
+        }
+
         gameObject.SetActive(false);
     }
     public void OnPointerClick(PointerEventData eventData)

Assets/Scripts/Replay/ReplayManager.cs

@@ -388,6 +388,7 @@ public class ReplayManager : MonoBehaviour
         if (replayTime > jsonData.sumTime)
         {
             ReplayStatus = ReplayStatus.over;
+            nodeDetailShow.GetComponent<NodeDetailShow>().SetControl();
             playOrPause.isOn = false;
             ReplaySetting.PlayStatus = PlayStatus.normal;
             ChangeReplaySpeed = null;//回放结束清空关心回放速度的事件