kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge branch 'main' of http://10.27.16.144:3000/kawagiri/TH1

Browse Source
This commit is contained in:
daixiawu 2025-07-16 16:46:31 +08:00
commit 9899cbfe8c
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
My project/Assets/Scripts/Logic/Achievement/AchievementAsset.cs
View File

@ -68,5 +68,10 @@ namespace Logic.Achievement
_achievementItems.Clear();
foreach (var item in AchievementList) _achievementItems[item.ID] = item;
}
public void ClearAchievementFinishedInfo()
{
foreach (var item in AchievementList) item.IsFinished = false;
}
}
}

7
My project/Assets/Scripts/Logic/Achievement/AchievementDataManager.cs
View File

@ -29,7 +29,12 @@ namespace RuntimeData
string json = File.ReadAllText(path);
Achievement = JsonUtility.FromJson<AchievementAsset>(json);
}
if (Achievement == null) Achievement = Resources.Load<AchievementAsset>("Export/Achievement");
if (Achievement == null)
{
Achievement = Resources.Load<AchievementAsset>("Export/Achievement");
Achievement.ClearAchievementFinishedInfo();
}
FinishedCache ??= new List<uint>();
FinishedCache.Clear();
}

14
My project/Assets/Scripts/Logic/Action/ActionLogic.cs
View File

@ -715,17 +715,14 @@ namespace Logic.Action
ProjectileType.Faith, ProjectileMoveType.CoinParabola, 300);
}
}
else
Main.CityLogic.CityUpdateExp(actionParams.MapData,city,wonderInfo.Exp);
else Main.CityLogic.CityUpdateExp(actionParams.MapData,city,wonderInfo.Exp);
actionParams.GridData.ResourceUnderBuilding = actionParams.GridData.Resource;
actionParams.GridData.Resource = ResourceType.Wonder;
actionParams.GridData.Wonder = wonderInfo.Wonder;
player.Wonder.SetWonderState(wonderInfo.WonderType,WonderState.FINISH_BUILD);
actionParams.GridData.RenderMark = true;
AchievementDataManager.Instance.OnBuildWonder(actionParams.MapData, player, city, actionParams.GridData);
return true;
}
@ -1420,12 +1417,9 @@ namespace Logic.Action
if (gridData == null)
return false;
actionParams.PlayerData.PlayerWealth -= GetCost();
actionParams.MapData.AddUnitData(gridData.Id,cityData.Id,_actionId.UnitType,_actionId.GiantType);
var newUnit = actionParams.MapData.AddUnitData(gridData.Id,cityData.Id,_actionId.UnitType,_actionId.GiantType);
cityData.CityInfoRenderMark = true;
//临时做法，用来播放VFX,获取Main，理应向MapData写入一个VFX的RenderMark的
var main = GameObject.Find("Main").GetComponent<Main>();
if (Main.MapData == actionParams.MapData)// && actionParams.PlayerData.Id == actionParams.MapData.PlayerMap.SelfPlayerData.Id)
@ -1438,8 +1432,8 @@ namespace Logic.Action
var endPos = Camera.main.ScreenToWorldPoint(faithPanel.position);
MapRenderer.Instance.ProjectileManager.CreateProjectile(main,actionParams.MapData,v1,endPos,ProjectileType.Faith,ProjectileMoveType.CoinParabola,score);
}
AchievementDataManager.Instance.OnTrainUnit(actionParams.MapData, actionParams.PlayerData, actionParams.CityData, newUnit);
}
return true;
}

7
My project/Assets/Scripts/Logic/Editor/AchievementEditorWindow.cs
View File

@ -9,6 +9,7 @@
using System.Collections.Generic;
using Logic.Achievement;
using NUnit.Framework;
using RuntimeData;
using UnityEditor;
using UnityEngine;
@ -98,7 +99,11 @@ namespace Logic.Editor
_asset.AchievementList.Remove(item);
}
}
if (Application.isPlaying && InspectorUtils.InspectorButtonWithTextWidth("清空成就完成情况(运行时)"))
{
AchievementDataManager.Instance.Achievement.ClearAchievementFinishedInfo();
AchievementDataManager.Instance.SaveAchievementData();
}
if (_bigID != 0 && _smallID != 0)
{
if (InspectorUtils.InspectorButtonWithTextWidth("增加一条成就"))

2
My project/Assets/Scripts/Logic/Unit/UnitLogic.cs
View File

@ -78,6 +78,7 @@ namespace Logic
public bool MoveTo(MapData mapData, UnitData unitData, GridData gridData,MoveType moveType)
{
mapData.SetUnitIdToGridId(unitData.Id,gridData.Id);
if (mapData == Main.MapData) AchievementDataManager.Instance.OnUnitMove(mapData, unitData, gridData);
//如果主动移动会消耗所有类别的行动点数，被动挤出去的移动不算
if(moveType != MoveType.PassiveMove && moveType != MoveType.AttackMove )
unitData.MP = unitData.CP = unitData.AP = 0;
@ -331,6 +332,7 @@ namespace Logic
else if (target.CanBeKilled(mapData) && target.Health <= 0)
{
UnitDie(mapData, target, dmg);
if (Main.MapData == mapData) AchievementDataManager.Instance.OnKillUnit(mapData, origin, target);
settlement.IsKill = true;
if (!origin.IsExpLock(mapData)) origin.Exp++;