Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOProUnity_V2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赤子奈落
YGOProUnity_V2
Commits
cd97eeeb
Commit
cd97eeeb
authored
Aug 30, 2021
by
神楽坂玲奈
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade to 2018.2
parent
12ade584
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
176 additions
and
62 deletions
+176
-62
Assets/ArtSystem/arrow/Mega-Fiers/Scripts/MegaFiers/MegaBook.cs
.../ArtSystem/arrow/Mega-Fiers/Scripts/MegaFiers/MegaBook.cs
+2
-2
Assets/ArtSystem/arrow/Mega-Fiers/Scripts/MegaGrab/MegaGrab.cs
...s/ArtSystem/arrow/Mega-Fiers/Scripts/MegaGrab/MegaGrab.cs
+2
-2
Assets/NGUI/Scripts/Editor/UISnapshotPointEditor.cs
Assets/NGUI/Scripts/Editor/UISnapshotPointEditor.cs
+1
-1
Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta
...tyVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta
+15
-3
Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta
...S/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta
+15
-3
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
+0
-0
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
+15
-5
Assets/old/UiverseAssests/TextMesh Pro/Scripts/TMPro_Private.cs
.../old/UiverseAssests/TextMesh Pro/Scripts/TMPro_Private.cs
+1
-1
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/Arrow.FBX.meta
...Assests/art_plugin/FT_MagicEffect_vol3/FBX/Arrow.FBX.meta
+39
-13
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/skull_head_LOW_v03.OBJ.meta
...lugin/FT_MagicEffect_vol3/FBX/skull_head_LOW_v03.OBJ.meta
+39
-15
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/skull_joe_LOW_v03.OBJ.meta
...plugin/FT_MagicEffect_vol3/FBX/skull_joe_LOW_v03.OBJ.meta
+39
-15
Assets/old/UiverseAssests/high_light/HighlightingSystem/Scripts/HighlightingEffect.cs
...gh_light/HighlightingSystem/Scripts/HighlightingEffect.cs
+1
-1
ProjectSettings/PresetManager.asset
ProjectSettings/PresetManager.asset
+6
-0
ProjectSettings/ProjectVersion.txt
ProjectSettings/ProjectVersion.txt
+1
-1
No files found.
Assets/ArtSystem/arrow/Mega-Fiers/Scripts/MegaFiers/MegaBook.cs
View file @
cd97eeeb
...
...
@@ -64,7 +64,7 @@ public class MegaBook : MonoBehaviour
if
(
bookalpha
>
100.0f
)
bookalpha
=
100.0f
;
if
(
front
.
transform
.
GetChildCount
()
>
0
)
if
(
front
.
transform
.
childCount
>
0
)
{
Transform
child
=
front
.
transform
.
GetChild
(
0
);
if
(
child
!=
null
)
...
...
@@ -75,7 +75,7 @@ public class MegaBook : MonoBehaviour
}
}
if
(
back
.
transform
.
GetChildCount
()
>
0
)
if
(
back
.
transform
.
childCount
>
0
)
{
Transform
child
=
back
.
transform
.
GetChild
(
0
);
if
(
child
!=
null
)
...
...
Assets/ArtSystem/arrow/Mega-Fiers/Scripts/MegaGrab/MegaGrab.cs
View file @
cd97eeeb
...
...
@@ -215,7 +215,7 @@ public class MegaGrab : MonoBehaviour
float
xo
=
x
+
xa
;
float
yo
=
y
+
ya
;
SrcCamera
.
projectionMatrix
=
CalcProjectionMatrix
(
mleft
,
mright
,
mbottom
,
mtop
,
SrcCamera
.
near
,
SrcCamera
.
far
,
xo
,
yo
);
SrcCamera
.
projectionMatrix
=
CalcProjectionMatrix
(
mleft
,
mright
,
mbottom
,
mtop
,
SrcCamera
.
near
ClipPlane
,
SrcCamera
.
farClipPlane
,
xo
,
yo
);
SrcCamera
.
Render
();
...
...
@@ -271,7 +271,7 @@ public class MegaGrab : MonoBehaviour
float
xo
=
x
+
xa
;
float
yo
=
y
+
ya
;
SrcCamera
.
projectionMatrix
=
CalcProjectionMatrix
(
mleft
,
mright
,
mbottom
,
mtop
,
SrcCamera
.
near
,
SrcCamera
.
far
,
xo
,
yo
);
SrcCamera
.
projectionMatrix
=
CalcProjectionMatrix
(
mleft
,
mright
,
mbottom
,
mtop
,
SrcCamera
.
near
ClipPlane
,
SrcCamera
.
farClipPlane
,
xo
,
yo
);
SrcCamera
.
Render
();
...
...
Assets/NGUI/Scripts/Editor/UISnapshotPointEditor.cs
View file @
cd97eeeb
...
...
@@ -87,6 +87,6 @@ public class UISnapshotPointEditor : Editor
if
(
go
==
null
)
return
null
;
// Actual prefab
return
PrefabUtility
.
Get
PrefabParent
(
go
)
as
GameObject
;
return
PrefabUtility
.
Get
CorrespondingObjectFromSource
(
go
)
as
GameObject
;
}
}
Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: 38d405c119fcc7c4e83d4a478a40ff2f
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
Editor:
- first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/UnityVS/Editor/SyntaxTree.VisualStudio.Unity.Messaging.dll.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: 4ad02dc83da735c4e8d945332b9202f6
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
Editor:
- first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
View file @
cd97eeeb
No preview for this file type
Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: 02fff229d2825ed4aa890d36c2b3dcea
timeCreated: 1486533642
licenseType: Pro
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
Editor:
- first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/old/UiverseAssests/TextMesh Pro/Scripts/TMPro_Private.cs
View file @
cd97eeeb
...
...
@@ -607,7 +607,7 @@ namespace TMPro
// Check if event applies to this current object
if
(
obj
==
gameObject
||
UnityEditor
.
PrefabUtility
.
Get
PrefabParent
(
gameObject
)
==
obj
)
if
(
obj
==
gameObject
||
UnityEditor
.
PrefabUtility
.
Get
CorrespondingObjectFromSource
(
gameObject
)
==
obj
)
{
//Debug.Log("Assigning new Base Material " + newMaterial.name + " to replace " + currentMaterial.name);
...
...
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/Arrow.FBX.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: 450a160c7951f80478d52807e29c3cac
ModelImporter:
serializedVersion:
18
serializedVersion:
23
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
...
...
@@ -10,64 +10,90 @@ ModelImporter:
4300000: Cone001
4300002: Arrow
11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: No Name
second: {fileID: 2100000, guid: 3b7adb9cb097fc94ea1724bbc0a2496d, type: 2}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationRotationError:
0
.5
animationPositionError:
0
.5
animationScaleError:
0
.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale:
.10000000
1
globalScale:
0.
1
meshCompression: 0
addColliders: 0
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch:
.0500000007
legStretch:
.0500000007
armTwist:
0
.5
foreArmTwist:
0
.5
upperLegTwist:
0
.5
legTwist:
0
.5
armStretch:
0.05
legStretch:
0.05
feetSpacing: 0
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1
humanoidOversampling: 1
additionalBone: 1
userData:
assetBundleName:
...
...
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/skull_head_LOW_v03.OBJ.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: c3a24d20e49504a439e3f2a113763906
timeCreated: 1480605856
licenseType: Pro
ModelImporter:
serializedVersion:
18
serializedVersion:
23
fileIDToRecycleName:
100000: Group35331
100002: //RootNode
...
...
@@ -13,64 +11,90 @@ ModelImporter:
3300000: Group35331
4300000: Group35331
11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Group35331Mat
second: {fileID: 2100000, guid: ffd06084c6af6054085e5710348e794b, type: 2}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationRotationError:
0
.5
animationPositionError:
0
.5
animationScaleError:
0
.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale:
.10000000
1
globalScale:
0.
1
meshCompression: 0
addColliders: 0
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch:
.0500000007
legStretch:
.0500000007
armTwist:
0
.5
foreArmTwist:
0
.5
upperLegTwist:
0
.5
legTwist:
0
.5
armStretch:
0.05
legStretch:
0.05
feetSpacing: 0
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1
humanoidOversampling: 1
additionalBone: 1
userData:
assetBundleName:
...
...
Assets/old/UiverseAssests/art_plugin/FT_MagicEffect_vol3/FBX/skull_joe_LOW_v03.OBJ.meta
View file @
cd97eeeb
fileFormatVersion: 2
guid: c33a5f3e4d6aaee47857d43097d6447a
timeCreated: 1480605856
licenseType: Pro
ModelImporter:
serializedVersion:
18
serializedVersion:
23
fileIDToRecycleName:
100000: Group64449
100002: //RootNode
...
...
@@ -13,64 +11,90 @@ ModelImporter:
3300000: Group64449
4300000: Group64449
11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Group64449Mat
second: {fileID: 2100000, guid: e5e6491e4bceac64eb1ced59177a94e9, type: 2}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationRotationError:
0
.5
animationPositionError:
0
.5
animationScaleError:
0
.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale:
.10000000
1
globalScale:
0.
1
meshCompression: 0
addColliders: 0
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch:
.0500000007
legStretch:
.0500000007
armTwist:
0
.5
foreArmTwist:
0
.5
upperLegTwist:
0
.5
legTwist:
0
.5
armStretch:
0.05
legStretch:
0.05
feetSpacing: 0
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1
humanoidOversampling: 1
additionalBone: 1
userData:
assetBundleName:
...
...
Assets/old/UiverseAssests/high_light/HighlightingSystem/Scripts/HighlightingEffect.cs
View file @
cd97eeeb
...
...
@@ -359,7 +359,7 @@ public class HighlightingEffect : MonoBehaviour
shaderCamera
.
cullingMask
=
layerMask
;
shaderCamera
.
rect
=
new
Rect
(
0f
,
0f
,
1f
,
1f
);
shaderCamera
.
renderingPath
=
RenderingPath
.
VertexLit
;
shaderCamera
.
hdr
=
false
;
shaderCamera
.
allowHDR
=
false
;
shaderCamera
.
useOcclusionCulling
=
false
;
shaderCamera
.
backgroundColor
=
new
Color
(
0f
,
0f
,
0f
,
0f
);
shaderCamera
.
clearFlags
=
CameraClearFlags
.
SolidColor
;
...
...
ProjectSettings/PresetManager.asset
0 → 100644
View file @
cd97eeeb
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1386491679
&1
PresetManager
:
m_ObjectHideFlags
:
0
m_DefaultList
:
[]
ProjectSettings/ProjectVersion.txt
View file @
cd97eeeb
m_EditorVersion: 201
7.4.4
0f1
m_EditorVersion: 201
8.2.2
0f1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment