sakuya bug + 踢人供

This commit is contained in:
kawagiri 2026-05-10 19:13:04 +08:00
parent 95911188d1
commit ebc9ff18cd
7 changed files with 3041 additions and 2662 deletions

View File

@ -1,5 +1,5 @@
{
"nextId": 109,
"nextId": 112,
"bugs": [
{
"id": 2,
@ -995,11 +995,11 @@
"id": 101,
"title": "灵乌路空可以以盟友城市中心为目标",
"description": "",
"status": "open",
"status": "fixed",
"priority": "medium",
"module": "",
"createdAt": 1778328457814,
"updatedAt": 1778328457814
"updatedAt": 1778407210483
},
{
"id": 102,
@ -1070,6 +1070,36 @@
"module": "",
"createdAt": 1778402313427,
"updatedAt": 1778402313427
},
{
"id": 109,
"title": "我一层恐惧铃仙分身杀带恐惧的恐惧的残血单位后,发现铃仙点不到了,然后点错误画面刷新,最后发现点不了下一回合了",
"description": "",
"status": "open",
"priority": "medium",
"module": "",
"createdAt": 1778408435437,
"updatedAt": 1778408435437
},
{
"id": 110,
"title": "踢人功能",
"description": "",
"status": "open",
"priority": "medium",
"module": "",
"createdAt": 1778408560758,
"updatedAt": 1778408560758
},
{
"id": 111,
"title": "咲夜四级不会积累疲劳",
"description": "",
"status": "open",
"priority": "medium",
"module": "",
"createdAt": 1778409653691,
"updatedAt": 1778409653691
}
]
}

View File

@ -1549,7 +1549,7 @@ MonoBehaviour:
- SkillType: 114
SkillViewType: 2
SkillName: "\u5B8C\u7F8E\u5973\u4EC6"
SkillDesc: "\u66FF\u4EE3**<\u94F6\u4E4B\u8DF3\u8DC3>**\uFF0C\u53EF\u4EE5\u79FB\u52A8\u81F3\u4EFB\u610F**<\u5DF1\u65B9\u82F1\u96C4>**1\u683C\u8303\u56F4\u5185\uFF0C\u5E76\u4F7F**<1\u683C\u8303\u56F4\u5185>**\u7684**<\u5DF1\u65B9\u82F1\u96C4>**\u83B7\u5F97**<\u989D\u5916\u4E00\u6B21\u653B\u51FB\u673A\u4F1A>**\u4EE5\u53CA**<\u5973\u4EC6\u957F\u62A4\u4F51>**\uFF1A\u54B2\u591C\u5728\u9644\u8FD1\u65F6\uFF0C\u6240\u53D7\u4F24\u5BB3\u51CF\u534A\u8F6C\u79FB\u81F3\u54B2\u591C\uFF0C\u6301\u7EED1\u56DE\u5408\u3002"
SkillDesc: "\u53EF\u4EE5\u79FB\u52A8\u81F3\u4EFB\u610F**<\u5DF1\u65B9\u82F1\u96C4>**1\u683C\u8303\u56F4\u5185\uFF0C\u5E76\u4F7F**<1\u683C\u8303\u56F4\u5185>**\u7684**<\u5DF1\u65B9\u82F1\u96C4>**\u83B7\u5F97**<\u5973\u4EC6\u957F\u62A4\u4F51>**\u548C1\u70B9**<\u653B\u51FB\u884C\u52A8\u70B9>**\u3002\u540C\u56DE\u5408\u5185\u591A\u6B21\u4F7F\u7528\u4F1A\u7D2F\u8BA1\u5C42\u6570\u3002\u6BCF\u6B21**<\u94F6\u4E4B\u8DF3\u8DC3>**\u90FD\u4F1A\u53E0\u52A0\u4E0E\u5F53\u524D\u5C42\u6570\u76F8\u540C\u7684**<\u75B2\u52B3>**"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: f5cb587a9626a694b885c473e6c3fe6d, type: 3}

View File

@ -1,5 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &30061200314148119
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6545997234719681170}
- component: {fileID: 5980560790268131471}
- component: {fileID: 3396679037478461850}
m_Layer: 5
m_Name: Color
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6545997234719681170
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 30061200314148119}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 156356484042927983}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5980560790268131471
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 30061200314148119}
m_CullTransparentMesh: 1
--- !u!114 &3396679037478461850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 30061200314148119}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.1882353, g: 0.1882353, b: 0.4392157, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: cbc588077765017468a18af2e00cbf0e, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!1 &1198113061185179033
GameObject:
m_ObjectHideFlags: 0
@ -155,10 +230,15 @@ MonoBehaviour:
FontID: 1
TextCfg:
- Type: 1
ApplyFontSize: 0
FontSize: 24
ApplyCharacterSpacing: 0
CharacterSpacing: 0
ApplyWordSpacing: 0
WordSpacing: 0
ApplyLineSpacing: 0
LineSpacing: 0
ApplyParagraphSpacing: 0
ParagraphSpacing: 0
--- !u!1 &1901965565678148948
GameObject:
@ -315,10 +395,15 @@ MonoBehaviour:
FontID: 2
TextCfg:
- Type: 1
ApplyFontSize: 0
FontSize: 26
ApplyCharacterSpacing: 0
CharacterSpacing: 0
ApplyWordSpacing: 0
WordSpacing: 0
ApplyLineSpacing: 0
LineSpacing: 0
ApplyParagraphSpacing: 0
ParagraphSpacing: 0
--- !u!1 &1917941083017419966
GameObject:
@ -646,6 +731,257 @@ MonoBehaviour:
clickSound: {fileID: 0}
pressScale: 0.8
scaleDuration: 0.1
--- !u!1 &2800608185786521587
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 156356484042927983}
- component: {fileID: 1851622271509651631}
- component: {fileID: 2202670781864345485}
- component: {fileID: 7880020119501827088}
- component: {fileID: 8717023295481533829}
- component: {fileID: 1707614275119018536}
- component: {fileID: 8730140487992448345}
m_Layer: 5
m_Name: QuitButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &156356484042927983
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6545997234719681170}
- {fileID: 4829467049102010618}
m_Father: {fileID: 2438225421395076648}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 490, y: 0.9}
m_SizeDelta: {x: 48.5856, y: 49.059}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1851622271509651631
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_CullTransparentMesh: 1
--- !u!114 &2202670781864345485
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: be7189cb15e02d94282dc02696d462d5, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!114 &7880020119501827088
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!114 &8717023295481533829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2202670781864345485}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!82 &1707614275119018536
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &8730140487992448345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2800608185786521587}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 33d75335a9dad784a91baba5578371fb, type: 3}
m_Name:
m_EditorClassIdentifier:
hoverSound: {fileID: 0}
targetScale: 1.1
clickSound: {fileID: 0}
pressScale: 0.8
scaleDuration: 0.1
--- !u!1 &3382124894360767356
GameObject:
m_ObjectHideFlags: 0
@ -901,6 +1237,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!1 &4574996094802340373
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4829467049102010618}
- component: {fileID: 6825134612463687813}
- component: {fileID: 3945589819778320659}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4829467049102010618
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4574996094802340373}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 156356484042927983}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -12.2264, y: -12.3456}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6825134612463687813
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4574996094802340373}
m_CullTransparentMesh: 1
--- !u!114 &3945589819778320659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4574996094802340373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 823b3b84577f3e5468c284b139bb7656, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!1 &4991307590799245255
GameObject:
m_ObjectHideFlags: 0
@ -1131,10 +1542,15 @@ MonoBehaviour:
FontID: 1
TextCfg:
- Type: 1
ApplyFontSize: 0
FontSize: 24
ApplyCharacterSpacing: 0
CharacterSpacing: 0
ApplyWordSpacing: 0
WordSpacing: 0
ApplyLineSpacing: 0
LineSpacing: 0
ApplyParagraphSpacing: 0
ParagraphSpacing: 0
--- !u!1 &6592483684148402150
GameObject:
@ -1338,6 +1754,7 @@ RectTransform:
- {fileID: 6579359848737393927}
- {fileID: 6303313510194795360}
- {fileID: 3110038563642209199}
- {fileID: 156356484042927983}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -1402,3 +1819,4 @@ MonoBehaviour:
ForcesText: {fileID: 2875130741396939258}
ForcesButton: {fileID: 8612292243586636816}
RefreshButton: {fileID: 8612292243586636816}
QuitButton: {fileID: 8717023295481533829}

View File

@ -26,13 +26,17 @@ namespace Logic.Skill
IsPermanent = true;
TurnsLimit = 0;
Score = 2;
IsLevelSkill = true;
_levelLimit = int.MaxValue;
// 咲夜飞行需要在0层时继续保留用于每回合重新从0开始累计疲劳。
_autoDisappear = false;
_heroSet = new HashSet<uint>();
}
public override void OnTurnStart(IdentifierBase identifier, MapData mapData)
{
var self = identifier as UnitData;
if (self == null) return;
// 持有者回合开始时重置为0层_autoDisappear=false保证0层不会被回收。
_level = 0;
_heroSet.Clear();
}
@ -64,6 +68,7 @@ namespace Logic.Skill
bool isExcute = false;
foreach (var gridData in aroundBuf)
{
if (targetGrid == gridData) continue;
gridData.VisibleUnit(mapData,player,out var unit);
if (unit == null || unit == self) continue;
if (!unit.TreatedAsHero(mapData,self)) continue;
@ -78,7 +83,20 @@ namespace Logic.Skill
}
ReturnAroundBuf();
if (isExcute) self.AddActionPoint(ActionPointType.Attack);
if (isExcute)
{
// 效果实际触发时,先按当前层数添加疲劳,再让自身层数+1。
// 第一次触发为0层不添加无意义的SakuyaTired记录。
var tiredLevel = Level;
if (tiredLevel > 0)
{
self.AddSkill_Legacy(SkillType.SAKUYATIRED, mapData, true, 0, true, tiredLevel, true,
SpecialAddSkillType.AddLevel, self.Id);
}
AddLevel(mapData, self, self, 1);
self.AddActionPoint(ActionPointType.Attack);
}
}
}
}

View File

@ -20,6 +20,7 @@ public class UIOutsideMultiplayMemberRowMono : MonoBehaviour
//public Button CivButton;
public Button ForcesButton;
public Button RefreshButton;
public Button QuitButton;
private SteamLobbyManager _lobby;
// Start is called before the first frame update
@ -62,7 +63,24 @@ public class UIOutsideMultiplayMemberRowMono : MonoBehaviour
ForcesButton?.onClick.AddListener(OnClickForces);
RefreshButton.gameObject.SetActive(true);
}
// 踢人按钮:仅"自己是房主 + 该行不是自己"时显示并绑定,否则隐藏
if (QuitButton != null)
{
QuitButton.onClick.RemoveAllListeners();
bool selfIsOwner = lobby.GetLobbyOwnerId() == lobby.GetSelfMemberId();
bool rowIsSelf = info.Id == lobby.GetSelfMemberId();
bool showQuit = selfIsOwner && !rowIsSelf;
QuitButton.gameObject.SetActive(showQuit);
if (showQuit)
{
// 闭包捕获本地变量,避免行复用时把上一行的 memberId 带进来
var targetMemberId = info.Id;
QuitButton.onClick.AddListener(() => lobby.KickMember(targetMemberId));
}
}
ForceEnum force = civ switch
{
CivEnum.Egyptian => ForceEnum.Remilia,

View File

@ -1 +1 @@
3774440
3887950

File diff suppressed because it is too large Load Diff