接口完善

3DModule/Assets/_DTYJ/Scripts/AnimPlayer/ZhaJiCtrl.cs

@@ -10,10 +10,20 @@ namespace DTYJ
     public class ZhaJiCtrl : SerializedMonoBehaviour
     {
         public static ZhaJiCtrl Instance;
+        private Dictionary<MeshRenderer, Material> dicMatOld;
         private void Awake()
         {
             Instance = this;
         }
+        private void Start()
+        {
+            dicMatOld = new Dictionary<MeshRenderer, Material>();
+            foreach (var item in dic)
+            {
+                dicMatOld[item.Value.mrJin] = item.Value.mrJin.material;
+                dicMatOld[item.Value.mrChu] = item.Value.mrChu.material;
+            }
+        }
         public Material mKai, mGuan;
         public Dictionary<string, ZhaJiModelItem> dic = new Dictionary<string, ZhaJiModelItem>();
         [Serializable]
@@ -41,11 +51,16 @@ namespace DTYJ
                     item.mrChu.material = mGuan;
                 }
                 else
-                {//TODO 乘客导航方向需要变更
-                    if (dir != 0 && dir != 1)
-                        return;
-                    item.mrJin.material = dir == 0 ? mKai : mGuan;
-                    item.mrChu.material = dir == 1 ? mKai : mGuan;
+                {
+                    item.mrJin.material = dicMatOld[item.mrJin];
+                    item.mrChu.material = dicMatOld[item.mrChu];
+                    if (dir == 0 || dir == 1)
+                    {//TODO 乘客导航方向需要变更
+                        Debug.LogWarning("变更闸机方向");
+                        return;//张海军接口方向控制错误，直接返回，不受他direction字段控制闸机方向
+                        item.mrJin.material = dir == 0 ? mKai : mGuan;
+                        item.mrChu.material = dir == 1 ? mKai : mGuan;
+                    }
                 }
             }
         }

3DModule/Assets/_DTYJ/Scripts/Data/DataModel.cs

@@ -139,7 +139,7 @@ namespace DTYJ
         /// <summary>
         /// ½øÕ¾ËÙ¶È ÈË/min
         /// </summary>
-        public float speedOfEntry;
+        public double speedOfEntry;
     }
     #endregion
 
@@ -187,7 +187,7 @@ namespace DTYJ
         /// </summary>
         public int emergencyRelease;
     }
-    public class LCW_opt : JsonData
+    public class LCW_opt
     {
         public string platformDoorNo;
         /// <summary>

3DModule/Assets/_DTYJ/Scripts/Online/Core/OnlineCtrl.Client.cs

@@ -120,6 +120,7 @@ namespace DTYJ
         {//加入房间成功
             Main.Instance.uiMainMenu.Show角色选择面板(false);
             mineRoleName = roleName;
+            Main.Instance.uiMainMenu?.ClearPositionJump();
             Main.Instance.uiMainMenu?.InitPositionJump();
         }
 

3DModule/Assets/_DTYJ/Scripts/OptEquip/OptEquip.cs

@@ -76,6 +76,17 @@ namespace DTYJ
             if (equipitem != null)
             {
                 var qei = equipitem.GetComponent<OptEquipItem>();
+                if (!string.IsNullOrEmpty(qei.needTool) && UIToolPanel.instance != null)
+                {
+                    if (qei.needTool == UIToolPanel.instance.nowSelected)
+                    {
+                    }
+                    else
+                    {
+                        MainEntry.CommonUI.messageBox.ShowMessage("需要钥匙：" + qei.needTool);
+                        return;
+                    }
+                }
                 if (equipitem.操作方式 != null && equipitem.操作方式.Length > 0)
                 {
                     Main.Instance.uiMainMenu.ShowFloatMenu(equipitem.equipName + equipitem.id, equipitem.操作方式, (v) =>

3DModule/Assets/_DTYJ/Scripts/OptEquip/OptEquipItem.cs

@@ -10,6 +10,7 @@ namespace DTYJ
     {
         public string equipName;
         public string id;
+        public string needTool;
 
         public static Dictionary<string, List<OptEquipItem>> dicOptEquipItems = new Dictionary<string, List<OptEquipItem>>();
 

3DModule/Assets/_DTYJ/Scripts/ShuiZai/ShuiZaiCtrl.cs

@@ -65,7 +65,7 @@ namespace DTYJ
         public void OnFluidComing()
         {
             //flowModifierAddLiquid_down.Strength = depth;
-            ControllerPanel.instance?.CmdSetShuiZai_down(3.9f);
+            ControllerPanel.instance?.CmdSetShuiZai_down(1.5f);
         }
         public void OnFluidLeave()
         {

3DModule/Assets/_DTYJ/Scripts/Train/TrainCtrl.cs

@@ -159,7 +159,7 @@ namespace DTYJ
             else
             {
                 Debug.LogWarning("ÎÞ¸ÃÇø¶Î¶¨µã£º" + trainInfo.blockNo);
-                return null;
+                //return null;
                 int nIndex;
                 if (int.TryParse(trainInfo.trainNo, out nIndex))
                     return Vector3.down * 1000 * nIndex;

3DModule/Assets/_DTYJ/Scripts/UI/ControllerPanel.cs

@@ -79,7 +79,7 @@ namespace DTYJ
             int index = 0;
             foreach (var kvp in dicSW)
             {
-                cmdObj.kvp[index] = new ShuiWei_opt.Info() { postion = kvp.Key, value = kvp.Value };
+                cmdObj.kvp[index++] = new ShuiWei_opt.Info() { postion = kvp.Key, value = kvp.Value };
             }
             NetworkAnimPlayer.instance.SendCmdToServer(20601, cmdObj);
         }

3DModule/Assets/_DTYJ/Scripts/UI/MainMenu.prefab

@@ -30,7 +30,7 @@ RectTransform:
   m_Children:
   - {fileID: 8170819312020167836}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -690,6 +690,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 4341467620625023300}
   - {fileID: 8938230289578953566}
   - {fileID: 356619906981831419}
   - {fileID: 8913221988810679513}
@@ -699,7 +700,6 @@ RectTransform:
   - {fileID: 4109957315320890422}
   - {fileID: 2113608746922079530}
   - {fileID: 5162859815058706501}
-  - {fileID: 4341467620625023300}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1259,7 +1259,7 @@ RectTransform:
   m_Children:
   - {fileID: 1982090199347881399}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1312,7 +1312,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1530,7 +1530,7 @@ RectTransform:
   m_Children:
   - {fileID: 2026691566630994813}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1653,6 +1653,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 6735834436053453709}
   - {fileID: 2415615620938155592}
   m_Father: {fileID: 4341467620625023300}
   m_RootOrder: 0
@@ -1660,7 +1661,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 97.64, y: 61.9656}
+  m_SizeDelta: {x: 0, y: 61.9656}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &9220548359324994049
 CanvasRenderer:
@@ -1691,7 +1692,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1713,12 +1714,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
+    m_Left: 5
+    m_Right: 5
+    m_Top: 5
+    m_Bottom: 5
   m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 5
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -2016,7 +2017,7 @@ RectTransform:
   m_Children:
   - {fileID: 7232619559106983276}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2482,9 +2483,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2609,7 +2610,7 @@ RectTransform:
   m_Children:
   - {fileID: 1728706539235478557}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3290,7 +3291,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4341467620625023300
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3306,7 +3307,7 @@ RectTransform:
   - {fileID: 8509888675757420399}
   - {fileID: 3737223511977944456}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 9
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3327,10 +3328,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   dicPic:
     keyData:
-    - "\u94A5\u53191"
-    - "\u94A5\u53192"
+    - "PSL\u94A5\u5319"
+    - "\u7AEF\u5934\u95E8\u94A5\u5319"
+    - "LCW\u94A5\u5319"
     valueData:
-    - {fileID: 21300000, guid: ee24dcb52cd04fb4aad5f49c8e2939a2, type: 3}
+    - {fileID: 21300000, guid: a13f953251b7c7e45afd91a114af04ac, type: 3}
+    - {fileID: 21300000, guid: a13f953251b7c7e45afd91a114af04ac, type: 3}
     - {fileID: 21300000, guid: a13f953251b7c7e45afd91a114af04ac, type: 3}
   nowSelected: 
 --- !u!1 &4818739807788207203
@@ -4314,7 +4317,7 @@ RectTransform:
   m_Children:
   - {fileID: 5835942518501088999}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -4505,12 +4508,12 @@ RectTransform:
   m_Children:
   - {fileID: 2969787040987880132}
   m_Father: {fileID: 8509888675757420399}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 48.82, y: -30.9828}
-  m_SizeDelta: {x: 97.64, y: 61.9656}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 97.64, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5977821333204701706
 CanvasRenderer:
@@ -5237,7 +5240,7 @@ RectTransform:
   m_Children:
   - {fileID: 5965458911107840744}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5362,6 +5365,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6442644661534843532
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6735834436053453709}
+  - component: {fileID: 6179348104272355818}
+  - component: {fileID: 8411066730878186137}
+  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 &6735834436053453709
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6442644661534843532}
+  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: 8509888675757420399}
+  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: 70, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6179348104272355818
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6442644661534843532}
+  m_CullTransparentMesh: 1
+--- !u!114 &8411066730878186137
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6442644661534843532}
+  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: 0, b: 0, 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: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u5DE5\u5177\u9009\u62E9\uFF1A"
 --- !u!1 &6501528895305158074
 GameObject:
   m_ObjectHideFlags: 0
@@ -6670,7 +6753,7 @@ RectTransform:
   m_Children:
   - {fileID: 2420289379534949514}
   m_Father: {fileID: 8582335586230422868}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

3DModule/Assets/_DTYJ/Scripts/UI/UIMainMenu.cs

@@ -35,7 +35,7 @@ namespace DTYJ
             toggle车站值班员.onValueChanged.AddListener((v) => { OnToggleRole_Role(RoleName.车站值班员, v); });
             toggle站务员_站台.onValueChanged.AddListener((v) => { OnToggleRole_Role(RoleName.站务员_站台, v); });
             toggle站务员_站厅.onValueChanged.AddListener((v) => { OnToggleRole_Role(RoleName.站务员_站厅, v); });
-
+            SetToggleState(toggle站务员_站台, Main.Instance.onlineNetwork.networkManager.mode == Mirror.NetworkManagerMode.Host);
             Show角色选择面板(false);
         }
         RoleName roleSelected = 0;
@@ -60,7 +60,8 @@ namespace DTYJ
             roleList = roleName;
             SetToggleState(toggle值班站长, (roleList & RoleName.值班站长) == RoleName.值班站长);
             SetToggleState(toggle车站值班员, (roleList & RoleName.车站值班员) == RoleName.车站值班员);
-            SetToggleState(toggle站务员_站台, (roleList & RoleName.站务员_站台) == RoleName.站务员_站台);
+            //SetToggleState(toggle站务员_站台, (roleList & RoleName.站务员_站台) == RoleName.站务员_站台);
+            SetToggleState(toggle站务员_站台, Main.Instance.onlineNetwork.networkManager.mode == Mirror.NetworkManagerMode.Host || (roleList & RoleName.站务员_站台) == RoleName.站务员_站台);
             SetToggleState(toggle站务员_站厅, (roleList & RoleName.站务员_站厅) == RoleName.站务员_站厅);
         }
         private void SetToggleState(Toggle toggle, bool isSelected)
@@ -208,6 +209,15 @@ namespace DTYJ
         public GameObject goBtnOrig;
         //private List<string> listPostions = new List<string>() { "1出口", "2出口" };
         List<string> zhanwuyuanList = new List<string>() { "站台A端", "站台B端" };
+        private Dictionary<string, GameObject> dicBtnJump = new Dictionary<string, GameObject>();
+        public void ClearPositionJump()
+        {
+            foreach(var item in dicBtnJump.Values)
+            {
+                DestroyImmediate(item.gameObject);
+            }
+            dicBtnJump.Clear();
+        }
         public void InitPositionJump()
         {
             goBtnOrig.SetActive(false);
@@ -237,6 +247,8 @@ namespace DTYJ
                     }
                     catch { }
                 });
+                dicBtnJump[btnName] = btnNew;
+
             }
 
             foreach (var t in TrainCtrl.TrainCtrlDic)

3DModule/Assets/_DTYJ/Scripts/UI/UIToolPanel.cs

@@ -10,13 +10,14 @@ namespace DTYJ
 {
     public class UIToolPanel : MonoBehaviour
     {
-
+        public static UIToolPanel instance;
         public DicStringSprite dicPic;
         private GameObject goItem;
         private Transform tfImage;
         private void Awake()
         {
-            goItem = transform.GetChild(0).GetChild(0).gameObject;
+            instance = this;
+            goItem = transform.GetChild(0).GetChild(1).gameObject;
             goItem.SetActive(false);
             tfImage = transform.GetChild(1);
             Init();