Merged to local, last commit.

jcs090218 · Jul 10, 2020 · 7cff28e · 7cff28e
1 parent b373b50
commit 7cff28e
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 0 deletions.
diff --git a/Assets/JCSUnity/Models.meta b/Assets/JCSUnity/Models.meta
diff --git a/Assets/JCSUnity/Scripts/GameObject/3D/3DAI.meta b/Assets/JCSUnity/Scripts/GameObject/3D/3DAI.meta
diff --git a/Assets/JCSUnity/Scripts/GameObject/3D/3DAction.meta b/Assets/JCSUnity/Scripts/GameObject/3D/3DAction.meta
diff --git a/Assets/JCSUnity/Scripts/Scripts/event.meta b/Assets/JCSUnity/Scripts/Scripts/event.meta
diff --git a/Assets/JCSUnity/Scripts/Scripts/portal.meta b/Assets/JCSUnity/Scripts/Scripts/portal.meta
diff --git a/Assets/JCSUnity/Scripts/Scripts/quest.meta b/Assets/JCSUnity/Scripts/Scripts/quest.meta
diff --git a/Assets/JCSUnity/Scripts/Scripts/reactor.meta b/Assets/JCSUnity/Scripts/Scripts/reactor.meta
diff --git a/Assets/JCSUnity/Sprites/Mobs/QqCandy_lvl1/dead.meta b/Assets/JCSUnity/Sprites/Mobs/QqCandy_lvl1/dead.meta
diff --git a/Assets/JCSUnity/Sprites/Mobs/QqCandy_lvl2/dead.meta b/Assets/JCSUnity/Sprites/Mobs/QqCandy_lvl2/dead.meta
diff --git a/Assets/JCSUnity/Sprites/Mobs/boss_mm_lvl10/attack.meta b/Assets/JCSUnity/Sprites/Mobs/boss_mm_lvl10/attack.meta
diff --git a/Assets/JCSUnity/Sprites/Mobs/boss_mm_lvl10/dead.meta b/Assets/JCSUnity/Sprites/Mobs/boss_mm_lvl10/dead.meta
diff --git a/Assets/Resources/JCSUnity_Resources/GameObjects/Weapons.meta b/Assets/Resources/JCSUnity_Resources/GameObjects/Weapons.meta
diff --git a/Assets/Resources/JCSUnity_Resources/Shader.meta b/Assets/Resources/JCSUnity_Resources/Shader.meta
diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta
diff --git a/Assets/_BossFight_Assets/Animations.meta b/Assets/_BossFight_Assets/Animations.meta
diff --git a/Assets/_BossFight_Assets/Sounds.meta b/Assets/_BossFight_Assets/Sounds.meta
diff --git a/Assets/_RunningCrush_Assets/Animations.meta b/Assets/_RunningCrush_Assets/Animations.meta
diff --git a/Assets/_RunningCrush_Assets/Sounds.meta b/Assets/_RunningCrush_Assets/Sounds.meta