Merge remote-tracking branch 'origin/Huang' into main_ZYT

# Conflicts:
#	Assets/_Valheim/Scripts/GameInit.cs
#	ProjectSettings/ProjectSettings.asset

Assets/_Valheim/Scripts/GameInit.cs

@@ -8,6 +8,22 @@ using UnityEngine.AI;
 using UnityEngine.XR.Interaction.Toolkit;
 using Wave.Native;
 
+public enum GameKey
+{
+    DinosaurPark2=0,//重返侏罗纪
+    SpongeBob=1,//深海冒险
+    XMen=2,//银河守护者
+    KOF=3,//幻影交锋
+    Valheim=4,//小小幻宠
+    FutureMen=5,//未来战警
+    AliceBall=6,//爱丽丝的舞会
+    Zombie=7,//僵尸来了
+    DefendNJ=8,//保卫金陵
+    Loong=9, //巨龙猎人
+    MRCS=10,//火力对决
+    SXDMystery=11,//三星堆之谜
+}
+
 namespace Valheim
 {
     public enum Place
@@ -103,14 +119,6 @@ namespace Valheim
         Henan_Kaifeng_Longting_XihuJingqu_Shiwai = 71,
         Jiangxi_Nanchang_Xihu_NanchangDongwuyuan = 72,
         Liaoning_Panjin_Xinglongtai_Shuiyoucheng = 73,
-        Shanxi_Yulin_Shenmu_Liuta_Yuyuecheng = 74,
-        Sichuan_Liangshan_Mianning_GaoyangJiedao = 75,
-        Jiangxi_Nanchang_Xihu_NanchangDongwuyuan_Shinei=76,
-        Ningxia_Yinchuan_Xingqing_XinhuaBaihuo=77,
-        Liaoning_Huludao_Jianchang_XinglongDajiating=78,
-        Ningxia_Yinchuan_Xingqing_XinhuaBaihuo_Shiwai = 79,
-        Ningxia_Wuzhong_Litong_YiwuShangmaocheng=80,
-        Gansu_Dingxi_Anding_WandaGuangchang=81,
     }
 
     public enum Bgm
@@ -154,9 +162,8 @@ namespace Valheim
         public Player self;
         [Header("场地")]
         public Place place = Place.GongSi1Lou;
-        
-        
-        public float curGameTime = 0;
+        // 版本号
+        public GameKey gameId;
         
         private NavMeshDataInstance currentInstance;
         public void Close()
@@ -168,7 +175,7 @@ namespace Valheim
         void Start()
         {
             Ins = this;
-            //HttpServer.Ins.gameId = GameKey.Valheim;
+            gameId = GameKey.Valheim;
             Application.targetFrameRate = 60;
             //ConPanel.Show();
             
@@ -254,10 +261,5 @@ namespace Valheim
             // 加载新的NavMesh
             currentInstance = NavMesh.AddNavMeshData(data);
         }
-        
-        public int GetNowTime()
-        {
-            return Mathf.RoundToInt(curGameTime);
-        }
     }
 }