Skip to content

Commit 33143c9

Browse files
committed
.
unity samples
1 parent 2bbedf7 commit 33143c9

File tree

606 files changed

+134801
-23
lines changed

Some content is hidden

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

606 files changed

+134801
-23
lines changed

CREDIT.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -7782,4 +7782,9 @@ https://youtu.be/qzhuWRQWK5I?si=PygoI274O32LWD5a
77827782
- https://forum.unity.com/threads/from-unity-ui-to-textmeshpro.463619/
77837783
- https://docs.unity3d.com/Packages/[email protected]/api/TMPro.TextMeshPro.html
77847784
- https://github.com/Perkedel/CVR_Stuffings/blob/main/DiceGlow/Assets/JOELwindows7/Documentations/Bonus/LuaExamples.md
7785-
- https://discord.com/channels/410126604237406209/1240763673346183279/1243583950924812449
7785+
- https://discord.com/channels/410126604237406209/1240763673346183279/1243583950924812449
7786+
- https://discussions.unity.com/t/how-can-i-assign-materials-using-c-code/2205/2
7787+
- https://docs.unity3d.com/Packages/[email protected]/manual/index.html
7788+
- https://docs.unity3d.com/Manual/shader-graph.html
7789+
- https://docs.unity3d.com/Packages/[email protected]/manual/Getting-Started.html
7790+
- https://forum.unity.com/threads/srp-v11-beta-is-available-now.1046539/

DiceGlow/Assets/JOELwindows7/AnhaLua/Prefabs/AnhaScript.prefab

+81
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,8 @@ MonoBehaviour:
344344
boundThing: {fileID: 1833711788178023598}
345345
- name: PlayThisAudio
346346
boundThing: {fileID: 8300000, guid: ae6cf6cc2d6be51419c5616bb0a3c21d, type: 3}
347+
- name: PlayBeingSteppedOn
348+
boundThing: {fileID: 8300000, guid: ae6cf6cc2d6be51419c5616bb0a3c21d, type: 3}
347349
--- !u!114 &1310377827391953519
348350
MonoBehaviour:
349351
m_ObjectHideFlags: 0
@@ -1064,6 +1066,7 @@ GameObject:
10641066
- component: {fileID: 5628958791286362899}
10651067
- component: {fileID: 7120338222378634100}
10661068
- component: {fileID: 7422772154312198922}
1069+
- component: {fileID: 8037556748298588740}
10671070
m_Layer: 0
10681071
m_Name: Caok
10691072
m_TagString: Untagged
@@ -1150,6 +1153,84 @@ CapsuleCollider:
11501153
m_Height: 2
11511154
m_Direction: 1
11521155
m_Center: {x: 0, y: 0, z: 0}
1156+
--- !u!114 &8037556748298588740
1157+
MonoBehaviour:
1158+
m_ObjectHideFlags: 0
1159+
m_CorrespondingSourceObject: {fileID: 0}
1160+
m_PrefabInstance: {fileID: 0}
1161+
m_PrefabAsset: {fileID: 0}
1162+
m_GameObject: {fileID: 8970662863706720314}
1163+
m_Enabled: 1
1164+
m_EditorHideFlags: 0
1165+
m_Script: {fileID: 11500000, guid: a45fb99111d54dba84a8ff33016b93fd, type: 3}
1166+
m_Name:
1167+
m_EditorClassIdentifier:
1168+
tooltip:
1169+
actions:
1170+
- delay: 0
1171+
operations:
1172+
- type: 21
1173+
targets:
1174+
- {fileID: 0}
1175+
floatVal: 0
1176+
stringVal:
1177+
stringVal2:
1178+
stringVal3:
1179+
stringVal4:
1180+
boolVal: 0
1181+
boolVal2: 0
1182+
gameObjectVal: {fileID: 0}
1183+
floatVal2: 0
1184+
floatVal3: 0
1185+
floatVal4: 0
1186+
varBufferVal: {fileID: 0}
1187+
varBufferVal2: {fileID: 0}
1188+
varBufferVal3: {fileID: 0}
1189+
animationVal: {fileID: 0}
1190+
customEvent:
1191+
m_PersistentCalls:
1192+
m_Calls:
1193+
- m_Target: {fileID: 2593186904241057723}
1194+
m_TargetAssemblyTypeName: UnityEngine.Component, UnityEngine
1195+
m_MethodName: SendMessage
1196+
m_Mode: 5
1197+
m_Arguments:
1198+
m_ObjectArgument: {fileID: 0}
1199+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1200+
m_IntArgument: 0
1201+
m_FloatArgument: 0
1202+
m_StringArgument: CapsuleGrey
1203+
m_BoolArgument: 0
1204+
m_CallState: 2
1205+
actionType: 3
1206+
execType: 1
1207+
layerMask:
1208+
serializedVersion: 2
1209+
m_Bits: 0
1210+
floatVal: 10
1211+
floatVal2: 0
1212+
floatVal3: 0
1213+
boolVal: 0
1214+
boolVal2: 0
1215+
varBufferVal: {fileID: 0}
1216+
varBufferVal2: {fileID: 0}
1217+
stringVal:
1218+
allowedPointer: []
1219+
allowedPointerCollapse: 0
1220+
allowedTypes: []
1221+
allowedTypesCollapse: 0
1222+
specificParticleSystems: []
1223+
specificParticleSystemsCollapse: 0
1224+
interactionFilter: 0
1225+
interactionInput: 48
1226+
interactionInputModifier: 0
1227+
guid:
1228+
onEnterSeat:
1229+
m_PersistentCalls:
1230+
m_Calls: []
1231+
onExitSeat:
1232+
m_PersistentCalls:
1233+
m_Calls: []
11531234
--- !u!1001 &8731770588580231333
11541235
PrefabInstance:
11551236
m_ObjectHideFlags: 0

DiceGlow/Assets/JOELwindows7/AnhaLua/Scripts/AnhaTest.lua

+28-2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ local tmTextItself
6464
local aSpeaker
6565
local aSpeakerCompo
6666
local aAudioStream
67+
local aSteppedOnStream
6768
local angle = 0
6869
local toMoveAt = 0
6970
local isBacking = false
@@ -72,6 +73,8 @@ local title = 'Halo Lua from JOELwindows7\nAlso thancc LensError for example sni
7273
local installSay = ''
7374
local sayWelcomeHome = ''
7475
local sayPlayersFuzzy = ''
76+
local flyAllowed = 'no'
77+
local ruleSays = ''
7578
local playerCount = 0
7679
local playersYouHave = {}
7780
local areWeOnline = 'No'
@@ -131,6 +134,17 @@ function OnMouseDown()
131134
end
132135
end
133136

137+
function OnCollisionEnter(collision)
138+
if aSpeakerCompo then
139+
-- https://docs.unity3d.com/ScriptReference/AudioSource.PlayOneShot.html
140+
aSpeakerCompo.PlayOneShot(aSteppedOnStream,1)
141+
end
142+
end
143+
144+
function UpdateInstallSay()
145+
installSay = title .. "\n" .. selectQuote .. "\n" .. "World: " .. InstancesAPI.InstanceName .. "(" .. InstancesAPI.InstancePrivacy .. ")\n" .. "Rules: " .. ruleSays .. "\n" .. "Connection: " .. areWeOnline .. " (" .. InstancesAPI.Ping .. " ms)\n" .. sayWelcomeHome .. "\n" .. "Players (" .. playerCount .. "):\n" .. sayPlayersFuzzy
146+
end
147+
134148
-- Start is called before the first frame update
135149
function Start()
136150
print "Hello world!"
@@ -142,6 +156,7 @@ function Start()
142156
tmThingy = BoundObjects.TitlerOld
143157
aSpeaker = BoundObjects.Speaker
144158
aAudioStream = BoundObjects.PlayThisAudio
159+
aSteppedOnStream = BoundObjects.PlayBeingSteppedOn
145160
if not tmThingy then
146161
print('WERROR! tmThingy not bounded!!!')
147162
else
@@ -155,7 +170,8 @@ function Start()
155170
aSpeakerCompo = aSpeaker.GetComponent("UnityEngine.AudioSource")
156171
end
157172

158-
installSay = title .. "\n" .. "Ping: " .. InstancesAPI.Ping .. "\n" .. sayWelcomeHome .. "\n"
173+
-- installSay = title .. "\n" .. "Ping: " .. InstancesAPI.Ping .. "\n" .. sayWelcomeHome .. "\n"
174+
UpdateInstallSay()
159175

160176
if not tmTextItself then
161177
print "compo nil"
@@ -225,7 +241,17 @@ function Update()
225241
sayPlayersFuzzy = sayPlayersFuzzy .. playersYouHave[i].Username .. ", "
226242
end
227243

228-
installSay = title .. "\n" .. selectQuote .. "\n" .. "World: " .. InstancesAPI.InstanceName .. "(" .. InstancesAPI.InstancePrivacy .. ")\n" .. "Connection: " .. areWeOnline .. "(" .. InstancesAPI.Ping .. " ms)\n" .. sayWelcomeHome .. "\n" .. "Players (" .. playerCount .. "):\n" .. sayPlayersFuzzy
244+
-- fly check
245+
if PlayerAPI.LocalPlayer.IsFlightAllowed then
246+
flyAllowed = ""
247+
else
248+
flyAllowed = "NoFlying"
249+
end
250+
251+
ruleSays = ''
252+
ruleSays = ruleSays .. flyAllowed .. ' '
253+
254+
UpdateInstallSay()
229255
-- installSay = 'test'
230256
-- tmpThingy.gameObject.TMP_Text.text = installSay
231257
-- tmpTextItself.text = installSay

DiceGlow/Assets/JOELwindows7/_CORE/Scenes/__DevOnlySceneLua.unity

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ PrefabInstance:
563563
objectReference: {fileID: 0}
564564
- target: {fileID: 3677132415523780663, guid: 4e88290e9741f534dacde2707b43cf19, type: 3}
565565
propertyPath: randomNum
566-
value: 27281030
566+
value: 78225153
567567
objectReference: {fileID: 0}
568568
m_RemovedComponents: []
569569
m_SourcePrefab: {fileID: 100100000, guid: 4e88290e9741f534dacde2707b43cf19, type: 3}

DiceGlow/Assets/Samples/Unity Toon Shader.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DiceGlow/Assets/Samples/Unity Toon Shader/0.10.0-preview.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DiceGlow/Assets/Samples/Unity Toon Shader/0.10.0-preview/Legacy render pipeline.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"displayName": "Legacy render pipeline",
3+
"description": "Sample scenes for the legacy (built-in) pipe-lines.",
4+
"createSeparatePackage": false
5+
}

DiceGlow/Assets/Samples/Unity Toon Shader/0.10.0-preview/Legacy render pipeline/Animations.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)