diff --git a/CREDIT.md b/CREDIT.md index c2145759e..e5987f4d1 100644 --- a/CREDIT.md +++ b/CREDIT.md @@ -7850,4 +7850,8 @@ https://youtu.be/qzhuWRQWK5I?si=PygoI274O32LWD5a - https://techcommunity.microsoft.com/t5/modern-work-app-consult-blog/running-16-bit-applications-on-windows-10-64-bit/ba-p/1671418 - https://youtu.be/vX4398Htp2w?si=QpHiUWWHw73bohwV jiggly pudding Blender Demo - https://www.blender.org/download/demo-files/#simulation here file -- https://youtube.com/shorts/snC5GfVoiz0?si=fmM_xC4embTYzl-7 \ No newline at end of file +- https://youtube.com/shorts/snC5GfVoiz0?si=fmM_xC4embTYzl-7 +- https://discord.com/channels/410126604237406209/1195601585720528976/1244851043574222888 +- https://docs.unity3d.com/2021.3/Documentation/ScriptReference/Transform.GetChild.html +- https://discord.com/channels/410126604237406209/1237590087781584958/1244969220610199642 +- https://docs.coherent-labs.com/unity-gameface/content_development/supported_features_tables/cssproperties/ \ No newline at end of file diff --git a/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/NHIEGenerator.prefab b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/NHIEGenerator.prefab index 2bd1b7842..c4adab5f7 100644 --- a/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/NHIEGenerator.prefab +++ b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/NHIEGenerator.prefab @@ -31,7 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6137162304244316998} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -204,7 +204,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6137162304244316998} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8968475810984298023 MeshFilter: @@ -293,12 +293,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4286944635875398700} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.1023183, y: 0.66873163, z: -0.26390076} + m_LocalPosition: {x: -0.1023183, y: 0.65873164, z: -0.26390076} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6137162304381049167} - m_RootOrder: 2 + m_Father: {fileID: 6137162304244316998} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4324722969678232726 GameObject: @@ -331,7 +331,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6137162304244316998} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &1070881330887050660 MeshFilter: @@ -413,7 +413,7 @@ Transform: m_Children: - {fileID: 1073608024435125321} m_Father: {fileID: 6137162304244316998} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5138415581717611678 GameObject: @@ -446,7 +446,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6137162304244316998} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -620,15 +620,17 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6137162304978503789} - {fileID: 3782530155517796} - {fileID: 2950548192720267938} - {fileID: 5932560796799396135} - {fileID: 8482907486192845085} - {fileID: 8588585997390053680} - {fileID: 286168661226756877} + - {fileID: 6137162304978503789} + - {fileID: 6137162305633286824} + - {fileID: 5516732549727810939} m_Father: {fileID: 6137162304381049167} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6137162304381049160 GameObject: @@ -666,9 +668,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6137162305633286824} - {fileID: 6137162304244316998} - - {fileID: 5516732549727810939} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -707,14 +707,16 @@ MonoBehaviour: localOnly: 0 asset: {fileID: 2805197760792257560, guid: 995595a1015d20c44a7afd7bad7a6683, type: 3} boundObjects: - - name: zaza - boundThing: {fileID: 9054746067392154081} + - name: OwnSelf + boundThing: {fileID: 6137162304381049160} - name: GenerateFakeButton boundThing: {fileID: 3820129603953507233} - name: LuaDisabledWarning boundThing: {fileID: 4324722969678232726} - - name: OwnSelf - boundThing: {fileID: 6137162304381049160} + - name: TitlerOld + boundThing: {fileID: 6230237249983172689} + - name: Cormac + boundThing: {fileID: 8592056825611162202} --- !u!114 &106908113437696888 MonoBehaviour: m_ObjectHideFlags: 0 @@ -887,13 +889,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6137162304978503790} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0.21} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0.21000004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6137162304244316998} - m_RootOrder: 0 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1060,13 +1062,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6137162305633286825} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.01, z: 0} m_LocalScale: {x: 0.5, y: 0.01, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6137162304381049167} - m_RootOrder: 0 + m_Father: {fileID: 6137162304244316998} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6137162305633286829 MeshFilter: @@ -1162,9 +1164,9 @@ RectTransform: m_LocalScale: {x: 0.00025, y: 0.00025, z: 0.00025} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 3791662671091619044} + - {fileID: 2251911189760527700} m_Father: {fileID: 6137162304244316998} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1232,86 +1234,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &9054746067392154081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3791662671091619044} - - component: {fileID: 20508493745067252} - - component: {fileID: 962303743635987987} - m_Layer: 5 - m_Name: NHIESay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3791662671091619044 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9054746067392154081} - 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: 0 - m_Children: [] - m_Father: {fileID: 3782530155517796} - m_RootOrder: 0 - 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 &20508493745067252 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9054746067392154081} - m_CullTransparentMesh: 1 ---- !u!114 &962303743635987987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9054746067392154081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: c85c73f74a9907c4786811dea40c2b13, type: 3} - m_FontSize: 152 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 300 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Bla bla bla blablablablablablablbadjfhalksdjhfkajlshdfklahsdlkfhakljsdhfklahslkjfhlkasdhfkljahsdlkfhaskldhkl --- !u!1001 &6352028268462346877 PrefabInstance: m_ObjectHideFlags: 0 @@ -1382,3 +1304,114 @@ Transform: m_CorrespondingSourceObject: {fileID: 6251217014523100724, guid: bee04e6559e69284e921d33f1b90ea11, type: 3} m_PrefabInstance: {fileID: 6352028268462346877} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8762840402169644761 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3782530155517796} + m_Modifications: + - target: {fileID: 3453666276329920136, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_Name + value: textu + objectReference: {fileID: 0} + - target: {fileID: 6854411102790467962, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_Text + value: cannot convert clr type ABI.Scripting.CVRSTL.Common.UnityEngine.UI._LUAINSTANCE_ScriptedText + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_SizeDelta.x + value: 2048 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_SizeDelta.y + value: 1403 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} +--- !u!224 &2251911189760527700 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7411721712131378061, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + m_PrefabInstance: {fileID: 8762840402169644761} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6230237249983172689 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3453666276329920136, guid: 575e14750db3fbf40b86e84bea1c6397, type: 3} + m_PrefabInstance: {fileID: 8762840402169644761} + m_PrefabAsset: {fileID: 0} diff --git a/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab new file mode 100644 index 000000000..fab1eaeb5 --- /dev/null +++ b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3453666276329920136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411721712131378061} + - component: {fileID: 5912615949305891741} + - component: {fileID: 6854411102790467962} + m_Layer: 5 + m_Name: textu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411721712131378061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3453666276329920136} + 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: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 2048, y: 1403} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5912615949305891741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3453666276329920136} + m_CullTransparentMesh: 1 +--- !u!114 &6854411102790467962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3453666276329920136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: c85c73f74a9907c4786811dea40c2b13, type: 3} + m_FontSize: 152 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: a diff --git a/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab.meta b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab.meta new file mode 100644 index 000000000..223681904 --- /dev/null +++ b/DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/textu.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 575e14750db3fbf40b86e84bea1c6397 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DiceGlow/Assets/JOELwindows7/AnhaLua/Scripts/NHIEGenerator.lua b/DiceGlow/Assets/JOELwindows7/AnhaLua/Scripts/NHIEGenerator.lua index 613faafe5..4034c3111 100644 --- a/DiceGlow/Assets/JOELwindows7/AnhaLua/Scripts/NHIEGenerator.lua +++ b/DiceGlow/Assets/JOELwindows7/AnhaLua/Scripts/NHIEGenerator.lua @@ -11,9 +11,10 @@ local UnityEngine = require("UnityEngine") local ownSelf +local animCompo local fakeButton local textOut -local textOutCompo +local textOutCompo = nil local nhieList = { 'Programmed `Hello, world!` in Rust', 'Messed up settings causing PC unbootable', @@ -78,7 +79,11 @@ local refreshRate = .1 local refreshRemains = .1 function Regenerate() - selectNhie = nhieList[math.random(#nhieList)] + selectNum = math.random(#nhieList) + if animCompo then + animCompo.SetInteger('SelectQuote',selectNum) + end + selectNhie = nhieList[selectNum] -- if textOutCompo then -- textOutCompo.text = selectNhie -- end @@ -91,11 +96,12 @@ function Regenerate() -- end end - local bugText = BoundObjects.zaza:GetComponent('UnityEngine.UI.Text') - if bugText then - bugText.text = selectNhie + + if animCompo then + animCompo.SetBool('IsDelaying',true) end isDelaying = true + RefreshDisplay() end function OnMouseDown() @@ -104,12 +110,44 @@ function OnMouseDown() end end +function RefreshDisplay() + if animCompo then + isDelaying = animCompo.GetBool('IsDelaying') + selectNum = animCompo.GetInteger('SelectQuote') + selectNhie = nhieList[selectNum] + end + + if textOut then + -- HOW COME THE TEXT REFERENCE UNRELIABLE!?!?!? + --[[ + [Unity] /CVRSpawnable_7978dda3-291d-49d0-be01-29f50cff6106_58974140(Clone):Client Lua[CVRSpawnable_7978dda3-291d-49d0-be01-29f50cff6106_58974140(Clone)]: Script Runtime Exception: Assets/JOELwindows7/AnhaLua/Scripts/NHIEGenerator.lua:(149,8-66): cannot convert clr type ABI.Scripting.CVRSTL.Common.UnityEngine.UI._LUAINSTANCE_ScriptedText + ]]-- + -- textOut:GetComponent("UnityEngine.UI.Text").text = selectNhie + -- textOut.GameObject:GetComponent("UnityEngine.UI.Text").text = selectNhie + end + if textOutCompo then + textOutCompo.text = selectNhie + end + -- local bugText = BoundObjects.Zaza.GetComponent('UnityEngine.UI.Text') + -- if bugText then + -- bugText.text = selectNhie + -- end +end + -- Start is called before the first frame update function Start() ownSelf = BoundObjects.OwnSelf + textOut = BoundObjects.TitlerOld fakeButton = BoundObjects.GenerateFakeButton luaDisabledWarn = BoundObjects.LuaDisabledWarning - textOut = BoundObjects.zaza + + if ownSelf then + print('obtain self') + animCompo = ownSelf.GetComponent("UnityEngine.Animator") + -- textOut = ownSelf.transform.GetChild(0).GetChild(0).GetChild(0).gameObject + else + print('forgor assign this self') + end -- wtf whyn't work???? -- if textOut then @@ -122,12 +160,13 @@ function Start() print('Forgor textOut') else -- textOutCompo = textOut:GetComponent('UnityEngine.UI.Text') + -- textOutCompo = textOut.GetComponent('UnityEngine.UI.Text') end -- textOutCompo = textOut:GetComponent("UnityEngine.UI.Text") -- textOutCompo = BoundObjects.zaza:GetComponent('UnityEngine.UI.Text') -- trouble: if it's on a GameObject, it won't work! get it out of it! - Regenerate() + -- Regenerate() if luaDisabledWarn then luaDisabledWarn.SetActive(false) @@ -136,15 +175,13 @@ end -- Update is called once per frame function Update() - refreshRemains = refreshRemains - UnityEngine.Time.deltaTime - if refreshRemains <= 0 then - refreshRemains = refreshRate - end + if isDelaying then delayRemains = delayRemains - UnityEngine.Time.deltaTime if delayRemains <= 0 then delayRemains = delaysButtonIn + animCompo.SetBool('IsDelaying',false) isDelaying = false end else @@ -152,7 +189,16 @@ function Update() -- fakeButton.SetActive(true) -- end end + if fakeButton then fakeButton.SetActive(not isDelaying) end +end + +function LateUpdate() + refreshRemains = refreshRemains - UnityEngine.Time.deltaTime + if refreshRemains <= 0 then + refreshRemains = refreshRate + RefreshDisplay() + end end \ No newline at end of file diff --git a/DiceGlow/Assets/JOELwindows7/AnhaLua/Sub/NHIEGeneratorAC.controller b/DiceGlow/Assets/JOELwindows7/AnhaLua/Sub/NHIEGeneratorAC.controller index 503434833..3f2f36e0b 100644 --- a/DiceGlow/Assets/JOELwindows7/AnhaLua/Sub/NHIEGeneratorAC.controller +++ b/DiceGlow/Assets/JOELwindows7/AnhaLua/Sub/NHIEGeneratorAC.controller @@ -1,5 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8049724586724471571 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,5 +27,29 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: NHIEGeneratorAC serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorParameters: + - m_Name: SelectQuote + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsDelaying + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8049724586724471571} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua.unity b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua.unity index 48c48dcf1..5e684518d 100644 --- a/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua.unity +++ b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua.unity @@ -337,6 +337,10 @@ PrefabInstance: propertyPath: m_Name value: LuaComingSoon objectReference: {fileID: 0} + - target: {fileID: 5637415733179982489, guid: c677f62c51e68834c8a382ee58f7d1b5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c677f62c51e68834c8a382ee58f7d1b5, type: 3} --- !u!1001 &1247097730 @@ -640,6 +644,10 @@ PrefabInstance: propertyPath: m_Name value: NeverHaveIEverConfessDNB objectReference: {fileID: 0} + - target: {fileID: 4665144384959844792, guid: 4e0fae8130ff02648a0672467a4c4d49, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6132622702261682786, guid: 4e0fae8130ff02648a0672467a4c4d49, type: 3} propertyPath: m_RootOrder value: 1 @@ -857,7 +865,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4953290340566104613, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} propertyPath: randomNum - value: 29716961 + value: 78677471 objectReference: {fileID: 0} - target: {fileID: 6137162304381049160, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} propertyPath: m_Name @@ -920,6 +928,10 @@ PrefabInstance: propertyPath: m_Name value: ExperimmentalModsDisabled objectReference: {fileID: 0} + - target: {fileID: 3422094685322937398, guid: ff1d59df598c83b4792af7b1751b1703, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5109636998750022647, guid: ff1d59df598c83b4792af7b1751b1703, type: 3} propertyPath: m_RootOrder value: 2 diff --git a/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity new file mode 100644 index 000000000..68d85b76c --- /dev/null +++ b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.12731713, g: 0.13414736, b: 0.12107852, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &1242277663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4953290340566104613, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: randomNum + value: 85486873 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049160, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_Name + value: NHIEGenerator + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6137162304381049167, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 958b1143b6014734eb489adb23a3a71f, type: 3} diff --git a/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity.meta b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity.meta new file mode 100644 index 000000000..a302c28f7 --- /dev/null +++ b/DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua2.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 728866c0b24d8054c8415c364af88ac5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: