PineappleTech/FutureMen
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加成都双流圣菲学校，重庆侠客行试玩场景

Browse Source
This commit is contained in:
ZYT
2025-12-01 15:41:15 +08:00
parent 628aed1b2e
commit c572c17727
35 changed files with 56794 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scripts/Enemy/Boss/Boss.cs
View File

@@ -247,6 +247,7 @@ public class Boss : Enemy
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei
||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang
||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2
||GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan
)
{
@@ -350,7 +351,7 @@ public class Boss : Enemy
}
if (GameInit.Ins.gamePlace == GamePlace.Nanjing_Pukou_Longhutianjie)
{
transform.DOMove(new Vector3(-1.23f, 3f, 3.9f), 4).OnComplete(() =>
transform.DOMove(new Vector3(-1.23f, 2f, 3.9f), 4).OnComplete(() =>
{
Both();
});
@@ -398,6 +399,13 @@ public class Boss : Enemy
Both();
});
}
if (GameInit.Ins.gamePlace == GamePlace.Chengdu_Shuangliu_ShengfeiXuexiao)
{
transform.DOMove(new Vector3(-0.2f, 3f, 25.2f), 4).OnComplete(() =>
{
Both();
});
}
else
{

5
Assets/Scripts/Enemy/DropShip/DropShip.cs
View File

@@ -366,7 +366,10 @@ public class DropShip : Enemy
});
}
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei
||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2)
||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang
||GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2
||GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan
)
{
transform.DOMove(new Vector3(0.5f, 5f, 12.71f), 4).OnComplete(() =>
{

8
Assets/Scripts/Enemy/Leviathan/Leviathan.cs
View File

@@ -220,6 +220,7 @@ public class Leviathan : Enemy
else if(GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2
|| GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan
)
{
transform.DOMove(new Vector3(-0.25f,-3.5f,10.92f),2).OnComplete(() =>
@@ -389,6 +390,13 @@ public class Leviathan : Enemy
Both();
});
}
else if (GameInit.Ins.gamePlace == GamePlace.Chengdu_Shuangliu_ShengfeiXuexiao)
{
transform.DOMove(new Vector3(3.4f, -3.5f, 42.3f), 2).OnComplete(() =>
{
Both();
});
}
else
{

47
Assets/Scripts/Enemy/MachineDragon/MachineDragon.cs
View File

@@ -212,6 +212,7 @@ public class MachineDragon : Enemy
else if(GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2
|| GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan
)
{
transform.DOMove(new Vector3(-0.16f,0f,5.51f), 4).OnComplete(() =>
@@ -544,19 +545,53 @@ public class MachineDragon : Enemy
public void ShowEnemy()
{
for (int i = 0; i < enemyPos.Length; i++)
if (GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao)
{
Vector3 curEnemyPos = new Vector3(enemyPos[i].position.x, 0, enemyPos[i].position.z);
GameManager.Ins.CreateCallEnemyEffect(curEnemyPos);
// 在江苏徐州鼓楼欧乐堡地点，生成在以固定点为中心的4×4矩形范围内
Vector3 centerPos = new Vector3(0f, 0f, 2.5f); // 从Show方法中提取的欧乐堡中心点坐标
float width = 4f; // 矩形宽度
float length = 4f; // 矩形长度
int enemyCount = enemyPos.Length;
for (int i = 0; i < enemyCount; i++)
{
// 在4×4矩形范围内随机生成位置
float randomX = Random.Range(-width / 2, width / 2);
float randomZ = Random.Range(-length / 2, length / 2);
Vector3 randomPos = centerPos + new Vector3(randomX, 0, randomZ);
GameManager.Ins.CreateCallEnemyEffect(randomPos);
}
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
for (int i = 0; i < enemyCount; i++)
{
float randomX = Random.Range(-width / 2, width / 2);
float randomZ = Random.Range(-length / 2, length / 2);
Vector3 randomPos = centerPos + new Vector3(randomX, 0, randomZ);
GameManager.Ins.CreateEnemy(6, randomPos, Vector3.zero, false);
}
}, 2f);
}
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
else
{
// 其他地点保持原有逻辑
for (int i = 0; i < enemyPos.Length; i++)
{
Vector3 curEnemyPos = new Vector3(enemyPos[i].position.x, 0, enemyPos[i].position.z);
GameManager.Ins.CreateEnemy(6, curEnemyPos, Vector3.zero, false);
GameManager.Ins.CreateCallEnemyEffect(curEnemyPos);
}
}, 2f);
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
for (int i = 0; i < enemyPos.Length; i++)
{
Vector3 curEnemyPos = new Vector3(enemyPos[i].position.x, 0, enemyPos[i].position.z);
GameManager.Ins.CreateEnemy(6, curEnemyPos, Vector3.zero, false);
}
}, 2f);
}
}
public override void StartQteAttack()

9
Assets/Scripts/Manager/GameManager.cs
View File

@@ -73,6 +73,8 @@ public enum GamePlace
Hunan_Changde_Lixian_WandaGuangchang=39,
Jilin_Changchun_Beihu_WyueGuangchang=41,
Chongqing_Yuzhong_Hongyadong_Xiakexing=42,
Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan=-42,
Chengdu_Shuangliu_ShengfeiXuexiao =43,
}
public class GameManager : MonoBehaviour
@@ -219,6 +221,8 @@ public class GameManager : MonoBehaviour
loginInfo.shop = 36;
if(GameInit.Ins.gamePlace== GamePlace.Jiangsu_Xvzhou_Suning_Guangchang_1)
loginInfo.shop = 37;
if(GameInit.Ins.gamePlace== GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan)
loginInfo.shop = 42;
#endif
//loginInfo.shop = 0;
loginInfo.gameId = 5;
@@ -525,6 +529,7 @@ public class GameManager : MonoBehaviour
if (GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Fengxian_Wuyueguangchang
|| GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2
|| GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan
)
{
EnergyPump.transform.position = new Vector3(-0.39f, 0, 3.83f);
@@ -598,6 +603,10 @@ public class GameManager : MonoBehaviour
{
EnergyPump.transform.position = new Vector3(2f, 0, 28.22f);
}
if (GameInit.Ins.gamePlace == GamePlace.Chengdu_Shuangliu_ShengfeiXuexiao)
{
EnergyPump.transform.position = new Vector3(-1.33f, 0, 17.38f);
}
EnergyPumpTag++;
EnergyPump.GetComponent<EnergyPump>().Init(EnergyPumpTag);

78
Assets/Scripts/UI/LoginPanel.cs
View File

@@ -55,45 +55,45 @@ public class LoginPanel : MonoBehaviour
public void Author()
{
//延迟请求
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
{
// 登录
GameManager.Ins.Request((req, response) =>
////延迟请求
//MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
//{
// // 登录
// GameManager.Ins.Request((req, response) =>
{
RequestLoginCount++;
if (response == null)
{
Debug.Log("鉴权失败1");
if (RequestLoginCount < 2)
{
Author();
return;
}
PanelState.StateChange(1);
return;
}
ResponseInfo info = JsonUtility.FromJson<ResponseInfo>(response.DataAsText);
if (info.code < 200 || info.code >= 300)
{
Debug.Log("鉴权失败2");
if (RequestLoginCount < 2)
{
Author();
return;
}
PanelState.StateChange(1);
return;
}
// {
// RequestLoginCount++;
// if (response == null)
// {
// Debug.Log("鉴权失败1");
// if (RequestLoginCount < 2)
// {
// Author();
// return;
// }
// PanelState.StateChange(1);
// return;
// }
// ResponseInfo info = JsonUtility.FromJson<ResponseInfo>(response.DataAsText);
// if (info.code < 200 || info.code >= 300)
// {
// Debug.Log("鉴权失败2");
// if (RequestLoginCount < 2)
// {
// Author();
// return;
// }
// PanelState.StateChange(1);
// return;
// }
if (info.code == 200)
{
GameManager.Ins.InitData();
_isLogin = true;
}
});
}, 1);
// if (info.code == 200)
// {
// GameManager.Ins.InitData();
// _isLogin = true;
// }
// });
//}, 1);
}
IEnumerator Progress()
@@ -104,8 +104,8 @@ public class LoginPanel : MonoBehaviour
_progress = 0;
_isLogin = false;
//GameManager.Ins.InitData();
//_isLogin = true;//修改为本地游戏
GameManager.Ins.InitData();
_isLogin = true;//修改为本地游戏
float curWaitTime = 0;
while (_progress<=90)