Update app.py

app.py

@@ -672,65 +672,67 @@ elif not st.session_state['consent_given']:
                 st.warning("Please select an option to continue.")
 
 
-# --- Game Setup / Main Interface Logic ---
+# --- Main Application Flow ---
 else:
-    # --- Game Setup & Instructions ---
-    if 'game_state' not in st.session_state or not st.session_state.game_state.get('game_running', False):
+    # 1. 检查 Game Over 状态 (最高优先级)
+    is_game_state_present = st.session_state.get('game_state') is not None
+    is_game_running = st.session_state.get('game_state', {}).get('game_running', False)
+    is_game_over = is_game_state_present and not is_game_running and st.session_state.get('game_state', {}).get('week', 0) > WEEKS
+
+    if is_game_over:
+        # --------------------------------------------------------------------------
+        # --- Game Over Interface ---
+        # --------------------------------------------------------------------------
+        st.header("🎉 Game Over!")
+        state = st.session_state.game_state
+        participant_id = state['participant_id'] # 获取ID
         
+        # [NEW]: Survey Link Generation (英文显示)
+        personalized_survey_url = f"{QUALTRICS_BASE_URL}?{PID_FIELD_NAME}={participant_id}"
+
+        st.markdown("---")
+        st.header("📋 Experiment Wrap-up: Please Complete the Survey")
+        st.warning(f"Your Experiment ID is: **{participant_id}**. Please click the link below to complete the final survey. **This survey will automatically link to your experiment data.**")
+
+        st.markdown(
+            f"""
+            <a href="{personalized_survey_url}" target="_blank">
+                <button style="background-color: #4CAF50; color: white; padding: 15px 32px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; margin: 4px 2px; cursor: pointer; border: none; border-radius: 8px;">
+                    Click Here to Start the Survey
+                </button>
+            </a>
+            """,
+            unsafe_allow_html=True
+        )
+
         st.markdown("---")
-        st.header("⚙️ Game Configuration")
-        
-        # =============== 1. NEW: Participant ID Input ===============
-        participant_id = st.text_input("Enter Your Name or Team ID:", key="participant_id_input", placeholder="e.g., Team A")
-        # =======================================================
         
-        # =============== 1. MODIFIED: 自动分配逻辑 (移除手动选择) ===============
-        if participant_id:
-            # 使用哈希和模运算，将用户均匀分配到 4 个实验组
-            setting_index = hash(participant_id) % len(EXPERIMENT_SETTINGS) 
-            llm_personality, info_sharing = EXPERIMENT_SETTINGS[setting_index]
-        else:
-            # 默认值，如果未输入ID
-            llm_personality, info_sharing = ('human_like', 'local') 
+        try:
+            logs_df = pd.json_normalize(state['logs'])
+            fig = plot_results(
+                logs_df,
+                f"Beer Game (Human: {state['human_role']})",
+                state['human_role']
+            )
+            st.pyplot(fig)
+            save_logs_and_upload(state) # Uploads data/updates leaderboard
+        except Exception as e:
+            st.error(f"Error generating final report or saving data: {e}")
             
-        # [修改点 2.2]: 移除启动时显示实验条件的提示
-        # st.info(f"You will be automatically assigned to the condition: **{llm_personality.replace('_', ' ').title()} / {info_sharing.title()}**.")
-        # =================================================================
-        
-        # 移除原有的 c1, c2 和 selectbox 
-        # c1, c2 = st.columns(2)
-        # with c1:
-        # with c2:
-        
-        # =============== MODIFIED: Start Game Button ===============
-        if st.button("🚀 Start Game", type="primary", disabled=(client is None)):
-            if not participant_id:
-                st.error("Please enter a Name or Team ID to start!")
-            else:
-                existing_data = load_leaderboard_data()
-                if participant_id in existing_data:
-                    # 如果ID已存在，添加一个session_state标志，要求再次点击
-                    if st.session_state.get('last_id_warning') == participant_id:
-                        # 这是第二次点击，确认覆盖
-                        st.session_state.pop('last_id_warning', None)
-                        init_game_state(llm_personality, info_sharing, participant_id) # 使用自动分配的值
-                        st.rerun()
-                    else:
-                        st.session_state['last_id_warning'] = participant_id
-                        st.warning(f"ID '{participant_id}' already exists! Your score will be overwritten. Click 'Start Game' again to confirm.")
-                else:
-                    # 新ID，直接开始
-                    if 'last_id_warning' in st.session_state:
-                        del st.session_state['last_id_warning']
-                    init_game_state(llm_personality, info_sharing, participant_id) # 使用自动分配的值
-                    st.rerun()
-        # ===========================================================
-        
-        # =============== NEW: Show Leaderboard on Start Page ===============
         show_leaderboard_ui()
-        # =================================================================
-    # --- Main Game Interface ---
-    elif 'game_state' in st.session_state and st.session_state.game_state.get('game_running'):
+        if st.button("✨ Start a New Game"):
+            # 在重置游戏时清除所有与实验相关的时间戳
+            if 'consent_timestamp' in st.session_state: del st.session_state['consent_timestamp']
+            if 'consent_given' in st.session_state: del st.session_state['consent_given']
+            del st.session_state.game_state
+            st.rerun()
+
+
+    # 2. 检查 Game Running 状态 (第二优先级)
+    elif is_game_running:
+        # --------------------------------------------------------------------------
+        # --- Main Game Interface ---
+        # --------------------------------------------------------------------------
         state = st.session_state.game_state
         week, human_role, echelons, info_sharing = state['week'], state['human_role'], state['echelons'], state['info_sharing']
         echelon_order = ["Retailer", "Wholesaler", "Distributor", "Factory"] # Define here for UI
@@ -895,60 +897,11 @@ else:
             del st.session_state.game_state
             st.rerun()
 
-    # --- Game Over Interface ---
-    elif 'game_state' in st.session_state and not st.session_state.game_state.get('game_running', False) and st.session_state.game_state.get('week', 0) > WEEKS:
-        st.header("🎉 Game Over!")
-        state = st.session_state.game_state
-        participant_id = state['participant_id'] # 获取ID
-        
+    # 3. Game Setup (默认屏幕 / 游戏已重置)
+    else:
         # --------------------------------------------------------------------------
-        # [NEW SECTION]: Survey Link Generation
+        # --- Game Setup & Instructions ---
         # --------------------------------------------------------------------------
-        # Your Qualtrics URL and PID field name
-        personalized_survey_url = f"{QUALTRICS_BASE_URL}?{PID_FIELD_NAME}={participant_id}"
-
-        st.markdown("---")
-        st.header("📋 Experiment Wrap-up: Please Complete the Survey")
-        st.warning(f"Your Experiment ID is: **{participant_id}**. Please click the link below to complete the final survey. **This survey will automatically link to your experiment data.**")
-
-        st.markdown(
-            f"""
-            <a href="{personalized_survey_url}" target="_blank">
-                <button style="background-color: #4CAF50; color: white; padding: 15px 32px; text-align: center; text-decoration: none; display: inline-block; font-size: 16px; margin: 4px 2px; cursor: pointer; border: none; border-radius: 8px;">
-                    Click Here to Start the Survey
-                </button>
-            </a>
-            """,
-            unsafe_allow_html=True
-        )
-
-        st.markdown("---")
-        # --------------------------------------------------------------------------
-        
-        try:
-            logs_df = pd.json_normalize(state['logs'])
-            fig = plot_results(
-                logs_df,
-                f"Beer Game (Human: {state['human_role']})",
-                state['human_role']
-            )
-            st.pyplot(fig)
-            save_logs_and_upload(state) # This now also updates the leaderboard
-        except Exception as e:
-            st.error(f"Error generating final report: {e}")
-        show_leaderboard_ui()
-        if st.button("✨ Start a New Game"):
-            # 在重置游戏时清除所有与实验相关的时间戳
-            if 'consent_timestamp' in st.session_state: del st.session_state['consent_timestamp']
-            if 'consent_given' in st.session_state: del st.session_state['consent_given']
-            del st.session_state.game_state
-            st.rerun()
-    
-    # --- Fallback: Game Setup (Default Screen) ---
-    else:
-        # This is the original Game Setup logic when game_state does not exist or is just cleared.
-        # This covers the scenarios: Before Week 1, or after a full game reset.
-        
         st.markdown("---")
         st.header("⚙️ Game Configuration")