Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan
# Conflicts: # Assets/Resources/~$银河守护者-广西桂林恭城世纪鑫诚.xlsm.meta # Assets/Resources/~$银河守护者-江苏徐州丰县吾悦广场.xlsm.meta # Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm.meta # Assets/StreamingAssets/build_info
This commit is contained in:
149
Assets/DC/河北唐山地形.prefab
Normal file
149
Assets/DC/河北唐山地形.prefab
Normal file
@@ -0,0 +1,149 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1590625950509186967
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5340933065953136490}
|
||||
- component: {fileID: 8869256640459179934}
|
||||
- component: {fileID: 7532330921588033652}
|
||||
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 &5340933065953136490
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1590625950509186967}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -1.5855589, y: 0, z: -0.6802108}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3463410168420996156}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &8869256640459179934
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1590625950509186967}
|
||||
m_Mesh: {fileID: 4017482625668419684, guid: acef094e1d4a9374288508bcb3bfb927, type: 3}
|
||||
--- !u!23 &7532330921588033652
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1590625950509186967}
|
||||
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: -9201113022092678257, guid: acef094e1d4a9374288508bcb3bfb927, 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 &1937134289320892330
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3463410168420996156}
|
||||
m_Layer: 0
|
||||
m_Name: "\u6CB3\u5317\u5510\u5C71\u5730\u5F62"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3463410168420996156
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1937134289320892330}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.20109685, z: -0, w: 0.97957134}
|
||||
m_LocalPosition: {x: 0.7, y: 0, z: 5.44}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 694599883236788117}
|
||||
- {fileID: 5340933065953136490}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 23.202, z: 0}
|
||||
--- !u!1 &5365803146151901547
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 694599883236788117}
|
||||
m_Layer: 0
|
||||
m_Name: "\u5BF9\u8C61001"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &694599883236788117
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5365803146151901547}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -1.5855589, y: 0, z: -0.6802108}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3463410168420996156}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
7
Assets/DC/河北唐山地形.prefab.meta
Normal file
7
Assets/DC/河北唐山地形.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1be61ee4ecf41eb468729aedda6053e2
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
59
Assets/DC/辽宁鞍山9.26新店地形.prefab
Normal file
59
Assets/DC/辽宁鞍山9.26新店地形.prefab
Normal file
@@ -0,0 +1,59 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8494777228749532300
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.49
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.54
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u8FBD\u5B81\u978D\u5C719.26\u65B0\u5E97\u5730\u5F62"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 61ab1bd0a9d61584fa9445fee3dab280, type: 3}
|
||||
7
Assets/DC/辽宁鞍山9.26新店地形.prefab.meta
Normal file
7
Assets/DC/辽宁鞍山9.26新店地形.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b05b80c2acbcb894c8708e5aec5afb1a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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", 25, 5,0.8, 30000,"\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", 40, 3,0.8, 1000,"\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, 40000,"\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, 1000,"\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, 60000,"\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","((600,720))", 50],[ 5,"PlayerWeapon5","\u591A\u53D1\u6FC0\u5149\u67AA","((720,960))", 30],[ 6,"PlayerWeapon6","\u5355\u4E2A\u5149\u7403\u67AA","((420,540))", 50],[ 7,"PlayerWeapon7","\u53CC\u4E2A\u5149\u7403\u67AA","((240,360))", 50],[ 8,"PlayerWeapon8","\u591A\u53D1\u5BFC\u5F39\u67AA","((60,120))", 30],[ 9,"PlayerWeapon9","\u5927\u5BFC\u5F39\u67AA","((720,960))", 30],[ 10,"PlayerWeapon10","\u6301\u7EED\u6FC0\u5149\u67AA","((24,60))", 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","((20,30))",-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,"(-7.41,0,8.49)","(0,0,0)","(-7.25,2,-0.57)","(0,0,0)", 1.5],[ 1,"(-9.39,5,22.31)","(0,180,0)","(-9.7,-5,12.5)","(0,180,0)", 4.5],[ 2,"(-20.85,-3.5,16.96)","(0,135,0)","(-13.04,-2.2,10.77)","(0,135,0)", 4.5],[ 3,"(-5.05,0,-3.22)","(0,0,0)","(-5.04,-3.3,-0.27)","(0,0,0)", 3],[ 4,"(-6.29,3,14.53)","(0,-180,0)","(-6.99,0,12.59)","(0,-180,0)", 3]]},"":{"Columns":[],"Values":[]}}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 746e585c7b2452b4d8209a62fa625d78
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,5 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Resources/~$银河守护者-广西桂林恭城世纪鑫诚.xlsm.meta
|
||||
guid: e8f115272ca455e47b4e379b2042edc5
|
||||
========
|
||||
guid: 9b956f5fe2f82b2418ef6b65af4324e8
|
||||
>>>>>>>> origin/main_ZYT:Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
BIN
Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm
Normal file
BIN
Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm
Normal file
Binary file not shown.
@@ -27490,6 +27490,7 @@ MonoBehaviour:
|
||||
buffDef: 0
|
||||
curBoss: {fileID: 0}
|
||||
curLevel: 0
|
||||
aiCharacterPre: {fileID: 0}
|
||||
isGamePlay: 0
|
||||
isFirstGetWeapon: 0
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
|
||||
27642
Assets/Scenes/Hebei_Tangshan_Qianan_Tianyuangu.unity
Normal file
27642
Assets/Scenes/Hebei_Tangshan_Qianan_Tianyuangu.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 633078969b99331418d32ed3a7a8c936
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -27624,7 +27624,7 @@ MonoBehaviour:
|
||||
buffDef: 0
|
||||
curBoss: {fileID: 0}
|
||||
curLevel: 0
|
||||
aiCharacterPre: {fileID: 0}
|
||||
aiCharacterPre: {fileID: 3138103488680208938, guid: fd270e281173bf348a948a0a3a30594b, type: 3}
|
||||
isGamePlay: 0
|
||||
isFirstGetWeapon: 0
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
|
||||
8
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng.meta
Normal file
8
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 43710e24f8310af4ba32e52bdc5f5815
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
28060
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng.unity
Normal file
28060
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dab6ceac019f05041b784b3fe1ba7919
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng/NavMesh.asset
Normal file
BIN
Assets/Scenes/Liaoning_Anshan_Lishan_Dayuecheng/NavMesh.asset
Normal file
Binary file not shown.
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9aa3750aabcef2343b232255314bdea0
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 23800000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -277,6 +277,13 @@ public class Boss : Enemy
|
||||
Both();
|
||||
});
|
||||
}
|
||||
if (GameInit.Ins.gamePlace == GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
{
|
||||
transform.DOMove(new Vector3(-6.54f, 3f, 7.64f), 4).OnComplete(() =>
|
||||
{
|
||||
Both();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.DOMoveZ(endValue, 4).OnComplete(() =>
|
||||
|
||||
@@ -424,6 +424,21 @@ public class DropShip : Enemy
|
||||
_isShow = false;
|
||||
});
|
||||
}
|
||||
if (GameInit.Ins.gamePlace == GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
{
|
||||
transform.DOMove(new Vector3(-9.39f, 5f, 14.6f), 4).OnComplete(() =>
|
||||
{
|
||||
isAttack = true;
|
||||
foreach (var item in tailGas)
|
||||
{
|
||||
item.SetActive(true);
|
||||
}
|
||||
bloodSlider.gameObject.SetActive(true);
|
||||
isShield = false;
|
||||
shieldObj.SetActive(false);
|
||||
_isShow = false;
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.DOMoveZ(endValue, 4).OnComplete(() =>
|
||||
|
||||
@@ -266,6 +266,13 @@ public class Leviathan : Enemy
|
||||
Both();
|
||||
});
|
||||
}
|
||||
else if(GameInit.Ins.gamePlace == GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
{
|
||||
transform.DOMove(new Vector3(6.25f,-3.5f,-3.81f),2).OnComplete(() =>
|
||||
{
|
||||
Both();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.DOMoveZ(-15f, 2).OnComplete(() =>
|
||||
|
||||
@@ -258,6 +258,13 @@ public class MachineDragon : Enemy
|
||||
Both();
|
||||
});
|
||||
}
|
||||
else if(GameInit.Ins.gamePlace == GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
{
|
||||
transform.DOMove(new Vector3(-5.05f,0f,2.15f), 4).OnComplete(() =>
|
||||
{
|
||||
Both();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
transform.DOMoveZ(endValue, 4).OnComplete(() =>
|
||||
|
||||
@@ -172,7 +172,7 @@ public class GameManager : MonoBehaviour
|
||||
});
|
||||
loginInfo.deviceSn = GetPicoSn();
|
||||
loginInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + "";
|
||||
loginInfo.shop = 25;
|
||||
loginInfo.shop = 32;
|
||||
#if !UNITY_EDITOR && UNITY_ANDROID && PICO
|
||||
loginInfo.shop = (int)GameInit.Ins.gamePlace;
|
||||
if(GameInit.Ins.gamePlace== GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
@@ -514,6 +514,10 @@ public class GameManager : MonoBehaviour
|
||||
{
|
||||
EnergyPump.transform.position = new Vector3(1.5f, 0, 4.58f);
|
||||
}
|
||||
if (GameInit.Ins.gamePlace == GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
|
||||
{
|
||||
EnergyPump.transform.position = new Vector3(-3.23f, 0, 5.47f);
|
||||
}
|
||||
EnergyPumpTag++;
|
||||
EnergyPump.GetComponent<EnergyPump>().Init(EnergyPumpTag);
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.44599897, g: 0.36908153, b: 0.6039216, a: 1}
|
||||
- _Color: {r: 0.44599897, g: 0.36908153, b: 0.6039216, a: 1}
|
||||
- _Color: {r: 0.44599897, g: 0.3690815, b: 0.6039216, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0.0011888875, b: 0.047169805, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -115,7 +115,7 @@ Material:
|
||||
- _BaseColor: {r: 0.9921568, g: 0.93333334, b: 0.24705878, a: 0.47058824}
|
||||
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||
- _Color: {r: 0.9921568, g: 0.93333334, b: 0.24705878, a: 0.47058824}
|
||||
- _Color: {r: 0.9921568, g: 0.93333334, b: 0.24705875, a: 0.47058824}
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _GlowColor: {r: 1, g: 1, b: 0, a: 1}
|
||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
||||
|
||||
@@ -114,7 +114,7 @@ Material:
|
||||
- _BaseColor: {r: 0.99215686, g: 0.93333334, b: 0.24705882, a: 0.47058824}
|
||||
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||
- _Color: {r: 0.99215686, g: 0.93333334, b: 0.24705882, a: 0.47058824}
|
||||
- _Color: {r: 0.9921568, g: 0.93333334, b: 0.24705878, a: 0.47058824}
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _TintColor: {r: 1, g: 0.7922921, b: 0.5294118, a: 0.5}
|
||||
|
||||
@@ -114,7 +114,7 @@ Material:
|
||||
- _BaseColor: {r: 0.99215686, g: 0.93333334, b: 0.24705882, a: 0.47058824}
|
||||
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||
- _Color: {r: 0.99215686, g: 0.93333334, b: 0.24705882, a: 0.47058824}
|
||||
- _Color: {r: 0.9921568, g: 0.93333334, b: 0.24705878, a: 0.47058824}
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _TintColor: {r: 1, g: 0.7922921, b: 0.5294118, a: 0.5}
|
||||
|
||||
@@ -129,7 +129,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.34509805, g: 0.098039225, b: 0.41176474, a: 1}
|
||||
- _Color: {r: 0.34509805, g: 0.098039225, b: 0.41176474, a: 1}
|
||||
- _Color: {r: 0.34509802, g: 0.09803919, b: 0.4117647, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -117,7 +117,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.26415092, g: 0.07849768, b: 0.25580862, a: 1}
|
||||
- _Color: {r: 0.26415092, g: 0.07849768, b: 0.25580862, a: 1}
|
||||
- _Color: {r: 0.2641509, g: 0.07849767, b: 0.2558086, a: 1}
|
||||
- _EmissionColor: {r: 0.2, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -130,7 +130,7 @@ Material:
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.32941177, g: 0.3372549, b: 0.40000004, a: 1}
|
||||
- _Color: {r: 0.32941177, g: 0.3372549, b: 0.40000004, a: 1}
|
||||
- _Color: {r: 0.32941175, g: 0.33725488, b: 0.4, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
BIN
Assets/sucai/河北唐山地形.FBX
Normal file
BIN
Assets/sucai/河北唐山地形.FBX
Normal file
Binary file not shown.
109
Assets/sucai/河北唐山地形.FBX.meta
Normal file
109
Assets/sucai/河北唐山地形.FBX.meta
Normal file
@@ -0,0 +1,109 @@
|
||||
fileFormatVersion: 2
|
||||
guid: acef094e1d4a9374288508bcb3bfb927
|
||||
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:
|
||||
BIN
Assets/sucai/辽宁鞍山9.26新店地形.FBX
Normal file
BIN
Assets/sucai/辽宁鞍山9.26新店地形.FBX
Normal file
Binary file not shown.
109
Assets/sucai/辽宁鞍山9.26新店地形.FBX.meta
Normal file
109
Assets/sucai/辽宁鞍山9.26新店地形.FBX.meta
Normal file
@@ -0,0 +1,109 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61ab1bd0a9d61584fa9445fee3dab280
|
||||
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:
|
||||
@@ -108,7 +108,7 @@ GraphicsSettings:
|
||||
m_FogKeepExp: 1
|
||||
m_FogKeepExp2: 1
|
||||
m_AlbedoSwatchInfos: []
|
||||
m_LightsUseLinearIntensity: 0
|
||||
m_LightsUseLinearIntensity: 1
|
||||
m_LightsUseColorTemperature: 1
|
||||
m_DefaultRenderingLayerMask: 1
|
||||
m_LogWhenShaderIsCompiled: 0
|
||||
|
||||
Reference in New Issue
Block a user