1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- [1mdiff --git a/YAServerDlg.cpp b/YAServerDlg.cpp[m
- [1mindex b3b837a..3444397 100644[m
- [1m--- a/YAServerDlg.cpp[m
- [1m+++ b/YAServerDlg.cpp[m
- [36m@@ -12868,6 +12868,10 @@[m [mvoid CYAServerDlg::parse_data_server( const BYTE * pData, int nLen, CONNID dwCon[m
- LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_98);[m
- send_tcp_thread_message(data);[m
- }[m
- [32m+[m [32melse[m
- [32m+[m [32m{[m
- [32m+[m [32mLOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_273);[m
- [32m+[m [32m}[m
- read_length += pkg_len;[m
- }[m
- [m
- [36m@@ -16526,13 +16530,13 @@[m [mvoid CYAServerDlg::change_monkeycar_index()[m
- card->m_MonkeyCarIndex++;[m
- if (card->m_MonkeyCarIndex >= card->getPointSize())[m
- {[m
- [31m- card->m_MonkeyCarIndex = card->getPointSize();[m
- [32m+[m [32mcard->m_MonkeyCarIndex = card->getPointSize()-1;[m
- }[m
- }[m
- else if(POSTIVE_DIRECTION == card->m_direction)[m
- {[m
- card->m_MonkeyCarIndex--;[m
- [31m- if (card->m_MonkeyCarIndex == 0)[m
- [32m+[m [32mif (card->m_MonkeyCarIndex <= 0)[m
- {[m
- card->m_MonkeyCarIndex = 0;[m
- }[m
- [1mdiff --git a/system_basic_info/SystemAnalysis.h b/system_basic_info/SystemAnalysis.h[m
- [1mindex 8b56e69..8e28b72 100644[m
- [1m--- a/system_basic_info/SystemAnalysis.h[m
- [1m+++ b/system_basic_info/SystemAnalysis.h[m
- [36m@@ -278,7 +278,7 @@[m [mtypedef enum StationSyncBasicBranch[m
- LOCATION_SYSTEM_BRANCH_270, //used[m
- LOCATION_SYSTEM_BRANCH_271, //used[m
- LOCATION_SYSTEM_BRANCH_272, //used[m
- [31m- LOCATION_SYSTEM_BRANCH_273,[m
- [32m+[m [32mLOCATION_SYSTEM_BRANCH_273, //used[m
- LOCATION_SYSTEM_BRANCH_274,[m
- LOCATION_SYSTEM_BRANCH_275,[m
- LOCATION_SYSTEM_BRANCH_276,[m
|