Merge pull request #84 from hhzzff/dev

feat: ✨ Updated luminescent materials and added laser material textures.
eesast · Jan 22, 2024 · 59bf073 · 59bf073
2 parents 5c6f344 + cd15112
commit 59bf073
Show file tree

Hide file tree

Showing 63 changed files with 1,359 additions and 544 deletions.
diff --git a/...ls/VisualEffectMaterial/Ship Emission.mat → ...terials/VisualEffectMaterial/Emission.mat b/...ls/VisualEffectMaterial/Ship Emission.mat → ...terials/VisualEffectMaterial/Emission.mat
@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Ship Emission
+  m_Name: Emission
   m_Shader: {fileID: -6465566751694194690, guid: c5223d920a3041c4fb33ac62b31319e9, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -59,5 +59,5 @@ Material:
     m_Ints: []
     m_Floats: []
     m_Colors:
-    - _GlowColor: {r: 84.44851, g: 0, b: 0, a: 0}
+    - _GlowColor: {r: 28.84932, g: 0, b: 766.9961, a: 0}
   m_BuildTextureStacks: []
diff --git a/interface/Assets/Materials/VisualEffectMaterial/Shader Graphs_Ship Emission SG 1.mat b/interface/Assets/Materials/VisualEffectMaterial/Shader Graphs_Ship Emission SG 1.mat
diff --git a/interface/Assets/Materials/VisualEffectMaterial/Shader Graphs_Ship Emission SG.mat b/interface/Assets/Materials/VisualEffectMaterial/Shader Graphs_Ship Emission SG.mat
diff --git a/interface/Assets/Materials/VisualEffectMaterial/new ship emi.mat b/interface/Assets/Materials/VisualEffectMaterial/new ship emi.mat
diff --git a/interface/Assets/Materials/afflict_civilship1.png b/interface/Assets/Materials/afflict_civilship1.png
diff --git a/interface/Assets/Materials/afflict_civilship2.png b/interface/Assets/Materials/afflict_civilship2.png
diff --git a/interface/Assets/Materials/disperse_militaryship1.png b/interface/Assets/Materials/disperse_militaryship1.png
diff --git a/interface/Assets/Materials/disperse_militaryship2.png b/interface/Assets/Materials/disperse_militaryship2.png
diff --git a/interface/Assets/Materials/foreshadow_flagship1.png b/interface/Assets/Materials/foreshadow_flagship1.png
diff --git a/interface/Assets/Materials/foreshadow_flagship2.png b/interface/Assets/Materials/foreshadow_flagship2.png
diff --git a/interface/Assets/Materials/laser.aseprite b/interface/Assets/Materials/laser.aseprite
diff --git a/interface/Assets/Materials/laser.png b/interface/Assets/Materials/laser.png
diff --git a/interface/Assets/Materials/resource1.png b/interface/Assets/Materials/resource1.png
diff --git a/interface/Assets/Materials/resource.png → interface/Assets/Materials/resource11.png b/interface/Assets/Materials/resource.png → interface/Assets/Materials/resource11.png
diff --git a/interface/Assets/Materials/resourceA1.png b/interface/Assets/Materials/resourceA1.png
diff --git a/interface/Assets/Materials/resourceA2.png b/interface/Assets/Materials/resourceA2.png
diff --git a/interface/Assets/Materials/resourceA3.png b/interface/Assets/Materials/resourceA3.png
diff --git a/interface/Assets/Materials/resource2.png → interface/Assets/Materials/resourceB.png b/interface/Assets/Materials/resource2.png → interface/Assets/Materials/resourceB.png
diff --git a/interface/Assets/Materials/resourceB1.png b/interface/Assets/Materials/resourceB1.png
diff --git a/interface/Assets/Materials/resourceB2.png b/interface/Assets/Materials/resourceB2.png
diff --git a/interface/Assets/Materials/resourceB3.png b/interface/Assets/Materials/resourceB3.png
diff --git a/...face/Assets/Materials/graphitic-wall2.png → interface/Assets/Materials/resourceC.png b/...face/Assets/Materials/graphitic-wall2.png → interface/Assets/Materials/resourceC.png
diff --git a/interface/Assets/Materials/resourceC1.png b/interface/Assets/Materials/resourceC1.png
diff --git a/interface/Assets/Materials/resourceC2.png b/interface/Assets/Materials/resourceC2.png
diff --git a/interface/Assets/Materials/resourceC3.png b/interface/Assets/Materials/resourceC3.png
diff --git a/interface/Assets/Materials/tsunami_fort1.png b/interface/Assets/Materials/tsunami_fort1.png
diff --git a/interface/Assets/Materials/tsunami_fort2.png b/interface/Assets/Materials/tsunami_fort2.png
diff --git a/interface/Assets/Materials/warship.png b/interface/Assets/Materials/warship.png
diff --git a/interface/Assets/Prefabs/afflict_civilship3.prefab b/interface/Assets/Prefabs/afflict_civilship3.prefab
@@ -178,6 +178,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3612929307087270911}
   - component: {fileID: 6770427568174600179}
+  - component: {fileID: 6743655023305793172}
   m_Layer: 0
   m_Name: afflict_civilship3
   m_TagString: Untagged
@@ -254,3 +255,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &6743655023305793172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7171601645716739352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e061b091191c35d4aae1cb397dc28bcd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  teamId: 0
diff --git a/interface/Assets/Prefabs/asteroid1.prefab b/interface/Assets/Prefabs/asteroid1.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1000446588117592332}
   - component: {fileID: 4060896487484421742}
+  - component: {fileID: -3670665404285217593}
   m_Layer: 0
   m_Name: asteroid1
   m_TagString: Untagged
@@ -84,3 +85,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &-3670665404285217593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 73901610976941151}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19c6866e3d6f3764b8f32debbda01f5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  placeType: 0
diff --git a/interface/Assets/Prefabs/asteroid2.prefab b/interface/Assets/Prefabs/asteroid2.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3357736668301216724}
   - component: {fileID: 4374308642202614482}
+  - component: {fileID: -5760071009302284168}
   m_Layer: 0
   m_Name: asteroid2
   m_TagString: Untagged
@@ -84,3 +85,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &-5760071009302284168
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2076829689532050399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19c6866e3d6f3764b8f32debbda01f5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  placeType: 0
diff --git a/interface/Assets/Prefabs/asteroid3.prefab b/interface/Assets/Prefabs/asteroid3.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5366094617809661503}
   - component: {fileID: 702776585178968798}
+  - component: {fileID: 6518327097440721068}
   m_Layer: 0
   m_Name: asteroid3
   m_TagString: Untagged
@@ -84,3 +85,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &6518327097440721068
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 889495328777635882}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19c6866e3d6f3764b8f32debbda01f5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  placeType: 0
diff --git a/interface/Assets/Prefabs/community.prefab b/interface/Assets/Prefabs/community.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 940564042307808193}
   - component: {fileID: 7343186342370500237}
+  - component: {fileID: -1073304886889301079}
   m_Layer: 0
   m_Name: community
   m_TagString: Untagged
@@ -84,3 +85,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &-1073304886889301079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6520154078847335470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19c6866e3d6f3764b8f32debbda01f5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  placeType: 0
diff --git a/interface/Assets/Prefabs/disperse_militaryship3.prefab b/interface/Assets/Prefabs/disperse_militaryship3.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6703198644651489217}
   - component: {fileID: 3937469415223448877}
+  - component: {fileID: 1853827907577236201}
   m_Layer: 0
   m_Name: disperse_militaryship3
   m_TagString: Untagged
@@ -86,6 +87,19 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1853827907577236201
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1718981553063819522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e061b091191c35d4aae1cb397dc28bcd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  teamId: 0
 --- !u!1 &6322145347568992764
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/interface/Assets/Prefabs/factory.prefab b/interface/Assets/Prefabs/factory.prefab
@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2704582977882591132}
   - component: {fileID: 8375780746031390831}
+  - component: {fileID: -272454092746244254}
   m_Layer: 0
   m_Name: factory
   m_TagString: Untagged
@@ -84,3 +85,16 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &-272454092746244254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6257076823173944538}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19c6866e3d6f3764b8f32debbda01f5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  placeType: 0