Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

Assets/_DefendNJ/Scenes/ShanDong_Langfang_QingzhouTaihuacheng.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55393f2f8ec3e384fa613d94c3729381
+guid: c2bd42927da13764497f27393ac3d4cc
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/_DefendNJ/Scripts/GameLocal.cs

@@ -134,9 +134,10 @@ public class GameLocal : MonoBehaviour
             authInfo.deviceSn = GetSn();
             authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + "";
             authInfo.shop = 0;
-#if !UNITY_EDITOR && UNITY_ANDROID && PICO
             authInfo.shop = (int)place;
-            if (place == Place.Yangzhou_Hanjiang_Tansuozhongxin_wai)
+            
+#if !UNITY_EDITOR && UNITY_ANDROID && PICO
+            if (place == Place.Yangzhou_Hanjiang_TansuoZhongxin_wai)
                 authInfo.shop = 5;
             if (place == Place.Shandong_Jining_Shangchang_nei)
                 authInfo.shop = 9;

Assets/sucai/场景/城门2.controller

@@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8294331832924303712
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: isOpen
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5429871227428060119}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-7491227828184373723
 AnimatorStateMachine:
   serializedVersion: 6
@@ -11,7 +36,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 5429871227428060119}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 240, y: 70, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -739290311019389727}
+    m_Position: {x: 240, y: 150, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -21,7 +49,34 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 5429871227428060119}
+  m_DefaultState: {fileID: -739290311019389727}
+--- !u!1102 &-739290311019389727
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -8294331832924303712}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -30,7 +85,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: "\u57CE\u95E82"
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: isOpen
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

ProjectSettings/EditorBuildSettings.asset

@@ -5,9 +5,12 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/_DefendNJ/Scenes/Company1Floor.unity
     guid: 386a8fdea01af8a4e8d4a9835407ddec
+  - enabled: 1
+    path: Assets/_DefendNJ/Scenes/ShanDong_Langfang_QingzhouTaihuacheng.unity
+    guid: c2bd42927da13764497f27393ac3d4cc
   m_configObjects:
     Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
       type: 2}

ProjectSettings/ProjectSettings.asset

@@ -142,7 +142,9 @@ PlayerSettings:
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
   bundleVersion: 1.0.0
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2}
+  - {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -163,7 +165,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.pineappletech.defendjinling.gongsi1lou
+    Android: com.pineappletech.defendjinling.shandonglangfangqingzhoutaihuacheng
     Standalone: com.DefaultCompany.com.unity.template.ar
   buildNumber:
     Standalone: 0