Skip to content

Commit 60b01c3

Browse files
authored
Merge pull request #14 from shnok/dev
Character select base and bug fixes
2 parents fc16d4e + ef7ad82 commit 60b01c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+990
-163
lines changed

l2-unity/Assets/Rendering/SceneLighting.lighting

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LightingSettings:
2929
m_MixedBakeMode: 0
3030
m_LightmapsBakeMode: 1
3131
m_FilterMode: 1
32-
m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
32+
m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0}
3333
m_ExportTrainingData: 0
3434
m_TrainingDataDestination: TrainingData
3535
m_RealtimeResolution: 1

l2-unity/Assets/Resources/Data/Animations/DarkElf/FDarkElf/Pawn_FDarkElf.prefab

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ GameObject:
118118
- component: {fileID: 8320559729586774763}
119119
- component: {fileID: -2046524599472184396}
120120
- component: {fileID: -8090151252177058546}
121+
- component: {fileID: 1830847236195018905}
121122
m_Layer: 6
122123
m_Name: Pawn_FDarkElf
123124
m_TagString: User
@@ -518,6 +519,57 @@ MonoBehaviour:
518519
_animator: {fileID: 0}
519520
_resetStateOnReceive: 0
520521
_spAtk01ClipLength: 1000
522+
--- !u!114 &1830847236195018905
523+
MonoBehaviour:
524+
m_ObjectHideFlags: 0
525+
m_CorrespondingSourceObject: {fileID: 0}
526+
m_PrefabInstance: {fileID: 0}
527+
m_PrefabAsset: {fileID: 0}
528+
m_GameObject: {fileID: 2252958834938601816}
529+
m_Enabled: 1
530+
m_EditorHideFlags: 0
531+
m_Script: {fileID: 11500000, guid: ee42b575f5d5b144787997be4c919052, type: 3}
532+
m_Name:
533+
m_EditorClassIdentifier:
534+
_characterInfo:
535+
_name:
536+
_account:
537+
_id: 0
538+
_position: {x: 0, y: 0, z: 0}
539+
_playerAppearance:
540+
_collisonHeight: 0
541+
_collisionRadius: 0
542+
_lhand: 0
543+
_rhand: 0
544+
_race: 0
545+
_sex: 0
546+
_face: 0
547+
_hairStyle: 0
548+
_hairColor: 0
549+
_chest: 0
550+
_legs: 0
551+
_gloves: 0
552+
_feet: 0
553+
_characterRaceAnimation: 0
554+
_playerStatus:
555+
_hp: 0
556+
_maxHp: 0
557+
_level: 0
558+
_cp: 0
559+
_maxCp: 0
560+
_mp: 0
561+
_maxMp: 0
562+
_isMage: 0
563+
_classId: 0
564+
_exp: 0
565+
_sp: 0
566+
_expPercent: 0
567+
_karma: 0
568+
_pvpKills: 0
569+
_pkKills: 0
570+
_deleteTimer: 0
571+
_clanId: 0
572+
_selected: 0
521573
--- !u!1 &6411853543172213777
522574
GameObject:
523575
m_ObjectHideFlags: 0

l2-unity/Assets/Resources/Data/Animations/Dwarf/FDwarf/Pawn_FDwarf.prefab

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ GameObject:
118118
- component: {fileID: 8320559729586774763}
119119
- component: {fileID: 3808788841989169926}
120120
- component: {fileID: 8742318803030968846}
121+
- component: {fileID: -883512877712383744}
121122
m_Layer: 6
122123
m_Name: Pawn_FDwarf
123124
m_TagString: User
@@ -518,6 +519,57 @@ MonoBehaviour:
518519
_animator: {fileID: 0}
519520
_resetStateOnReceive: 0
520521
_spAtk01ClipLength: 1000
522+
--- !u!114 &-883512877712383744
523+
MonoBehaviour:
524+
m_ObjectHideFlags: 0
525+
m_CorrespondingSourceObject: {fileID: 0}
526+
m_PrefabInstance: {fileID: 0}
527+
m_PrefabAsset: {fileID: 0}
528+
m_GameObject: {fileID: 2252958834938601816}
529+
m_Enabled: 1
530+
m_EditorHideFlags: 0
531+
m_Script: {fileID: 11500000, guid: ee42b575f5d5b144787997be4c919052, type: 3}
532+
m_Name:
533+
m_EditorClassIdentifier:
534+
_characterInfo:
535+
_name:
536+
_account:
537+
_id: 0
538+
_position: {x: 0, y: 0, z: 0}
539+
_playerAppearance:
540+
_collisonHeight: 0
541+
_collisionRadius: 0
542+
_lhand: 0
543+
_rhand: 0
544+
_race: 0
545+
_sex: 0
546+
_face: 0
547+
_hairStyle: 0
548+
_hairColor: 0
549+
_chest: 0
550+
_legs: 0
551+
_gloves: 0
552+
_feet: 0
553+
_characterRaceAnimation: 0
554+
_playerStatus:
555+
_hp: 0
556+
_maxHp: 0
557+
_level: 0
558+
_cp: 0
559+
_maxCp: 0
560+
_mp: 0
561+
_maxMp: 0
562+
_isMage: 0
563+
_classId: 0
564+
_exp: 0
565+
_sp: 0
566+
_expPercent: 0
567+
_karma: 0
568+
_pvpKills: 0
569+
_pkKills: 0
570+
_deleteTimer: 0
571+
_clanId: 0
572+
_selected: 0
521573
--- !u!1 &6411853543172213777
522574
GameObject:
523575
m_ObjectHideFlags: 0

l2-unity/Assets/Resources/Data/UI/_Elements/Login/Lineage2_Login.uxml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
22
<Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
3+
<ui:VisualElement name="NameplatesContainer" focusable="false" usage-hints="GroupTransform" style="opacity: 1; display: flex; background-color: rgba(173, 110, 0, 0); flex-grow: 1; position: absolute; width: 100%; height: 100%;">
4+
<ui:VisualElement name="Spacer" style="flex-grow: 1;" />
5+
</ui:VisualElement>
36
<ui:VisualElement name="UIContainer" class="login-window" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
47
<ui:VisualElement name="BG" style="flex-grow: 1; position: absolute; width: 100%; height: 100%; justify-content: flex-start; align-items: center; background-color: rgba(0, 0, 0, 0); top: 1px; left: 0;">
58
<ui:VisualElement name="L2Logo" style="flex-grow: 0; background-image: resource(&apos;Data/UI/Login/l2logo-white&apos;); width: 160px; height: 150px; flex-shrink: 0; justify-content: flex-start; margin-top: 5%;" />

l2-unity/Assets/Resources/Prefab/Game.prefab

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GameObject:
1313
- component: {fileID: 2081572240581827940}
1414
- component: {fileID: 6227403751048920905}
1515
- component: {fileID: 5806285974765348047}
16-
- component: {fileID: 6884152524510837502}
16+
- component: {fileID: 3414367172090928233}
1717
m_Layer: 0
1818
m_Name: Game
1919
m_TagString: Untagged
@@ -48,7 +48,8 @@ MonoBehaviour:
4848
m_Script: {fileID: 11500000, guid: 021711eabd7d2494980c3047c33aee55, type: 3}
4949
m_Name:
5050
m_EditorClassIdentifier:
51-
_gameState: 1
51+
_protocolVersion: 1
52+
_gameState: 0
5253
--- !u!114 &2081572240581827940
5354
MonoBehaviour:
5455
m_ObjectHideFlags: 0
@@ -93,7 +94,7 @@ MonoBehaviour:
9394
- 17_25
9495
- 16_24
9596
- 17_24
96-
--- !u!114 &6884152524510837502
97+
--- !u!114 &3414367172090928233
9798
MonoBehaviour:
9899
m_ObjectHideFlags: 0
99100
m_CorrespondingSourceObject: {fileID: 0}
@@ -102,6 +103,6 @@ MonoBehaviour:
102103
m_GameObject: {fileID: 6810262815525540192}
103104
m_Enabled: 1
104105
m_EditorHideFlags: 0
105-
m_Script: {fileID: 11500000, guid: 02036ff767bda8941afeefd2b9dcebb0, type: 3}
106+
m_Script: {fileID: 11500000, guid: a7ec007b0cdb24343a752efda3c5bb5e, type: 3}
106107
m_Name:
107108
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)