Skip to content

Commit e1760fd

Browse files
limokalimoka
committed
Update CoreLib for game version 1.1.0
1 parent 0b49f53 commit e1760fd

File tree

51 files changed

+544
-235
lines changed

Some content is hidden

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

51 files changed

+544
-235
lines changed

‎Assets/CoreLibPackage/CK/Material/CustomLitBrightOutlineAmplify.mat‎

Lines changed: 5 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: CustomLitBrightOutlineAmplify
1111
m_Shader: {fileID: 4800000, guid: 5329a08211ea3db478223b9a8f6f85b6, type: 3}
12+
m_Parent: {fileID: 2100000, guid: 6a0595a097935c440bfbeaf89aa59bfc, type: 2}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- ETC1_EXTERNAL_ALPHA
@@ -18,82 +20,13 @@ Material:
1820
m_CustomRenderQueue: -1
1921
stringTagMap: {}
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
23-
m_TexEnvs:
24-
- _EmissiveTex:
25-
m_Texture: {fileID: 0}
26-
m_Scale: {x: 1, y: 1}
27-
m_Offset: {x: 0, y: 0}
28-
- _MainTex:
29-
m_Texture: {fileID: 0}
30-
m_Scale: {x: 1, y: 1}
31-
m_Offset: {x: 0, y: 0}
32-
- _ReflectionMask:
33-
m_Texture: {fileID: 0}
34-
m_Scale: {x: 1, y: 1}
35-
m_Offset: {x: 0, y: 0}
36-
- _texcoord:
37-
m_Texture: {fileID: 0}
38-
m_Scale: {x: 1, y: 1}
39-
m_Offset: {x: 0, y: 0}
40-
- unity_Lightmaps:
41-
m_Texture: {fileID: 0}
42-
m_Scale: {x: 1, y: 1}
43-
m_Offset: {x: 0, y: 0}
44-
- unity_LightmapsInd:
45-
m_Texture: {fileID: 0}
46-
m_Scale: {x: 1, y: 1}
47-
m_Offset: {x: 0, y: 0}
48-
- unity_ShadowMasks:
49-
m_Texture: {fileID: 0}
50-
m_Scale: {x: 1, y: 1}
51-
m_Offset: {x: 0, y: 0}
26+
m_TexEnvs: []
5227
m_Ints: []
53-
m_Floats:
54-
- _AddDirectionalLight: 0
55-
- _AlphaClipThreshold: 0.5
56-
- _AlphaCutoff: 0.5
57-
- _Cull: 0
58-
- _Cutoff: 0.5
59-
- _DirLightShadowOpacity: 1
60-
- _EmissiveIndirectMultiplier: 1
61-
- _EnvironmentReflections: 1
62-
- _FlashAmount: 0
63-
- _MultiplyFlashTintWithLight: 0
64-
- _NoDirectionalShadow: 0
65-
- _QueueControl: 0
66-
- _QueueOffset: 0
67-
- _ReceiveShadows: 1
68-
- _ReflectionOffset: 0
69-
- _Reflections: 0
70-
- _Shininess: 0.1
71-
- _ShowOutline: 0
72-
- _SpecularHighlights: 1
73-
- _SpriteIsLyingDown: 0
74-
- _TransAmbient: 0.2
75-
- _TransDirect: 1
76-
- _TransNormalDistortion: 0.1
77-
- _TransScattering: 2
78-
- _TransShadow: 0.9
79-
- _Translucency: 1
80-
- _TransparentPass: 0
81-
- _UseOuter: 0
82-
- __dirty: 0
83-
- _useTransparentVertices: 1
28+
m_Floats: []
8429
m_Colors:
85-
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
86-
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
87-
- _Emissive: {r: 0, g: 0, b: 0, a: 0}
88-
- _MainColor: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1}
89-
- _MaxUV: {r: 0, g: 0, b: 0, a: 0}
90-
- _MinUV: {r: 0, g: 0, b: 0, a: 0}
9130
- _OutlineColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1}
9231
- _ReflectionColor: {r: 0.24999997, g: 0.24999997, b: 0.24999997, a: 1}
93-
- _SpecularColor: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1}
94-
- _SpriteColor: {r: 1, g: 1, b: 1, a: 1}
95-
- _SpriteRect: {r: 0, g: 0, b: 0, a: 0}
96-
- _Tint: {r: 1, g: 1, b: 1, a: 0}
97-
- _tint: {r: 1, g: 1, b: 1, a: 0}
98-
- groupOffsets: {r: 0, g: 0, b: 0, a: 0}
9932
m_BuildTextureStacks: []

‎Assets/CoreLibPackage/CK/Material/PlaceIconAmplify.mat‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: PlaceIconAmplify
1111
m_Shader: {fileID: 4800000, guid: 5329a08211ea3db478223b9a8f6f85b6, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- ETC1_EXTERNAL_ALPHA
@@ -18,6 +20,7 @@ Material:
1820
m_CustomRenderQueue: -1
1921
stringTagMap: {}
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -45,6 +48,7 @@ Material:
4548
- __dirty: 0
4649
- _transparancy: 0.5
4750
m_Colors:
51+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
4852
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
4953
- _Emissive: {r: 0, g: 0, b: 0, a: 0}
5054
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}

‎Assets/CoreLibPackage/CoreLib.Audio/Scripts/AudioModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static SfxID AddSoundEffect(AudioClip effectClip)
6868

6969
#region Private Implementation
7070

71-
internal override GameVersion Build => new GameVersion(0, 7, 3, "a28f");
71+
internal override GameVersion Build => new GameVersion(1, 1, 0, "90bc");
7272
internal override string Version => "3.1.0";
7373

7474
internal static AudioModule Instance => CoreLibMod.GetModuleInstance<AudioModule>();

‎Assets/CoreLibPackage/CoreLib.Commands/Scripts/CommandsModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public static IEnumerable<IClientCommandHandler> GetClientCommandHandlers(string
131131

132132
#region Private Implementation
133133

134-
internal override GameVersion Build => new GameVersion(1, 0, 0, "4407");
135-
internal override string Version => "3.1.3";
134+
internal override GameVersion Build => new GameVersion(1, 1, 0, "90bc");
135+
internal override string Version => "3.2.2";
136136
internal override Type[] Dependencies => new[] { typeof(RewiredExtensionModule) };
137137
internal static CommandsModule Instance => CoreLibMod.GetModuleInstance<CommandsModule>();
138138

‎Assets/CoreLibPackage/CoreLib.Commands/Scripts/Patches/ChatWindow_Patch.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void OnUpdate(ChatWindow __instance)
6565

6666
if (CommandsModule.rewiredPlayer.GetButtonDown(CommandsModule.COMPLETE_KEY))
6767
{
68-
string input = __instance.inputField.textString;
68+
string input = __instance.inputField.displayedTextString;
6969
string[] args = input.Split(' ');
7070
if (args[0].StartsWith(CommandsModule.CommandPrefix))
7171
{
@@ -99,7 +99,7 @@ public static void OnSendMessage(ChatWindow __instance, ref bool commit)
9999
if (commit)
100100
{
101101
PugText text = __instance.inputField;
102-
string input = text.textString;
102+
string input = text.displayedTextString;
103103

104104
if (CommandsModule.SendCommand(input)) return;
105105

@@ -129,7 +129,7 @@ private static void UpdateHistory(string input)
129129

130130
internal static void SendMessage(ChatWindow window, string message, Color color)
131131
{
132-
object[] args = { ChatWindow.MessageTextType.Sent, null };
132+
object[] args = { ChatWindow.MessageTextType.Sent, null, null };
133133
PugText pugText = window.Invoke<PugText>("AllocPugText", args);
134134
PugTextEffectMaxFade fadeEffect = (PugTextEffectMaxFade)args[1];
135135

‎Assets/CoreLibPackage/CoreLib.Drops/Scripts/DropTablesModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class DropTablesModule : BaseSubmodule
1111
{
1212
#region Public Interface
1313

14-
internal override GameVersion Build => new GameVersion(1, 0, 0, "4407");
14+
internal override GameVersion Build => new GameVersion(1, 1, 0, "90bc");
1515
internal override string Version => "3.1.1";
1616
internal static DropTablesModule Instance => CoreLibMod.GetModuleInstance<DropTablesModule>();
1717

‎Assets/CoreLibPackage/CoreLib.Entity/Prefab/ModWorkbenchBuilding.prefab‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ MonoBehaviour:
4747
weightMultiplier: 1
4848
useDiscreteOutlineColor: 0
4949
entityMono: {fileID: 8027077187489102656}
50-
interactCooldown: 0
5150
requiredFactionToInteract: 0
5251
optionalIcon: {fileID: 0}
5352
optionalOutlineController: {fileID: 4823659141933555137}
5453
additionalOutlineControllers: []
5554
spriteObjects: []
56-
onlyTriggerActionsOnce: 0
5755
onUseActions:
5856
- m_PersistentCalls:
5957
m_Calls:
@@ -69,8 +67,6 @@ MonoBehaviour:
6967
m_StringArgument:
7068
m_BoolArgument: 0
7169
m_CallState: 2
72-
onReleaseActions: []
73-
onTriggerEnterActions: []
7470
onTriggerExitActions:
7571
- m_PersistentCalls:
7672
m_Calls:
@@ -88,8 +84,8 @@ MonoBehaviour:
8884
m_CallState: 2
8985
radius: 1.3
9086
interactingPoints: []
91-
allowToUseDuringCutscene: 0
9287
allowToUseOnlyWhenClaimed: 0
88+
ignorePlayerDirection: 0
9389
--- !u!1 &1284432609753473
9490
GameObject:
9591
m_ObjectHideFlags: 0
@@ -159,12 +155,14 @@ MonoBehaviour:
159155
particleOptions:
160156
particlesToSpawn:
161157
- spawnOccasion: 0
158+
spawnManually: 0
162159
objectID: 4049
163160
particles:
164161
- puff: 79
165162
positionTransform: {fileID: 4723762556048704}
166163
particleCount: 15
167164
- spawnOccasion: 0
165+
spawnManually: 0
168166
objectID: 4047
169167
particles:
170168
- puff: 79
@@ -184,6 +182,7 @@ MonoBehaviour:
184182
outlineControllers: []
185183
hasDisableableParticles: 0
186184
previousHealth: 0
185+
m_spriteObjectOrientationHash: 0
187186
craftingUITitle:
188187
mTerm: crafting
189188
mRTL_IgnoreArabicFix: 0
@@ -206,13 +205,8 @@ MonoBehaviour:
206205
hideRecipes: 0
207206
craftingUIOverrideSettings: []
208207
craftingCategoryWindowInfos: []
209-
mainRenderer: {fileID: 2967082505936103632}
210-
mainSkin: {fileID: 2190583743731650988}
211-
variations:
212-
- {fileID: -197509980, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}
213-
- {fileID: 1788229040, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}
214-
- {fileID: -233243307, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}
215-
- {fileID: 1977454113, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}
208+
mainObject: {fileID: 0}
209+
shadowObject: {fileID: 0}
216210
particleSpawnLocation: {fileID: 4723762556048704}
217211
--- !u!95 &2758006297334819856
218212
Animator:
@@ -373,7 +367,7 @@ GameObject:
373367
- component: {fileID: 1162189779661422236}
374368
- component: {fileID: 1758184511800959113}
375369
- component: {fileID: 2026980375923716335}
376-
- component: {fileID: 3695684018743866048}
370+
- component: {fileID: 8887192019678376809}
377371
m_Layer: 22
378372
m_Name: Shadow
379373
m_TagString: ExcludeFromSpriteAutoSort
@@ -461,21 +455,18 @@ MonoBehaviour:
461455
m_Name:
462456
m_EditorClassIdentifier:
463457
materialName: FloorShadowAmplify
464-
--- !u!114 &3695684018743866048
458+
--- !u!114 &8887192019678376809
465459
MonoBehaviour:
466460
m_ObjectHideFlags: 0
467461
m_CorrespondingSourceObject: {fileID: 0}
468462
m_PrefabInstance: {fileID: 0}
469463
m_PrefabAsset: {fileID: 0}
470464
m_GameObject: {fileID: 3425191251724118082}
471-
m_Enabled: 0
465+
m_Enabled: 1
472466
m_EditorHideFlags: 0
473-
m_Script: {fileID: 1536336809, guid: 3b024c3700b14424aaa1008f2cb49541, type: 3}
467+
m_Script: {fileID: -1627408644, guid: 3b024c3700b14424aaa1008f2cb49541, type: 3}
474468
m_Name:
475469
m_EditorClassIdentifier:
476-
extraIndirectRenderer: 0
477-
indirectRendererPivot: {x: 0, y: 0, z: 0}
478-
indirectRendererOffset: 0
479470
--- !u!1 &4781863185656598850
480471
GameObject:
481472
m_ObjectHideFlags: 0
@@ -551,9 +542,9 @@ GameObject:
551542
- component: {fileID: 1320990062596414910}
552543
- component: {fileID: 2967082505936103632}
553544
- component: {fileID: 1998695795774351704}
554-
- component: {fileID: 6436030991166987652}
555545
- component: {fileID: 4823659141933555137}
556546
- component: {fileID: 2190583743731650988}
547+
- component: {fileID: 5041890674658996436}
557548
m_Layer: 7
558549
m_Name: SR Vertical
559550
m_TagString: Untagged
@@ -596,7 +587,7 @@ SpriteRenderer:
596587
m_RenderingLayerMask: 1
597588
m_RendererPriority: 0
598589
m_Materials:
599-
- {fileID: 2100000, guid: 6a0595a097935c440bfbeaf89aa59bfc, type: 2}
590+
- {fileID: 0}
600591
m_StaticBatchInfo:
601592
firstSubMesh: 0
602593
subMeshCount: 0
@@ -641,22 +632,22 @@ MonoBehaviour:
641632
m_Name:
642633
m_EditorClassIdentifier:
643634
materialName: CustomLitAmplify
644-
--- !u!114 &6436030991166987652
635+
--- !u!114 &4823659141933555137
645636
MonoBehaviour:
646637
m_ObjectHideFlags: 0
647638
m_CorrespondingSourceObject: {fileID: 0}
648639
m_PrefabInstance: {fileID: 0}
649640
m_PrefabAsset: {fileID: 0}
650641
m_GameObject: {fileID: 8478739760078641493}
651-
m_Enabled: 0
642+
m_Enabled: 1
652643
m_EditorHideFlags: 0
653-
m_Script: {fileID: 1536336809, guid: 3b024c3700b14424aaa1008f2cb49541, type: 3}
644+
m_Script: {fileID: -591214121, guid: 3519ac58e5ff54941a4a69512016923c, type: 3}
654645
m_Name:
655646
m_EditorClassIdentifier:
656-
extraIndirectRenderer: 0
657-
indirectRendererPivot: {x: 0, y: -0.5, z: 0}
658-
indirectRendererOffset: 0.1
659-
--- !u!114 &4823659141933555137
647+
showOutline: 0
648+
useOuterOutline: 0
649+
isAnimatedForceOutline: 0
650+
--- !u!114 &2190583743731650988
660651
MonoBehaviour:
661652
m_ObjectHideFlags: 0
662653
m_CorrespondingSourceObject: {fileID: 0}
@@ -665,12 +656,11 @@ MonoBehaviour:
665656
m_GameObject: {fileID: 8478739760078641493}
666657
m_Enabled: 1
667658
m_EditorHideFlags: 0
668-
m_Script: {fileID: -591214121, guid: 3519ac58e5ff54941a4a69512016923c, type: 3}
659+
m_Script: {fileID: -1706586952, guid: 3519ac58e5ff54941a4a69512016923c, type: 3}
669660
m_Name:
670661
m_EditorClassIdentifier:
671-
showOutline: 0
672-
useOuterOutline: 0
673-
--- !u!114 &2190583743731650988
662+
skin: {fileID: 2800000, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}
663+
--- !u!114 &5041890674658996436
674664
MonoBehaviour:
675665
m_ObjectHideFlags: 0
676666
m_CorrespondingSourceObject: {fileID: 0}
@@ -679,7 +669,6 @@ MonoBehaviour:
679669
m_GameObject: {fileID: 8478739760078641493}
680670
m_Enabled: 1
681671
m_EditorHideFlags: 0
682-
m_Script: {fileID: -1706586952, guid: 3519ac58e5ff54941a4a69512016923c, type: 3}
672+
m_Script: {fileID: -1627408644, guid: 3b024c3700b14424aaa1008f2cb49541, type: 3}
683673
m_Name:
684674
m_EditorClassIdentifier:
685-
skin: {fileID: 2800000, guid: 006c3608fefce844e9b7ef38e6517f22, type: 3}

‎Assets/CoreLibPackage/CoreLib.Entity/Prefab/ModWorkbenchBuildingNew.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ MonoBehaviour:
281281
m_GameObject: {fileID: 177096252312240637}
282282
m_Enabled: 1
283283
m_EditorHideFlags: 0
284-
m_Script: {fileID: 179130730, guid: 8755fc0f8990e9f418149df4a482da57, type: 3}
284+
m_Script: {fileID: 1908045241, guid: 8755fc0f8990e9f418149df4a482da57, type: 3}
285285
m_Name:
286286
m_EditorClassIdentifier:
287287
m_asset: {fileID: 11400000, guid: 9e5aa8becaff59e40b5758e408e72387, type: 2}
@@ -375,7 +375,7 @@ MonoBehaviour:
375375
m_GameObject: {fileID: 8289332207088880398}
376376
m_Enabled: 1
377377
m_EditorHideFlags: 0
378-
m_Script: {fileID: 179130730, guid: 8755fc0f8990e9f418149df4a482da57, type: 3}
378+
m_Script: {fileID: 1908045241, guid: 8755fc0f8990e9f418149df4a482da57, type: 3}
379379
m_Name:
380380
m_EditorClassIdentifier:
381381
m_asset: {fileID: 11400000, guid: 9e5aa8becaff59e40b5758e408e72387, type: 2}

0 commit comments

Comments
 (0)