Merge remote-tracking branch 'origin/main_ZYT'

This commit is contained in:
bzx
2025-08-05 12:06:36 +08:00
10 changed files with 57 additions and 79 deletions

View File

@@ -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,"(0.12,0,10.39)","(0,0,0)","(-2.73,2,0.18)","(0,0,0)", 1.5],[ 1,"(0,5,27.75)","(0,-180,0)","(0,-5,20.75)","(0,-180,0)", 4.5],[ 2,"(-1,-3.5,18.507)","(0,-180,0)","(-1,5,17.56)","(0,-180,0)", 4.5],[ 3,"(-6.36,0,10.17)","(0,90,0)","(-3.36,-3.3,10.365)","(0,90,0)", 3],[ 4,"(1.2,3,0.22)","(0,0,0)","(1.24,0,0.73)","(0,0,0)", 3]]},"":{"Columns":[],"Values":[]}}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4d20c25dbd0c224489c90557b7809a78
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 51878a07dbcf3f5499d1d1471b712b43
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -16477,7 +16477,7 @@ MonoBehaviour:
leftHand: {fileID: 666635359}
rightHand: {fileID: 353037434}
tc: {fileID: 869511489}
gamePlace: 12
gamePlace: 13
--- !u!1 &1205552005
GameObject:
m_ObjectHideFlags: 0
@@ -18894,83 +18894,6 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 178
--- !u!1001 &1475055230
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 90447407957429846, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_Name
value: "\u7ECD\u5174\u5D4A\u5DDE\u5E02\u5730\u5F62"
objectReference: {fileID: 0}
- target: {fileID: 90447407957429846, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 90447407957429846, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 3507162499965051577, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalPosition.x
value: -5.27
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalPosition.z
value: 1.32
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalRotation.w
value: 0.0021119374
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalRotation.y
value: -0.9999978
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -179.758
objectReference: {fileID: 0}
- target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8544242438586074432, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8544242438586074432, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bd5bb05b679ac964f864c7233b064967, type: 3}
--- !u!1 &1491458284
GameObject:
m_ObjectHideFlags: 0
@@ -27538,5 +27461,4 @@ SceneRoots:
- {fileID: 705507995}
- {fileID: 1132763769}
- {fileID: 509911535}
- {fileID: 1475055230}
- {fileID: 343471848}

View File

@@ -144,6 +144,13 @@ public class Boss : Enemy
Both();
});
}
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
{
transform.DOMove(new Vector3(1.41f, transform.position.y, 13.67f), 4).OnComplete(() =>
{
Both();
});
}
else
{
transform.DOMoveZ(endValue, 4).OnComplete(() =>

View File

@@ -222,6 +222,21 @@ public class DropShip : Enemy
_isShow = false;
});
}
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
{
transform.DOMove(new Vector3(-5.71f, transform.position.y, 15.02f), 4).OnComplete(() =>
{
isAttack = true;
foreach (var item in tailGas)
{
item.SetActive(true);
}
bloodSlider.gameObject.SetActive(true);
isShield = false;
shieldObj.SetActive(false);
_isShow = false;
});
}
if (GameInit.Ins.gamePlace == GamePlace.HangZhouLongHuTianJie || GameInit.Ins.gamePlace == GamePlace.Guangzhou_Panyv_Zhanting)
{
transform.DOMoveX(endValue, 4).OnComplete(() =>

View File

@@ -119,6 +119,13 @@ public class Leviathan : Enemy
Both();
});
}
else if(GameInit.Ins.gamePlace==GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
{
transform.DOMove(new Vector3(-2.47f,transform.position.y,-4.51f), 2).OnComplete(() =>
{
Both();
});
}
else if(GameInit.Ins.gamePlace == GamePlace.Hubei_Xiangyang_Kejiguan)
{
transform.DOMove(new Vector3(1.4f,-2.5f,18.6f),2).OnComplete(() =>

View File

@@ -104,6 +104,13 @@ public class MachineDragon : Enemy
Both();
});
}
else if (GameInit.Ins.gamePlace == GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
{
transform.DOMove(new Vector3(1.17f,transform.position.y,14.06f), 4).OnComplete(() =>
{
Both();
});
}
else if(GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Shangchang_nei)
{
transform.DOMove(new Vector3(-5.26f,transform.position.y,2.2f), 4).OnComplete(() =>

View File

@@ -150,6 +150,7 @@ public class GameManager : MonoBehaviour
if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jining_Shangchang_nei)
loginInfo.shop = 9;
#endif
//loginInfo.shop = 0;
loginInfo.gameId = 5;
string authJson = JsonUtility.ToJson(loginInfo);
Debug.Log("发送数据 -> " + authJson);
@@ -344,6 +345,10 @@ public class GameManager : MonoBehaviour
{
EnergyPump.transform.position = pos;
}
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Jishou_Qianzhou_Tianhong)
{
EnergyPump.transform.position = new Vector3(2f, 0, 3f);
}
EnergyPumpTag++;
EnergyPump.GetComponent<EnergyPump>().Init(EnergyPumpTag);
}