修改山东济宁商场场景

2025-07-08 18:25:08 +08:00
parent fe1e7ece05
commit 7da5d97379
22 changed files with 20818 additions and 21050 deletions
--- a/Assets/DC/山东济宁（外）地形(改）.prefab
+++ b/Assets/DC/山东济宁（外）地形(改）.prefab
@ -0,0 +1,201 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1743202451946170408
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5653907068624287935}
+  m_Layer: 0
+  m_Name: "\u5C71\u4E1C\u6D4E\u5B81\uFF08\u5916\uFF09\u5730\u5F62(\u6539\uFF09"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5653907068624287935
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743202451946170408}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 23.55, y: 0, z: 4.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5040245059676764780}
+  - {fileID: 3521678880512585776}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7062037494040877039
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5040245059676764780}
+  - component: {fileID: 267478745116482998}
+  - component: {fileID: 3630154237862861361}
+  m_Layer: 0
+  m_Name: Rectangle001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5040245059676764780
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7062037494040877039}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -17.381462, y: -0.00005001068, z: -1.1335138}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5653907068624287935}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &267478745116482998
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7062037494040877039}
+  m_Mesh: {fileID: 3009663438640755768, guid: cb1e33127c0524c44bacad03fe2285e1, type: 3}
+--- !u!23 &3630154237862861361
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7062037494040877039}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2696937043520851984, guid: cb1e33127c0524c44bacad03fe2285e1, type: 3}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &8251164618512820810
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3521678880512585776}
+  - component: {fileID: 2244489168540980885}
+  - component: {fileID: 372099177191224735}
+  m_Layer: 0
+  m_Name: "\u5BF9\u8C61002"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3521678880512585776
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8251164618512820810}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -17.409481, y: 1.5000433, z: -1.1335144}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5653907068624287935}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2244489168540980885
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8251164618512820810}
+  m_Mesh: {fileID: 4017482625668419684, guid: cb1e33127c0524c44bacad03fe2285e1, type: 3}
+--- !u!23 &372099177191224735
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8251164618512820810}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -726483168369759614, guid: cb1e33127c0524c44bacad03fe2285e1, type: 3}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/DC/山东济宁（外）地形(改）.prefab.meta
+++ b/Assets/DC/山东济宁（外）地形(改）.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7d04e9c63a137f449aea162dec4a2d4f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/FR2_Cache.asset
+++ b/Assets/FR2_Cache.asset
--- a/Assets/Prefabs/Enemys/EnemyTa/EnemyTa.prefab
+++ b/Assets/Prefabs/Enemys/EnemyTa/EnemyTa.prefab
@ -140,7 +140,7 @@ Transform:
  m_GameObject: {fileID: 525740107473291644}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.54, y: 1.21, z: 0.66}
+  m_LocalPosition: {x: -0.54, y: 0, z: 0.66}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -10002,7 +10002,7 @@ Transform:
  m_GameObject: {fileID: 3344928435702968479}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.52, y: 1.21, z: 0.94}
+  m_LocalPosition: {x: 1.52, y: 0, z: 0.94}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -15074,6 +15074,7 @@ MonoBehaviour:
  - {fileID: 3961385576540091251}
  bossPos: {fileID: 4607672162728107533}
  bossDoorPos: {fileID: 0}
+  isDie: 0
 --- !u!65 &2323786932739962587
 BoxCollider:
  m_ObjectHideFlags: 0
@ -44726,7 +44727,7 @@ Transform:
  m_GameObject: {fileID: 7433961365544849739}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.19, y: 1.21, z: -0.38}
+  m_LocalPosition: {x: 1.19, y: 0, z: -0.38}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -44757,7 +44758,7 @@ Transform:
  m_GameObject: {fileID: 8371830928185234639}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.338, y: 1.21, z: 2.392}
+  m_LocalPosition: {x: 1.338, y: 0, z: 2.392}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
--- a/Assets/Resources/zh/Shandong_Jining_ShangchangData.json
+++ b/Assets/Resources/zh/Shandong_Jining_ShangchangData.json
@ -0,0 +1 @@
+{"EnemyData":{"Columns":["ID","EnemyId","Name","Name_CN","Atk","Speed","Rate","Hp","EnemyDesc","DescInfo"],"Values":[[ 0, 1,"EnemyTa","\u5916\u661F\u80FD\u6E90\u5854", 0, 3, 0, 2000,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 1, 2,"Enemy1","\u5916\u661F\u67AA\u624B", 100, 3, 0, 800,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 2, 3,"DropShip","\u5916\u661F\u98DE\u8239", 100, 3, 1.15, 30000,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 3, 4,"Leviathan","\u5916\u661F\u5229\u7EF4\u5766", 50, 5,0.8, 45000,"\u5168\u8EAB\u7531\u8F7B\u578B\u88C5\u7532\u5236\u9020\u800C\u6210\u7684\u4F4E\u6B66\u88C5\u4FA6\u5BDF\u578B\u673A\u5668\u4EBA\uFF0C\u884C\u52A8\u9AD8\u901F\u800C\u7075\u654F\uFF0C\u4F46\u662F\u9632\u62A4\u8F83\u5DEE\u3002","(1, 1, 1, 4)"],[ 4, 5,"Enemy2","\u98DE\u884C\u54E8\u5175", 80, 3,0.8, 1500,"\u52A8\u7269\u5F62\u6001\u7684\u517D\u578B\u5175\u79CD,\u8D34\u5730\u722C\u884C\u901F\u5EA6\u5F88\u5FEB,\u7528\u950B\u5229\u7684\u524D\u817F\u653B\u51FB.\u4E0D\u8981\u88AB\u4ED6\u4EEC\u5305\u56F4,\u5426\u5219\u4F1A\u906D\u53D7\u5DE8\u5927\u4F24\u5BB3.","(2, 2, 1, 3)"],[ 5, 6,"MachineDragon","\u673A\u68B0\u9738\u738B\u9F99", 150, 4,0.8, 50000,"\u94A2\u7259\u62A4\u536B\u7684\u5347\u7EA7\u578B\u53F7,\u66F4\u5927\u7684\u4F53\u578B\u4F1A\u5E26\u6765\u66F4\u5927\u7684\u4F24\u5BB3.","(3, 6, 6, 5)"],[ 6, 7,"Enemy3","\u5229\u722A\u5148\u950B", 10, 0,0.016, 1500,"\u5168\u526F\u6B66\u88C5\u7684\u91CD\u578B\u673A\u7532\uFF0C\u884C\u52A8\u7F13\u6162\uFF0C\u4F46\u9632\u5FA1\u6781\u9AD8\uFF0C\u706B\u529B\u5F3A\u52B2\uFF0C\u5C3D\u91CF\u4E0D\u8981\u66B4\u9732\u5728\u4ED6\u7684\u6B63\u9762\u706B\u529B\u8986\u76D6\u8303\u56F4\u5185\u3002","(4, 8, 8, 1)"],[ 8, 8,"Boss","\u9ED1\u7FFC\u2014\u2014\u2014\u7B2C\u516D\u964D\u4E34\u8005", 100, 0, 0, 80000,"\u4EBA\u7C7B\u6297\u4E89\u5916\u661F\u6218\u6597\u4E2D\u8BB0\u8F7D\u4E2D\u5C11\u6709\u7684\u6570\u4E2A\uFF0C\u5177\u6709\u6781\u9AD8\u5371\u9669\u7CFB\u6570\u7684\u6218\u6597\u5355\u4F4D\u4E4B\u4E00\n","(5, 10, 10, 10)"]]},"PropData":{"Columns":["ID","PropId","PropNameCn","PropName","PropDesc","Effect"],"Values":[[ 1, 501,"\u8840\u5305","BloodBag","\u7ED9\u89D2\u8272\u52A0\u8840",0.5],[ 3, 503,"\u653B\u51FBbuff","AtkBuff","\u589E\u52A0\u89D2\u8272\u653B\u51FB\u529B",0.5],[ 4, 504,"\u9632\u5FA1buff","DefenseBuff","\u589E\u52A0\u89D2\u8272\u9632\u5FA1\u529B",-0.5],[ 5, 505,"\u80FD\u6E90\u9B54\u65B9","EnergyPump","\u7528\u6765\u5F00\u542F\u4E0B\u4E00\u6BB5\u5267\u60C5", 1],[ 6, 506,"\u5F00\u542F\u6E38\u620F\u7684\u4F20\u9001\u9635","StartGamePoint","\u7528\u6765\u5F00\u542F\u6E38\u620F",-1]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((60,180))",-1],[ 2,"PlayerWeapon2","\u8FDE\u5C04\u67AA","((100,200))", 300],[ 3,"PlayerWeapon3","\u8FFD\u8E2A\u67AA","((200,300))", 300],[ 4,"PlayerWeapon4","\u5C0F\u578B\u6FC0\u5149\u67AA","((500,600))", 50],[ 5,"PlayerWeapon5","\u591A\u53D1\u6FC0\u5149\u67AA","((600,800))", 30],[ 6,"PlayerWeapon6","\u5355\u4E2A\u5149\u7403\u67AA","((350,450))", 50],[ 7,"PlayerWeapon7","\u53CC\u4E2A\u5149\u7403\u67AA","((200,300))", 50],[ 8,"PlayerWeapon8","\u591A\u53D1\u5BFC\u5F39\u67AA","((50,100))", 30],[ 9,"PlayerWeapon9","\u5927\u5BFC\u5F39\u67AA","((600,800))", 30],[ 10,"PlayerWeapon10","\u6301\u7EED\u6FC0\u5149\u67AA","((20,50))", 300]]},"EnemyBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"DropShipBullet1","\u5916\u661F\u8FD0\u8F93\u673A\u666E\u901A\u5B50\u5F39","((50,150))",-1],[ 2,"DropShipBullet2","\u5916\u661F\u8FD0\u8F93\u673A\u7279\u6B8A\u5B50\u5F39","((300,450))",-1],[ 3,"Enemy1","\u5916\u661F\u67AA\u624B\u5B50\u5F39","((50,150))",-1],[ 4,"LeviathanBullet1","\u5229\u7EF4\u5766\u666E\u901A\u5B50\u5F39","((100,250))",-1],[ 5,"LeviathanBullet2","\u5229\u7EF4\u5766\u7279\u6B8A\u5B50\u5F39","((300,450))",-1],[ 6,"Enemy2","\u98DE\u884C\u5175\u5B50\u5F39","((60,150))",-1],[ 7,"MachineDragonBullet","\u9738\u738B\u9F99\u666E\u901A\u5B50\u5F39","((500,600))",-1],[ 8,"MachineDragonBullet2","\u9738\u738B\u9F99\u7279\u6B8A\u5B50\u5F39","((400,600))",-1],[ 9,"Enemy3","\u54E8\u5175\u722A\u51FB","((100,150))",-1],[ 10,"Boss1","boss\u6B63\u5E38\u5B50\u5F39","((20,50))",-1],[ 11,"Boss2","boss\u7279\u6B8A\u653B\u51FB","((300,500))",-1],[ 12,"Boss3","boss\u53EC\u5524\u653B\u51FB","((100,150))",-1]]},"BossPosData":{"Columns":["ID","BossPos","BossAng","DoorPos","DoorAng","DoorScale"],"Values":[[ 0,"(10,0,3)","(0,0,0)","(8.8,3.1,0)","(0,0,0)", 1.5],[ 1,"(14,2.47,14.26)","(0,180,0)","(14,-7.6,8.8)","(0,180,0)", 4.5],[ 2,"(24.73,-10.5,18.86)","(0,180,0)","(25.9,-6.1,14.1)","(0,180,0)", 4.5],[ 3,"(9.12,0,-1.56)","(0,0,0)","(10.74,-3.3,0.19)","(0,0,0)", 3],[ 4,"(11.23,1.59,-0.3)","(0,0,0)","(10.68,-1.21,0.02)","(0,0,0)", 3]]},"":{"Columns":[],"Values":[]}}
--- a/Assets/Resources/zh/Shandong_Jining_ShangchangData.json.meta
+++ b/Assets/Resources/zh/Shandong_Jining_ShangchangData.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fa1823f11f20c3046b483b5fc6bf8e28
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/银河守护者-山东济宁商场.xlsm
+++ b/Assets/Resources/银河守护者-山东济宁商场.xlsm
--- a/Assets/Resources/~$银河守护者-山东潍坊青州泰华城.xlsm.meta
+++ b/Assets/Resources/~$银河守护者-山东潍坊青州泰华城.xlsm.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5e4ebcdd7de9fbc4c9174313a3f55d9e
+guid: 437775c6973eb7b4a87cc0998ee67fc4
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Resources/银河守护者-山东济宁外.xlsm.meta
+++ b/Assets/Resources/银河守护者-山东济宁外.xlsm.meta
@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 7c7d29478aa856242afc733e85d553c9
+guid: 6e80a32024cbb05408b5fc1f3695df5d
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/Shandong_Jining_Shangchang.unity
+++ b/Assets/Scenes/Shandong_Jining_Shangchang.unity
@ -121,7 +121,7 @@ NavMeshSettings:
    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
-  m_NavMeshData: {fileID: 23800000, guid: 7c40c37eb2f38da43b78ac4dd0a99760, type: 2}
+  m_NavMeshData: {fileID: 23800000, guid: ea21df912e0e7d64580dd78003292dd2, type: 2}
 --- !u!1 &5341603
 GameObject:
  m_ObjectHideFlags: 0
@ -221,91 +221,6 @@ MonoBehaviour:
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
  frames: 178
--- !u!1001 &14426251
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.71
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2.37
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
-      objectReference: {fileID: 0}
-    - target: {fileID: 210841300334780445, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 695489101647837863, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_Name
-      value: "\u5C71\u4E1C\u6D4E\u5B81\uFF08\u5916\uFF09\u5730\u5F62"
-      objectReference: {fileID: 0}
-    - target: {fileID: 695489101647837863, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 695489101647837863, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 1694648818152137556, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1694648818152137556, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 2777351220516402856, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 7270252398031993696, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7270252398031993696, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 6a684de19ac6c1145984685beb89443f, type: 3}
 --- !u!1 &49916762
 GameObject:
  m_ObjectHideFlags: 0
@ -15510,83 +15425,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 583793559}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1096883698
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 28385947725308679, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 28385947725308679, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 974694081899875361, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 1785872327688194791, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_Name
-      value: "\u5B89\u5FBD\u829C\u6E56\u5730\u5F62"
-      objectReference: {fileID: 0}
-    - target: {fileID: 1785872327688194791, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1785872327688194791, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 1.32
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.15
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
-      objectReference: {fileID: 0}
-    - target: {fileID: 8545660445036014067, guid: 405b43f19810987429e045a992808a79, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 405b43f19810987429e045a992808a79, type: 3}
 --- !u!1 &1101728298
 GameObject:
  m_ObjectHideFlags: 0
@ -17702,71 +17540,6 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
--- !u!1001 &1307579686
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -1.17
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 7.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 429491943217539289, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 8257397864370282779, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_Name
-      value: "6.30\u5730\u5F62"
-      objectReference: {fileID: 0}
-    - target: {fileID: 8257397864370282779, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8257397864370282779, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 6661c2a3cf81f674789528ab6a4508d1, type: 3}
 --- !u!1 &1316810889
 GameObject:
  m_ObjectHideFlags: 0
@ -19652,6 +19425,79 @@ MonoBehaviour:
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
  frames: 178
+--- !u!1001 &1585237830
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1743202451946170408, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_Name
+      value: "\u5C71\u4E1C\u6D4E\u5B81\uFF08\u5916\uFF09\u5730\u5F62(\u6539\uFF09"
+      objectReference: {fileID: 0}
+    - target: {fileID: 1743202451946170408, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 23.55
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 4.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653907068624287935, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7062037494040877039, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
+    - target: {fileID: 8251164618512820810, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8251164618512820810, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7d04e9c63a137f449aea162dec4a2d4f, type: 3}
 --- !u!1 &1592309480
 GameObject:
  m_ObjectHideFlags: 0
@ -27713,6 +27559,4 @@ SceneRoots:
  - {fileID: 1132763769}
  - {fileID: 509911535}
  - {fileID: 370889108}
-  - {fileID: 1307579686}
-  - {fileID: 1096883698}
-  - {fileID: 14426251}
+  - {fileID: 1585237830}
--- a/Assets/Scenes/Shandong_Jining_Shangchang.unity.meta
+++ b/Assets/Scenes/Shandong_Jining_Shangchang.unity.meta
--- a/Assets/Scenes/Shandong_Jining_Shangchang/NavMesh.asset
+++ b/Assets/Scenes/Shandong_Jining_Shangchang/NavMesh.asset
--- a/Assets/Scenes/Shandong_Jining_Shangchang/NavMesh.asset.meta
+++ b/Assets/Scenes/Shandong_Jining_Shangchang/NavMesh.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ea21df912e0e7d64580dd78003292dd2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Enemy/Boss/Boss.cs
+++ b/Assets/Scripts/Enemy/Boss/Boss.cs
@ -116,9 +116,9 @@ public class Boss : Enemy
            endValue = 4.5f;
        if (GameInit.Ins.gamePlace == GamePlace.ShanDong_Langfang_QingzhouTaihuacheng)
            endValue = 18f;
-        if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Wai)
+        if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Shangchang)
        {
-            transform.DOMove(new Vector3(22.5f,transform.position.y,-0.5f), 4).OnComplete(() =>
+            transform.DOMove(new Vector3(11.5f,transform.position.y,3.68f), 4).OnComplete(() =>
            {
                Both();
            });
--- a/Assets/Scripts/Enemy/DropShip/DropShip.cs
+++ b/Assets/Scripts/Enemy/DropShip/DropShip.cs
@ -176,7 +176,7 @@ public class DropShip : Enemy
            endValue = 17f;
        if(GameInit.Ins.gamePlace== GamePlace.ShanDong_Langfang_QingzhouTaihuacheng)
            endValue = 25f;
-        if (GameInit.Ins.gamePlace == GamePlace.HangZhouLongHuTianJie||GameInit.Ins.gamePlace== GamePlace.Guangzhou_Panyv_Zhanting)
+        if (GameInit.Ins.gamePlace == GamePlace.HangZhouLongHuTianJie||GameInit.Ins.gamePlace== GamePlace.Guangzhou_Panyv_Zhanting )
        {
            transform.DOMoveX(endValue, 4).OnComplete(() =>
            {
--- a/Assets/Scripts/Enemy/Leviathan/Leviathan.cs
+++ b/Assets/Scripts/Enemy/Leviathan/Leviathan.cs
@ -84,9 +84,9 @@ public class Leviathan : Enemy
                Both();
            });
        }
-        else if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Wai)
+        else if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Shangchang)
        {
-            transform.DOMove(new Vector3(26f,transform.position.y,6f), 2).OnComplete(() =>
+            transform.DOMove(new Vector3(16f,1f,5f), 2).OnComplete(() =>
            {
                Both();
            });
--- a/Assets/Scripts/Enemy/MachineDragon/MachineDragon.cs
+++ b/Assets/Scripts/Enemy/MachineDragon/MachineDragon.cs
@ -88,9 +88,9 @@ public class MachineDragon : Enemy
                Both();
            });
        }
-        else if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Wai)
+        else if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Shangchang)
        {
-            transform.DOMove(new Vector3(21.6f,transform.position.y,5.6f), 4).OnComplete(() =>
+            transform.DOMove(new Vector3(12.12f,transform.position.y,4.6f), 4).OnComplete(() =>
            {
                Both();
            }); 
--- a/Assets/Scripts/Manager/GameManager.cs
+++ b/Assets/Scripts/Manager/GameManager.cs
@ -26,7 +26,7 @@ public enum GamePlace
    Zhejiang_Jinhua_KeJiGuan=6,
    Guangzhou_Panyv_Zhanting=7,
    Anhui_Wuhu_Guanwei=8,
-    Shandong_Jining_Wai=9,
+    Shandong_Jining_Shangchang = 9 ,
    ShanDong_Langfang_QingzhouTaihuacheng=10,
 }

--- a/Assets/sucai/山东济宁（外）地形(改）.FBX
+++ b/Assets/sucai/山东济宁（外）地形(改）.FBX
--- a/Assets/sucai/山东济宁（外）地形(改）.FBX.meta
+++ b/Assets/sucai/山东济宁（外）地形(改）.FBX.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: cb1e33127c0524c44bacad03fe2285e1
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -35,10 +35,10 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/Scenes/Anhui_Wuhu_Guanwei.unity
    guid: 5dfec80a1cc462d42b061742c627b51f
-  - enabled: 0
-    path: Assets/Scenes/Shandong_Jining_wai.unity
-    guid: 3b621619f9cb2a44abfa7e76114df4a2
  - enabled: 1
+    path: Assets/Scenes/Shandong_Jining_Shangchang.unity
+    guid: 3b621619f9cb2a44abfa7e76114df4a2
+  - enabled: 0
    path: Assets/Scenes/ShanDong_Langfang_QingzhouTaihuacheng.unity
    guid: 60c893bc687ed6847a515f4394b0a5ec
  m_configObjects:
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -164,7 +164,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Android: com.pineappletech.xmen.shandonglangfangtaihuacheng
+    Android: com.pineappletech.xmen.shandongjiningshangchang
    Standalone: com.machineAge.jiangniwanda.F1
  buildNumber:
    Standalone: 0
				`@ -0,0 +1 @@`
				{"EnemyData":{"Columns":["ID","EnemyId","Name","Name_CN","Atk","Speed","Rate","Hp","EnemyDesc","DescInfo"],"Values":[[ 0, 1,"EnemyTa","\u5916\u661F\u80FD\u6E90\u5854", 0, 3, 0, 2000,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 1, 2,"Enemy1","\u5916\u661F\u67AA\u624B", 100, 3, 0, 800,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 2, 3,"DropShip","\u5916\u661F\u98DE\u8239", 100, 3, 1.15, 30000,"\u5916\u661F\u519B\u56E2\u7684\u5E38\u89C4\u4F5C\u6218\u5175\u79CD\uFF0C\u914D\u5907\u6709\u5E38\u89C4\u706B\u529B\u6B65\u67AA\u4F5C\u4E3A\u4F5C\u6218\u5175\u5668\u3002","(1, 2, 2, 2)"],[ 3, 4,"Leviathan","\u5916\u661F\u5229\u7EF4\u5766", 50, 5,0.8, 45000,"\u5168\u8EAB\u7531\u8F7B\u578B\u88C5\u7532\u5236\u9020\u800C\u6210\u7684\u4F4E\u6B66\u88C5\u4FA6\u5BDF\u578B\u673A\u5668\u4EBA\uFF0C\u884C\u52A8\u9AD8\u901F\u800C\u7075\u654F\uFF0C\u4F46\u662F\u9632\u62A4\u8F83\u5DEE\u3002","(1, 1, 1, 4)"],[ 4, 5,"Enemy2","\u98DE\u884C\u54E8\u5175", 80, 3,0.8, 1500,"\u52A8\u7269\u5F62\u6001\u7684\u517D\u578B\u5175\u79CD,\u8D34\u5730\u722C\u884C\u901F\u5EA6\u5F88\u5FEB,\u7528\u950B\u5229\u7684\u524D\u817F\u653B\u51FB.\u4E0D\u8981\u88AB\u4ED6\u4EEC\u5305\u56F4,\u5426\u5219\u4F1A\u906D\u53D7\u5DE8\u5927\u4F24\u5BB3.","(2, 2, 1, 3)"],[ 5, 6,"MachineDragon","\u673A\u68B0\u9738\u738B\u9F99", 150, 4,0.8, 50000,"\u94A2\u7259\u62A4\u536B\u7684\u5347\u7EA7\u578B\u53F7,\u66F4\u5927\u7684\u4F53\u578B\u4F1A\u5E26\u6765\u66F4\u5927\u7684\u4F24\u5BB3.","(3, 6, 6, 5)"],[ 6, 7,"Enemy3","\u5229\u722A\u5148\u950B", 10, 0,0.016, 1500,"\u5168\u526F\u6B66\u88C5\u7684\u91CD\u578B\u673A\u7532\uFF0C\u884C\u52A8\u7F13\u6162\uFF0C\u4F46\u9632\u5FA1\u6781\u9AD8\uFF0C\u706B\u529B\u5F3A\u52B2\uFF0C\u5C3D\u91CF\u4E0D\u8981\u66B4\u9732\u5728\u4ED6\u7684\u6B63\u9762\u706B\u529B\u8986\u76D6\u8303\u56F4\u5185\u3002","(4, 8, 8, 1)"],[ 8, 8,"Boss","\u9ED1\u7FFC\u2014\u2014\u2014\u7B2C\u516D\u964D\u4E34\u8005", 100, 0, 0, 80000,"\u4EBA\u7C7B\u6297\u4E89\u5916\u661F\u6218\u6597\u4E2D\u8BB0\u8F7D\u4E2D\u5C11\u6709\u7684\u6570\u4E2A\uFF0C\u5177\u6709\u6781\u9AD8\u5371\u9669\u7CFB\u6570\u7684\u6218\u6597\u5355\u4F4D\u4E4B\u4E00\n","(5, 10, 10, 10)"]]},"PropData":{"Columns":["ID","PropId","PropNameCn","PropName","PropDesc","Effect"],"Values":[[ 1, 501,"\u8840\u5305","BloodBag","\u7ED9\u89D2\u8272\u52A0\u8840",0.5],[ 3, 503,"\u653B\u51FBbuff","AtkBuff","\u589E\u52A0\u89D2\u8272\u653B\u51FB\u529B",0.5],[ 4, 504,"\u9632\u5FA1buff","DefenseBuff","\u589E\u52A0\u89D2\u8272\u9632\u5FA1\u529B",-0.5],[ 5, 505,"\u80FD\u6E90\u9B54\u65B9","EnergyPump","\u7528\u6765\u5F00\u542F\u4E0B\u4E00\u6BB5\u5267\u60C5", 1],[ 6, 506,"\u5F00\u542F\u6E38\u620F\u7684\u4F20\u9001\u9635","StartGamePoint","\u7528\u6765\u5F00\u542F\u6E38\u620F",-1]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((60,180))",-1],[ 2,"PlayerWeapon2","\u8FDE\u5C04\u67AA","((100,200))", 300],[ 3,"PlayerWeapon3","\u8FFD\u8E2A\u67AA","((200,300))", 300],[ 4,"PlayerWeapon4","\u5C0F\u578B\u6FC0\u5149\u67AA","((500,600))", 50],[ 5,"PlayerWeapon5","\u591A\u53D1\u6FC0\u5149\u67AA","((600,800))", 30],[ 6,"PlayerWeapon6","\u5355\u4E2A\u5149\u7403\u67AA","((350,450))", 50],[ 7,"PlayerWeapon7","\u53CC\u4E2A\u5149\u7403\u67AA","((200,300))", 50],[ 8,"PlayerWeapon8","\u591A\u53D1\u5BFC\u5F39\u67AA","((50,100))", 30],[ 9,"PlayerWeapon9","\u5927\u5BFC\u5F39\u67AA","((600,800))", 30],[ 10,"PlayerWeapon10","\u6301\u7EED\u6FC0\u5149\u67AA","((20,50))", 300]]},"EnemyBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"DropShipBullet1","\u5916\u661F\u8FD0\u8F93\u673A\u666E\u901A\u5B50\u5F39","((50,150))",-1],[ 2,"DropShipBullet2","\u5916\u661F\u8FD0\u8F93\u673A\u7279\u6B8A\u5B50\u5F39","((300,450))",-1],[ 3,"Enemy1","\u5916\u661F\u67AA\u624B\u5B50\u5F39","((50,150))",-1],[ 4,"LeviathanBullet1","\u5229\u7EF4\u5766\u666E\u901A\u5B50\u5F39","((100,250))",-1],[ 5,"LeviathanBullet2","\u5229\u7EF4\u5766\u7279\u6B8A\u5B50\u5F39","((300,450))",-1],[ 6,"Enemy2","\u98DE\u884C\u5175\u5B50\u5F39","((60,150))",-1],[ 7,"MachineDragonBullet","\u9738\u738B\u9F99\u666E\u901A\u5B50\u5F39","((500,600))",-1],[ 8,"MachineDragonBullet2","\u9738\u738B\u9F99\u7279\u6B8A\u5B50\u5F39","((400,600))",-1],[ 9,"Enemy3","\u54E8\u5175\u722A\u51FB","((100,150))",-1],[ 10,"Boss1","boss\u6B63\u5E38\u5B50\u5F39","((20,50))",-1],[ 11,"Boss2","boss\u7279\u6B8A\u653B\u51FB","((300,500))",-1],[ 12,"Boss3","boss\u53EC\u5524\u653B\u51FB","((100,150))",-1]]},"BossPosData":{"Columns":["ID","BossPos","BossAng","DoorPos","DoorAng","DoorScale"],"Values":[[ 0,"(10,0,3)","(0,0,0)","(8.8,3.1,0)","(0,0,0)", 1.5],[ 1,"(14,2.47,14.26)","(0,180,0)","(14,-7.6,8.8)","(0,180,0)", 4.5],[ 2,"(24.73,-10.5,18.86)","(0,180,0)","(25.9,-6.1,14.1)","(0,180,0)", 4.5],[ 3,"(9.12,0,-1.56)","(0,0,0)","(10.74,-3.3,0.19)","(0,0,0)", 3],[ 4,"(11.23,1.59,-0.3)","(0,0,0)","(10.68,-1.21,0.02)","(0,0,0)", 3]]},"":{"Columns":[],"Values":[]}}