最新对接硬件提交

Assets/StreamingAssets/daoNiaoShu/SaveData/BaChuDaoNiaoGuanState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bbe8c82464f845b4ea08201be0040a23
+guid: c8d991d9f4adfb54499c95a54b18de25
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/BaoLuYinJingState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bb80546d0e11d794cb2b49d89ff3f6cc
+guid: e15728b427d777e4abbf594af56c6e14
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/BingLiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae5eff71107eaeb469959045bc0597eb
+guid: 6c7b51a9128a34746b453de54577a60c
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/CaoZuoHouZhuFuState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21b1ef0ebc17b954586f7b1bafe1109b
+guid: e35c78b3e389e844ea6c24b40fad52c5
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/CeLiangFangFaState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6ad5082e091ab1941a74c78d42feec05
+guid: 42d4fa256c5848d45a53a6524bfe2d50
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/ChaGuanState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84e050e4a67a2f74eb7200d8e2c740c9
+guid: ad1da70be649f0d43bb79dcc1935380b
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/ChongXiBaoPiQiangState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a19ee9ef39ed5942b3043f92b1dea9b
+guid: 7669d6bb69c7d7d4a96474d35372d2bb
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/DaKaiDaoNiaoGuanState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21838237f1098f7488095d01524bd140
+guid: 4654736ee4a023b4cbef01f5ec4aceaa
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/DaiWuJunShouTaoState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 260892d36ec445c4eb86b7769b06424c
+guid: 580007b12d373ed43bfe9eca74d51d9c
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/GengHuanWuJunShouTaoState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d36326088d748b046ae6cf184d37a565
+guid: f76ad67ebe4030f469c699098a8199cc
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/HuanQuanZhunBeiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bd6c4884be89b104d8117893952e3c18
+guid: 40322f39dbc7303459fd52af12374748
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/JieShiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6718822b768509b4a9989b3567924ed7
+guid: f842470df7b7213458b0bc9c85651bff
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/LianJieJiNiaoDaiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c233440dc5cd9064eb21303e38573158
+guid: a48a470d8b09f324492de1c5eb4e22af
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/PuJinState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f2df5591afaf4b340bdf22dcbace797a
+guid: fe8e488c0e8f3754190fd385d4e5a291
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/QingJieBaoPiKouState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 24cfde41472581143b3de383bf944296
+guid: 517be13412beb624a8ec12cb0b511bbf
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/QingJieNiaoDaoKouState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2a6db3a3a93fa13429659d8a41e235c9
+guid: 760ac8e9ea2080447a6584a40f71e121
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/QingLiShengZhiQiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 82611ab085fa5024aaf70f78b24656bc
+guid: f300bde4674a43340a32d50a8df5178e
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/QuChuDaoNiaoGuanState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e54a4bcaabb88dc47a38016702824b49
+guid: 460d165ee0d3f5b4a9b341d63a665d8b
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/TiWeiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 48786099828b6e24a994dd5a36a1f81f
+guid: 7e2fe0dbc92aa2a48b6e6781ce92fbe1
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/TuMoKangShengSuRuanGaoState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 803a2d54868669a44985cac55c9904db
+guid: 6a35de43f44092b4dac405508b5f5a41
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/TuMoLiDuoKaYinState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: aa5b5aaaedf81094a8069209c01dee15
+guid: ece70af9d4796c94e93c7269732c2443
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/WuPinZhunBeiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8fba2aad4350f6241ab24ee82c0aad55
+guid: 3caab8610e579704d8d6d7fcf385c450
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/YiShengXiShouState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b538bee112f011479004eb345213fcf
+guid: ed94eec2d75a3a74d928310945336cec
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/YiShengZhunBeiState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1cdf9e397e10454da2d43f20e6b407f
+guid: 90145827cc60ab341af300f40d1f3db0
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/ZhengLiYongWuState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c8cf554d9e084244ba349919c8a44d57
+guid: f6d2b23a3c0e28e49a9d2125251c6e54
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/daoNiaoShu/SaveData/ZhiShiHuiGuState.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eebccac98f0418f4a9cdc3f9622cf569
+guid: bf58f2cb478bdef43a612b81a8b75823
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaChuDaoNiaoGuanState.cs

@@ -21,7 +21,7 @@ namespace DongWuYiXue.DaoNiaoShu
             cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
             {
                 isBaGuan = true;
-                avProValue.gameObject.SetActive(true);
+                //avProValue.gameObject.SetActive(true);
             });
         }
         public override void OnStateStay()

Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChongXiBaoPiQiangState.cs

@@ -1,5 +1,6 @@
 using FSM;
 using Unity.VisualScripting;
+using Unity.VisualScripting.Antlr3.Runtime;
 using UnityEngine;
 using ZXKFramework;
 namespace DongWuYiXue.DaoNiaoShu
@@ -13,6 +14,7 @@ namespace DongWuYiXue.DaoNiaoShu
         {
             base.OnStateEnter();
             this.Log("进入冲洗包皮腔状态");
+            isOpen = false;
             isTui = false;
             tuiValue = 0;
             ZhuSheQi = fsm.Get("20ml注射器放置后").GetComponent<HardwareControl>();
@@ -77,6 +79,8 @@ namespace DongWuYiXue.DaoNiaoShu
                 isTui = false;
                 fsm.nextState = true;
             }
+            //tuiValue = GameManager.Instance.senSor.GetSensor<ZhuSheQi_20SenSor>().progressValue;
+            //this.Error(tuiValue);
             if (isTui && GameManager.Instance.senSor.GetSensor<ZhuSheQi_20SenSor>().isOpen)
             {
                 isOpen = true;
@@ -85,19 +89,23 @@ namespace DongWuYiXue.DaoNiaoShu
             }
             if (isOpen && !GameManager.Instance.senSor.GetSensor<ZhuSheQi_20SenSor>().isOpen)
             {
-                tuiValue = 1.0f;
-                fsm.PlayClip("³åÏ´°üƤǻ_TimeLine", null, tuiValue);
-                if (fsm.main_gameModel.modeType == ModeType.ShiXun)
-                {
-                    fsm.AddScore(5, 1);
-                }
-                if (fsm.main_gameModel.modeType == ModeType.KaoHe)
-                {
-                    fsm.AddScore(5, 1);
-                }
-                isTui = false;
-                fsm.nextState = true;
+                fsm.PlayClip("³åÏ´°üƤǻ_TimeLine", null, 1.0f - tuiValue);
             }
+            //if (isOpen && !GameManager.Instance.senSor.GetSensor<ZhuSheQi_20SenSor>().isOpen)
+            //{
+            //    tuiValue = 1.0f;
+            //    fsm.PlayClip("³åÏ´°üƤǻ_TimeLine", null, tuiValue);
+            //    if (fsm.main_gameModel.modeType == ModeType.ShiXun)
+            //    {
+            //        fsm.AddScore(5, 1);
+            //    }
+            //    if (fsm.main_gameModel.modeType == ModeType.KaoHe)
+            //    {
+            //        fsm.AddScore(5, 1);
+            //    }
+            //    isTui = false;
+            //    fsm.nextState = true;
+            //}
             if (tuiValue == 0f && GameManager.Instance.senSor.GetSensor<ZhuSheQi_20SenSor>().isOpen && isTui)
             {
                 if (fsm.main_gameModel.modeType == ModeType.ShiXun)

log/ivw.log

@@ -12,3 +12,10 @@ E1125 15:23:37.581 35828:Res_mgr::Res_delete | res still been used, refCount = 1
 E1125 15:23:37.622 35828:Error: ret= 60010
 E1125 15:23:37.622 35828:IvwInterfaceImp::wIvwResourceDelete | ResType = IVW_KEYWORD, ResID = 119, ret = 60010
 E1125 15:23:37.622 35828:Error: ret= 60010
+Log file created at: 2025/11/27 10:34:24
+Running on machine: ADMIN
+Log line format: [IWEF]mmdd hh:mm:ss.mmm threadid: msg
+E1127 10:34:24.631 34800:Res_mgr::Res_delete | res still been used, refCount = 1 resId = 119 resType = IVW_KEYWORD
+E1127 10:34:24.659 34800:Error: ret= 60010
+E1127 10:34:24.659 34800:IvwInterfaceImp::wIvwResourceDelete | ResType = IVW_KEYWORD, ResID = 119, ret = 60010
+E1127 10:34:24.659 34800:Error: ret= 60010

msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat

@@ -1,3 +1,5 @@
-2025/11/26 17:25:25
+2025/11/27 17:09:09
 80580f9047ae7f4bd0325a05c2f5cdaa
-hňq
ÇĹ-wŮ—ü<E28094>Ö
8ZĚK~ßkFĎŕľřţŰL<12>w)=­`\’¸*ĺ“‘Éľ.×Ü*ŞŰu”śuÔ‡¨ö»źćÇ
ęľ.b=Ł#â@łŽ<C582>3ő'jxĘ·:„‰jE<6A>?”]VŐlţ$Ĺ|ł´
ęmĂe븇˛ÚŞW[“E0v1#Ü<>ÎŰČŽ
+–G»™€¦Y;ä'&ń“Hĺňëđ})ťK´z=y2ĎWwgřŮH7”9@µ{ö&}|®żsâţŤCÎ<î@_ů2E®¸×<¶<>up9t¦@vQ“éŽ=W
+·U;=:WŘ^Oń„äěJK`Š-…˛;‹ŰŮô
+á#Jň™]ęÇ°EŹďqă.ú5