Commit 3baf10f1 authored by 神楽坂玲奈's avatar 神楽坂玲奈

containers and cameras put in scene

parent 03f0c66b
...@@ -73,15 +73,15 @@ public class MonoCardInDeckManager : MonoBehaviour { ...@@ -73,15 +73,15 @@ public class MonoCardInDeckManager : MonoBehaviour {
{ {
float x = Input.mousePosition.x; float x = Input.mousePosition.x;
float y = Input.mousePosition.y; float y = Input.mousePosition.y;
Vector3 to_ltemp = Program.camera_game_main.ScreenToWorldPoint(new Vector3(x, y, 1)); Vector3 to_ltemp = Program.I().main_camera.ScreenToWorldPoint(new Vector3(x, y, 1));
Vector3 dv = to_ltemp - Program.camera_game_main.transform.position; Vector3 dv = to_ltemp - Program.I().main_camera.transform.position;
if (dv.y == 0) dv.y = 0.01f; if (dv.y == 0) dv.y = 0.01f;
to_ltemp.x = ((height - Program.camera_game_main.transform.position.y) to_ltemp.x = ((height - Program.I().main_camera.transform.position.y)
* (dv.x) / dv.y + Program.camera_game_main.transform.position.x); * (dv.x) / dv.y + Program.I().main_camera.transform.position.x);
to_ltemp.y = ((height - Program.camera_game_main.transform.position.y) to_ltemp.y = ((height - Program.I().main_camera.transform.position.y)
* (dv.y) / dv.y + Program.camera_game_main.transform.position.y); * (dv.y) / dv.y + Program.I().main_camera.transform.position.y);
to_ltemp.z = ((height - Program.camera_game_main.transform.position.y) to_ltemp.z = ((height - Program.I().main_camera.transform.position.y)
* (dv.z) / dv.y + Program.camera_game_main.transform.position.z); * (dv.z) / dv.y + Program.I().main_camera.transform.position.z);
return to_ltemp; return to_ltemp;
} }
...@@ -202,14 +202,14 @@ public class MonoCardInDeckManager : MonoBehaviour { ...@@ -202,14 +202,14 @@ public class MonoCardInDeckManager : MonoBehaviour {
public static Vector3 refLectPosition(Vector3 pos) public static Vector3 refLectPosition(Vector3 pos)
{ {
Vector3 to_ltemp = pos; Vector3 to_ltemp = pos;
Vector3 dv = to_ltemp - Program.camera_game_main.transform.position; Vector3 dv = to_ltemp - Program.I().main_camera.transform.position;
if (dv.y == 0) dv.y = 0.01f; if (dv.y == 0) dv.y = 0.01f;
to_ltemp.x = ((0 - Program.camera_game_main.transform.position.y) to_ltemp.x = ((0 - Program.I().main_camera.transform.position.y)
* (dv.x) / dv.y + Program.camera_game_main.transform.position.x); * (dv.x) / dv.y + Program.I().main_camera.transform.position.x);
to_ltemp.y = ((0 - Program.camera_game_main.transform.position.y) to_ltemp.y = ((0 - Program.I().main_camera.transform.position.y)
* (dv.y) / dv.y + Program.camera_game_main.transform.position.y); * (dv.y) / dv.y + Program.I().main_camera.transform.position.y);
to_ltemp.z = ((0 - Program.camera_game_main.transform.position.y) to_ltemp.z = ((0 - Program.I().main_camera.transform.position.y)
* (dv.z) / dv.y + Program.camera_game_main.transform.position.z); * (dv.z) / dv.y + Program.I().main_camera.transform.position.z);
return to_ltemp; return to_ltemp;
} }
} }
...@@ -4,8 +4,8 @@ using System.Collections; ...@@ -4,8 +4,8 @@ using System.Collections;
public class faceShower : MonoBehaviour { public class faceShower : MonoBehaviour {
void Start () { void Start () {
gameObject.transform.position = Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width/2,Screen.height*1.5f,0)); gameObject.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width/2,Screen.height*1.5f,0));
iTween.MoveToAction(gameObject, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height/2, 0)),0.6f,()=>{ iTween.MoveToAction(gameObject, Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height/2, 0)),0.6f,()=>{
iTween.ScaleToAction(gameObject,Vector3.zero, 0.6f, () => { iTween.ScaleToAction(gameObject,Vector3.zero, 0.6f, () => {
Destroy(gameObject); Destroy(gameObject);
}, 1f); }, 1f);
......
...@@ -17,12 +17,12 @@ public class handShower : MonoBehaviour ...@@ -17,12 +17,12 @@ public class handShower : MonoBehaviour
pics[2] = GameTextureManager.get("bu"); pics[2] = GameTextureManager.get("bu");
texture_0.mainTexture = pics[me]; texture_0.mainTexture = pics[me];
texture_1.mainTexture = pics[op]; texture_1.mainTexture = pics[op];
GameObject_0.transform.position = Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, -Screen.height * 1.5f, 0)); GameObject_0.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, -Screen.height * 1.5f, 0));
iTween.MoveToAction(GameObject_0, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2 - 80, 0)), 1f, () => { iTween.MoveToAction(GameObject_0, Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2 - 80, 0)), 1f, () => {
Destroy(GameObject_0,0.3f); Destroy(GameObject_0,0.3f);
}, 0); }, 0);
GameObject_1.transform.position = Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 0)); GameObject_1.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 0));
iTween.MoveToAction(GameObject_1, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2 + 80, 0)), 1f, () => { iTween.MoveToAction(GameObject_1, Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2 + 80, 0)), 1f, () => {
Destroy(GameObject_1, 0.3f); Destroy(GameObject_1, 0.3f);
}, 0); }, 0);
} }
......
...@@ -21,11 +21,11 @@ public class hinter : MonoBehaviour { ...@@ -21,11 +21,11 @@ public class hinter : MonoBehaviour {
void in_() void in_()
{ {
Vector3 screenPosition = Program.camera_main_2d.WorldToScreenPoint(gameObject.GetComponentInChildren<UITexture>().gameObject.transform.position); Vector3 screenPosition = Program.I().camera_main_2d.WorldToScreenPoint(gameObject.GetComponentInChildren<UITexture>().gameObject.transform.position);
screenPosition.y += 45; screenPosition.y += 45;
screenPosition.z = 0; screenPosition.z = 0;
Vector3 worldPositin = Program.camera_main_2d.ScreenToWorldPoint(screenPosition); Vector3 worldPositin = Program.I().camera_main_2d.ScreenToWorldPoint(screenPosition);
obj = Program.I().create(Program.I().mod_simple_ngui_text, worldPositin, Vector3.zero, true, Program.ui_main_2d, true); obj = Program.I().create(Program.I().mod_simple_ngui_text, worldPositin, Vector3.zero, true, Program.I().ui_main_2d, true);
obj.GetComponent<UILabel>().text = str; obj.GetComponent<UILabel>().text = str;
obj.GetComponent<UILabel>().effectStyle = UILabel.Effect.Outline; obj.GetComponent<UILabel>().effectStyle = UILabel.Effect.Outline;
Program.I().destroy(obj, 5f, false, false); Program.I().destroy(obj, 5f, false, false);
......
...@@ -1102,25 +1102,25 @@ public class UIPopupList : UIWidgetContainer ...@@ -1102,25 +1102,25 @@ public class UIPopupList : UIWidgetContainer
//if (gameObject.layer == Program.ui_back_ground_2d.layer) //if (gameObject.layer == Program.ui_back_ground_2d.layer)
//{ //{
// mChild.transform.SetParent(Program.ui_main_2d.transform, true); // mChild.transform.SetParent(Program.I().ui_main_2d.transform, true);
// var trans = mChild.GetComponentsInChildren<Transform>(); // var trans = mChild.GetComponentsInChildren<Transform>();
// foreach (var item in trans) // foreach (var item in trans)
// { // {
// item.gameObject.layer = Program.ui_main_2d.layer; // item.gameObject.layer = Program.I().ui_main_2d.layer;
// } // }
//} //}
if (gameObject.layer == Program.ui_main_3d.layer) if (gameObject.layer == Program.I().ui_main_3d.layer)
{ {
mChild.transform.SetParent(Program.ui_main_3d.transform, true); mChild.transform.SetParent(Program.I().ui_main_3d.transform, true);
} }
if (gameObject.layer == Program.ui_windows_2d.layer) if (gameObject.layer == Program.I().ui_windows_2d.layer)
{ {
mChild.transform.SetParent(Program.ui_windows_2d.transform, true); mChild.transform.SetParent(Program.I().ui_windows_2d.transform, true);
} }
if (gameObject.layer == Program.ui_main_2d.layer) if (gameObject.layer == Program.I().ui_main_2d.layer)
{ {
mChild.transform.SetParent(Program.ui_main_2d.transform, true); mChild.transform.SetParent(Program.I().ui_main_2d.transform, true);
} }
} }
} }
...@@ -1131,7 +1131,7 @@ public class UIPopupList : UIWidgetContainer ...@@ -1131,7 +1131,7 @@ public class UIPopupList : UIWidgetContainer
{ {
var a = go.transform.parent.localPosition; var a = go.transform.parent.localPosition;
if (go.layer != Program.ui_main_2d.layer&& go.layer != Program.ui_windows_2d.layer) if (go.layer != Program.I().ui_main_2d.layer&& go.layer != Program.I().ui_windows_2d.layer)
{ {
a.y -= delta * 100f; a.y -= delta * 100f;
a.z -= delta * 100f * 1.732f; a.z -= delta * 100f * 1.732f;
...@@ -1140,7 +1140,7 @@ public class UIPopupList : UIWidgetContainer ...@@ -1140,7 +1140,7 @@ public class UIPopupList : UIWidgetContainer
{ {
float whole = items.Count * 20; float whole = items.Count * 20;
float l=delta *100f; float l=delta *100f;
if (go.layer == Program.ui_windows_2d.layer) if (go.layer == Program.I().ui_windows_2d.layer)
{ {
l = delta * 50f; l = delta * 50f;
} }
......
...@@ -28,7 +28,7 @@ Transform: ...@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 115194} m_GameObject: {fileID: 115194}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.005509642, y: 0.005509642, z: 0.005509642} m_LocalScale: {x: 0.0026041667, y: 0.0026041667, z: 0.0026041667}
m_Children: m_Children:
- {fileID: 471862} - {fileID: 471862}
m_Father: {fileID: 0} m_Father: {fileID: 0}
......
...@@ -8,7 +8,7 @@ public class BackGroundPic : Servant ...@@ -8,7 +8,7 @@ public class BackGroundPic : Servant
public override void initialize() public override void initialize()
{ {
backGround = create(Program.I().mod_simple_ngui_background_texture, Vector3.zero, Vector3.zero, false, backGround = create(Program.I().mod_simple_ngui_background_texture, Vector3.zero, Vector3.zero, false,
Program.ui_back_ground_2d); Program.I().ui_back_ground_2d);
var file = new FileStream("texture/common/desk.jpg", FileMode.Open, FileAccess.Read); var file = new FileStream("texture/common/desk.jpg", FileMode.Open, FileAccess.Read);
file.Seek(0, SeekOrigin.Begin); file.Seek(0, SeekOrigin.Begin);
var data = new byte[file.Length]; var data = new byte[file.Length];
...@@ -24,8 +24,7 @@ public class BackGroundPic : Servant ...@@ -24,8 +24,7 @@ public class BackGroundPic : Servant
public override void applyShowArrangement() public override void applyShowArrangement()
{ {
var root = Program.ui_back_ground_2d.GetComponent<UIRoot>(); var s = (float) Utils.UIHeight() / Screen.height;
var s = (float) root.activeHeight / Screen.height;
var tex = backGround.GetComponent<UITexture>().mainTexture; var tex = backGround.GetComponent<UITexture>().mainTexture;
var ss = tex.height / (float) tex.width; var ss = tex.height / (float) tex.width;
var width = (int) (Screen.width * s); var width = (int) (Screen.width * s);
......
...@@ -47,7 +47,7 @@ public class Book : WindowServant2D ...@@ -47,7 +47,7 @@ public class Book : WindowServant2D
base.preFrameFunction(); base.preFrameFunction();
if (isShowed) if (isShowed)
{ {
gameObject.transform.position = Program.camera_main_2d.ScreenToWorldPoint( gameObject.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint(
new Vector3(Program.I().cardDescription.width / 2, new Vector3(Program.I().cardDescription.width / 2,
(Screen.height - Program.I().cardDescription.cHeight) / 2, 0)); (Screen.height - Program.I().cardDescription.cHeight) / 2, 0));
texts.back.width = (int) Program.I().cardDescription.width; texts.back.width = (int) Program.I().cardDescription.width;
......
...@@ -48,10 +48,10 @@ public class CardDescription : Servant ...@@ -48,10 +48,10 @@ public class CardDescription : Servant
gameObject = create gameObject = create
( (
Program.I().new_ui_cardDescription, Program.I().new_ui_cardDescription,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(-256, Screen.height / 2, 600)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(-256, 0, 600)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
true, true,
Program.ui_back_ground_2d Program.I().ui_back_ground_2d
); );
picLoader = gameObject.AddComponent<cardPicLoader>(); picLoader = gameObject.AddComponent<cardPicLoader>();
picLoader.code = 0; picLoader.code = 0;
...@@ -124,9 +124,10 @@ public class CardDescription : Servant ...@@ -124,9 +124,10 @@ public class CardDescription : Servant
{ {
if (gameObject != null) if (gameObject != null)
{ {
underSprite.height = Screen.height + 4; underSprite.height = Utils.UIHeight() + 4;
iTween.MoveTo(gameObject, iTween.MoveTo(gameObject,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(-underSprite.width - 20, Screen.height / 2, 0)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(-underSprite.width - 20,
(float) Utils.UIHeight() / 2, 0)),
1.2f); 1.2f);
setTitle(""); setTitle("");
resizer.gameObject.GetComponent<BoxCollider>().enabled = false; resizer.gameObject.GetComponent<BoxCollider>().enabled = false;
...@@ -137,8 +138,9 @@ public class CardDescription : Servant ...@@ -137,8 +138,9 @@ public class CardDescription : Servant
{ {
if (gameObject != null) if (gameObject != null)
{ {
underSprite.height = Screen.height + 4; underSprite.height = Utils.UIHeight() + 4;
iTween.MoveTo(gameObject, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(-2, Screen.height / 2, 0)), iTween.MoveTo(gameObject,
Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(-2, (float) Utils.UIHeight() / 2, 0)),
1.2f); 1.2f);
resizer.gameObject.GetComponent<BoxCollider>().enabled = true; resizer.gameObject.GetComponent<BoxCollider>().enabled = true;
} }
...@@ -150,10 +152,10 @@ public class CardDescription : Servant ...@@ -150,10 +152,10 @@ public class CardDescription : Servant
{ {
var ca = int.Parse(Config.Get("CA", "230")); var ca = int.Parse(Config.Get("CA", "230"));
var cb = int.Parse(Config.Get("CB", "270")); var cb = int.Parse(Config.Get("CB", "270"));
if (cb > Screen.height) if (cb > Utils.UIHeight())
{ {
// some dumb ass repack the program and set the pic size so large that small screen users can't realize there is card description under it. // some dumb ass repack the program and set the pic size so large that small screen users can't realize there is card description under it.
cb = Screen.height / 2; cb = Utils.UIHeight() / 2;
ca = (int) (cb * 0.68) + 50; ca = (int) (cb * 0.68) + 50;
} }
......
...@@ -13,7 +13,7 @@ public class TextMaster ...@@ -13,7 +13,7 @@ public class TextMaster
position, position,
new Vector3(60, 0, 0), new Vector3(60, 0, 0),
true, true,
Program.ui_main_3d, Program.I().ui_main_3d,
false false
); );
UIHelper.clearITWeen(gameObject); UIHelper.clearITWeen(gameObject);
...@@ -23,10 +23,10 @@ public class TextMaster ...@@ -23,10 +23,10 @@ public class TextMaster
{ {
gameObject = Program.I().ocgcore.create_s( gameObject = Program.I().ocgcore.create_s(
Program.I().mod_simple_ngui_text, Program.I().mod_simple_ngui_text,
Program.camera_main_2d.ScreenToWorldPoint(position), Program.I().camera_main_2d.ScreenToWorldPoint(position),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
true, true,
Program.ui_main_2d Program.I().ui_main_2d
); );
} }
......
...@@ -828,8 +828,8 @@ public static class UIHelper ...@@ -828,8 +828,8 @@ public static class UIHelper
internal static Vector3 getCamGoodPosition(Vector3 v, float l) internal static Vector3 getCamGoodPosition(Vector3 v, float l)
{ {
var screenposition = Program.camera_game_main.WorldToScreenPoint(v); var screenposition = Program.I().main_camera.WorldToScreenPoint(v);
return Program.camera_game_main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, return Program.I().main_camera.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y,
screenposition.z + l)); screenposition.z + l));
} }
...@@ -955,9 +955,9 @@ public static class UIHelper ...@@ -955,9 +955,9 @@ public static class UIHelper
internal static float getScreenDistance(GameObject a, GameObject b) internal static float getScreenDistance(GameObject a, GameObject b)
{ {
var sa = Program.camera_game_main.WorldToScreenPoint(a.transform.position); var sa = Program.I().main_camera.WorldToScreenPoint(a.transform.position);
sa.z = 0; sa.z = 0;
var sb = Program.camera_game_main.WorldToScreenPoint(b.transform.position); var sb = Program.I().main_camera.WorldToScreenPoint(b.transform.position);
sb.z = 0; sb.z = 0;
return Vector3.Distance(sa, sb); return Vector3.Distance(sa, sb);
} }
......
...@@ -28,8 +28,8 @@ public class gameButton : OCGobject ...@@ -28,8 +28,8 @@ public class gameButton : OCGobject
{ {
if (gameObject == null) if (gameObject == null)
{ {
gameObject = create(Program.I().new_ui_superButton, Program.camera_main_2d.ScreenToWorldPoint(v), gameObject = create(Program.I().new_ui_superButton, Program.I().camera_main_2d.ScreenToWorldPoint(v),
Vector3.zero, false, Program.ui_main_2d); Vector3.zero, false, Program.I().ui_main_2d);
gameObjectEvent = UIHelper.getRealEventGameObject(gameObject); gameObjectEvent = UIHelper.getRealEventGameObject(gameObject);
UIHelper.registEvent(gameObject, clicked); UIHelper.registEvent(gameObject, clicked);
gameObject.GetComponent<iconSetForButton>().setTexture(type); gameObject.GetComponent<iconSetForButton>().setTexture(type);
...@@ -40,7 +40,7 @@ public class gameButton : OCGobject ...@@ -40,7 +40,7 @@ public class gameButton : OCGobject
0.2f); 0.2f);
} }
gameObject.transform.position = Program.camera_main_2d.ScreenToWorldPoint(v); gameObject.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint(v);
} }
private void clicked() private void clicked()
......
...@@ -273,10 +273,10 @@ public class gameCard : OCGobject ...@@ -273,10 +273,10 @@ public class gameCard : OCGobject
{ {
var screenposition = Vector3.zero; var screenposition = Vector3.zero;
if (cardDecorations[i].up_of_card) if (cardDecorations[i].up_of_card)
screenposition = Program.camera_game_main.WorldToScreenPoint(gameObject_face.transform.position + screenposition = Program.I().main_camera.WorldToScreenPoint(gameObject_face.transform.position +
new Vector3(0, 1.2f, 1.2f * 1.732f)); new Vector3(0, 1.2f, 1.2f * 1.732f));
else else
screenposition = Program.camera_game_main.WorldToScreenPoint(gameObject_face.transform.position); screenposition = Program.I().main_camera.WorldToScreenPoint(gameObject_face.transform.position);
var worldposition = Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, var worldposition = Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y,
screenposition.z - cardDecorations[i].relative_position)); screenposition.z - cardDecorations[i].relative_position));
cardDecorations[i].game_object.transform.eulerAngles = cardDecorations[i].rotation; cardDecorations[i].game_object.transform.eulerAngles = cardDecorations[i].rotation;
...@@ -291,7 +291,7 @@ public class gameCard : OCGobject ...@@ -291,7 +291,7 @@ public class gameCard : OCGobject
if (obj_number != null) if (obj_number != null)
{ {
var screenposition = var screenposition =
Program.camera_game_main.WorldToScreenPoint(gameObject_face.transform.position + Program.I().main_camera.WorldToScreenPoint(gameObject_face.transform.position +
new Vector3(0, 1f * 2.4f, 1.732f * 2.4f)); new Vector3(0, 1f * 2.4f, 1.732f * 2.4f));
var worldposition = var worldposition =
Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 5)); Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 5));
...@@ -548,7 +548,7 @@ public class gameCard : OCGobject ...@@ -548,7 +548,7 @@ public class gameCard : OCGobject
// { // {
// deltaTimeCloseUp = faT; // deltaTimeCloseUp = faT;
// } // }
// Vector3 screenposition = Program.camera_game_main.WorldToScreenPoint(accurate_position); // Vector3 screenposition = Program.I().main_camera.WorldToScreenPoint(accurate_position);
// Vector3 worldposition = Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 10)); // Vector3 worldposition = Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 10));
// gameObject.transform.position = new Vector3 // gameObject.transform.position = new Vector3
// ( // (
...@@ -564,7 +564,7 @@ public class gameCard : OCGobject ...@@ -564,7 +564,7 @@ public class gameCard : OCGobject
private void ES_excited_handler_close_up_handler() private void ES_excited_handler_close_up_handler()
{ {
var screenposition = Program.camera_game_main.WorldToScreenPoint(accurate_position); var screenposition = Program.I().main_camera.WorldToScreenPoint(accurate_position);
var worldposition = var worldposition =
Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 10)); Camera.main.ScreenToWorldPoint(new Vector3(screenposition.x, screenposition.y, screenposition.z - 10));
gameObject.transform.position += (worldposition - gameObject.transform.position) * 35f * Program.deltaTime; gameObject.transform.position += (worldposition - gameObject.transform.position) * 35f * Program.deltaTime;
...@@ -580,7 +580,7 @@ public class gameCard : OCGobject ...@@ -580,7 +580,7 @@ public class gameCard : OCGobject
vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, -2f); vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, -2f);
else else
vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, -1.5f); vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, -1.5f);
vector_of_begin = Program.camera_game_main.WorldToScreenPoint(vector_of_begin); vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
for (var i = 0; i < buttons.Count; i++) for (var i = 0; i < buttons.Count; i++)
buttons[i].show(vector_of_begin - i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) - buttons[i].show(vector_of_begin - i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) -
new Vector3(0, 20f * 0.7f * Screen.height / 700f)); new Vector3(0, 20f * 0.7f * Screen.height / 700f));
...@@ -590,7 +590,7 @@ public class gameCard : OCGobject ...@@ -590,7 +590,7 @@ public class gameCard : OCGobject
if (condition == gameCardCondition.floating_clickable) if (condition == gameCardCondition.floating_clickable)
{ {
var vector_of_begin = gameObject_face.transform.position + new Vector3(0, 1, 1.732f); var vector_of_begin = gameObject_face.transform.position + new Vector3(0, 1, 1.732f);
vector_of_begin = Program.camera_game_main.WorldToScreenPoint(vector_of_begin); vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
for (var i = 0; i < buttons.Count; i++) for (var i = 0; i < buttons.Count; i++)
buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) + buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) +
new Vector3(0, 35f * 0.7f * Screen.height / 700f)); new Vector3(0, 35f * 0.7f * Screen.height / 700f));
...@@ -606,7 +606,7 @@ public class gameCard : OCGobject ...@@ -606,7 +606,7 @@ public class gameCard : OCGobject
vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, 2); vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, 2);
else else
vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, 1.5f); vector_of_begin = gameObject_face.transform.position + new Vector3(0, 0, 1.5f);
vector_of_begin = Program.camera_game_main.WorldToScreenPoint(vector_of_begin); vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
for (var i = 0; i < buttons.Count; i++) for (var i = 0; i < buttons.Count; i++)
buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) + buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) +
new Vector3(0, 35f * 0.7f * Screen.height / 700f)); new Vector3(0, 35f * 0.7f * Screen.height / 700f));
...@@ -617,7 +617,7 @@ public class gameCard : OCGobject ...@@ -617,7 +617,7 @@ public class gameCard : OCGobject
var vector_of_begin = Vector3.zero; var vector_of_begin = Vector3.zero;
var l = 0.5f * game_object_verticle_drawing.transform.localScale.y * (h - 0.5f); var l = 0.5f * game_object_verticle_drawing.transform.localScale.y * (h - 0.5f);
vector_of_begin = game_object_verticle_drawing.transform.position + new Vector3(0, l, l * 1.732f); vector_of_begin = game_object_verticle_drawing.transform.position + new Vector3(0, l, l * 1.732f);
vector_of_begin = Program.camera_game_main.WorldToScreenPoint(vector_of_begin); vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
for (var i = 0; i < buttons.Count; i++) for (var i = 0; i < buttons.Count; i++)
buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) + buttons[i].show(vector_of_begin + i * new Vector3(0, 65f * 0.7f * Screen.height / 700f) +
new Vector3(0, 35f * 0.7f * Screen.height / 700f)); new Vector3(0, 35f * 0.7f * Screen.height / 700f));
...@@ -655,7 +655,7 @@ public class gameCard : OCGobject ...@@ -655,7 +655,7 @@ public class gameCard : OCGobject
ES_excited_unsafe_should_not_be_changed_dont_touch_this = true; ES_excited_unsafe_should_not_be_changed_dont_touch_this = true;
showMeLeft(true); showMeLeft(true);
var overlayed_cards = Program.I().ocgcore.GCS_cardGetOverlayElements(this); var overlayed_cards = Program.I().ocgcore.GCS_cardGetOverlayElements(this);
var screen = Program.camera_game_main.WorldToScreenPoint(gameObject.transform.position); var screen = Program.I().main_camera.WorldToScreenPoint(gameObject.transform.position);
screen.z = 0; screen.z = 0;
var k = Screen.height / 700f; var k = Screen.height / 700f;
for (var x = 0; x < overlayed_cards.Count; x++) for (var x = 0; x < overlayed_cards.Count; x++)
...@@ -1049,7 +1049,7 @@ public class gameCard : OCGobject ...@@ -1049,7 +1049,7 @@ public class gameCard : OCGobject
if (game_object_monster_cloude != null) if (game_object_monster_cloude != null)
if (game_object_monster_cloude_ParticleSystem != null) if (game_object_monster_cloude_ParticleSystem != null)
{ {
var screenposition = Program.camera_game_main.WorldToScreenPoint(gameObject.transform.position); var screenposition = Program.I().main_camera.WorldToScreenPoint(gameObject.transform.position);
game_object_monster_cloude.transform.position = game_object_monster_cloude.transform.position =
Camera.main.ScreenToWorldPoint( Camera.main.ScreenToWorldPoint(
new Vector3(screenposition.x, screenposition.y, screenposition.z + 3)); new Vector3(screenposition.x, screenposition.y, screenposition.z + 3));
...@@ -1277,33 +1277,33 @@ public class gameCard : OCGobject ...@@ -1277,33 +1277,33 @@ public class gameCard : OCGobject
Vector3 screen_number_pos; Vector3 screen_number_pos;
screen_number_pos = 2 * gameObject_face.transform.position - cardHint.gameObject.transform.position; screen_number_pos = 2 * gameObject_face.transform.position - cardHint.gameObject.transform.position;
screen_number_pos = screen_number_pos =
Program.camera_game_main.WorldToScreenPoint(screen_number_pos + new Vector3(-0.25f, 0, -0.7f)); Program.I().main_camera.WorldToScreenPoint(screen_number_pos + new Vector3(-0.25f, 0, -0.7f));
screen_number_pos.z -= 2f; screen_number_pos.z -= 2f;
verticle_number.transform.position = Program.camera_game_main.ScreenToWorldPoint(screen_number_pos); verticle_number.transform.position = Program.I().main_camera.ScreenToWorldPoint(screen_number_pos);
if (game_object_verticle_Star != null) if (game_object_verticle_Star != null)
{ {
screen_number_pos = 2 * gameObject_face.transform.position - cardHint.gameObject.transform.position; screen_number_pos = 2 * gameObject_face.transform.position - cardHint.gameObject.transform.position;
screen_number_pos = screen_number_pos =
Program.camera_game_main.WorldToScreenPoint(screen_number_pos + new Vector3(-1.5f, 0, -0.7f)); Program.I().main_camera.WorldToScreenPoint(screen_number_pos + new Vector3(-1.5f, 0, -0.7f));
screen_number_pos.z -= 2f; screen_number_pos.z -= 2f;
game_object_verticle_Star.transform.position = game_object_verticle_Star.transform.position =
Program.camera_game_main.ScreenToWorldPoint(screen_number_pos); Program.I().main_camera.ScreenToWorldPoint(screen_number_pos);
} }
} }
else else
{ {
Vector3 screen_number_pos; Vector3 screen_number_pos;
screen_number_pos = Program.camera_game_main.WorldToScreenPoint(cardHint.gameObject.transform.position + screen_number_pos = Program.I().main_camera.WorldToScreenPoint(cardHint.gameObject.transform.position +
new Vector3(-0.61f, 0.65f, 0.65f * 1.732f)); new Vector3(-0.61f, 0.65f, 0.65f * 1.732f));
screen_number_pos.z -= 2f; screen_number_pos.z -= 2f;
verticle_number.transform.position = Program.camera_game_main.ScreenToWorldPoint(screen_number_pos); verticle_number.transform.position = Program.I().main_camera.ScreenToWorldPoint(screen_number_pos);
if (game_object_verticle_Star != null) if (game_object_verticle_Star != null)
{ {
screen_number_pos = Program.camera_game_main.WorldToScreenPoint( screen_number_pos = Program.I().main_camera.WorldToScreenPoint(
cardHint.gameObject.transform.position + new Vector3(-1.86f, 0.65f, 0.65f * 1.732f)); cardHint.gameObject.transform.position + new Vector3(-1.86f, 0.65f, 0.65f * 1.732f));
screen_number_pos.z -= 2f; screen_number_pos.z -= 2f;
game_object_verticle_Star.transform.position = game_object_verticle_Star.transform.position =
Program.camera_game_main.ScreenToWorldPoint(screen_number_pos); Program.I().main_camera.ScreenToWorldPoint(screen_number_pos);
} }
} }
...@@ -1810,7 +1810,7 @@ public class gameCard : OCGobject ...@@ -1810,7 +1810,7 @@ public class gameCard : OCGobject
private FlashingController insFlashONE(string color) private FlashingController insFlashONE(string color)
{ {
FlashingController flash = null; FlashingController flash = null;
Program.camera_game_main.GetComponent<HighlightingEffect>().enabled = true; Program.I().main_camera.GetComponent<HighlightingEffect>().enabled = true;
flash = Program.I().create(Program.I().mod_ocgcore_card_figure_line).GetComponent<FlashingController>(); flash = Program.I().create(Program.I().mod_ocgcore_card_figure_line).GetComponent<FlashingController>();
flash.transform.SetParent(gameObject_face.transform, false); flash.transform.SetParent(gameObject_face.transform, false);
flash.transform.localPosition = Vector3.zero; flash.transform.localPosition = Vector3.zero;
...@@ -1824,7 +1824,7 @@ public class gameCard : OCGobject ...@@ -1824,7 +1824,7 @@ public class gameCard : OCGobject
public void flash_line_on() public void flash_line_on()
{ {
Program.camera_game_main.GetComponent<HighlightingEffect>().enabled = true; Program.I().main_camera.GetComponent<HighlightingEffect>().enabled = true;
if (MouseFlash == null) if (MouseFlash == null)
{ {
MouseFlash = create(Program.I().mod_ocgcore_card_figure_line).GetComponent<FlashingController>(); MouseFlash = create(Program.I().mod_ocgcore_card_figure_line).GetComponent<FlashingController>();
...@@ -1849,7 +1849,7 @@ public class gameCard : OCGobject ...@@ -1849,7 +1849,7 @@ public class gameCard : OCGobject
public void p_line_on() public void p_line_on()
{ {
Program.camera_game_main.GetComponent<HighlightingEffect>().enabled = true; Program.I().main_camera.GetComponent<HighlightingEffect>().enabled = true;
if (p_line != null) destroy(p_line); if (p_line != null) destroy(p_line);
p_line = create(Program.I().mod_ocgcore_card_figure_line); p_line = create(Program.I().mod_ocgcore_card_figure_line);
p_line.transform.SetParent(gameObject_face.transform, false); p_line.transform.SetParent(gameObject_face.transform, false);
...@@ -2057,7 +2057,7 @@ public class gameCard : OCGobject ...@@ -2057,7 +2057,7 @@ public class gameCard : OCGobject
refreshFunctions.Remove(SOH_act); refreshFunctions.Remove(SOH_act);
var shower = var shower =
create(Program.I().Pro1_superCardShowerA, Program.I().ocgcore.centre(true), Vector3.zero, false, create(Program.I().Pro1_superCardShowerA, Program.I().ocgcore.centre(true), Vector3.zero, false,
Program.ui_main_2d).GetComponent<YGO1superShower>(); Program.I().ui_main_2d).GetComponent<YGO1superShower>();
shower.card.mainTexture = tex; shower.card.mainTexture = tex;
shower.closeup.mainTexture = texc; shower.closeup.mainTexture = texc;
shower.closeup.height = (int) (500f / k); shower.closeup.height = (int) (500f / k);
...@@ -2075,7 +2075,7 @@ public class gameCard : OCGobject ...@@ -2075,7 +2075,7 @@ public class gameCard : OCGobject
refreshFunctions.Remove(SOH_nAct); refreshFunctions.Remove(SOH_nAct);
var shower = var shower =
create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false, create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false,
Program.ui_main_2d).GetComponent<pro1CardShower>(); Program.I().ui_main_2d).GetComponent<pro1CardShower>();
shower.card.mainTexture = tex; shower.card.mainTexture = tex;
shower.mask.mainTexture = GameTextureManager.Mask; shower.mask.mainTexture = GameTextureManager.Mask;
shower.disable.mainTexture = GameTextureManager.negated; shower.disable.mainTexture = GameTextureManager.negated;
...@@ -2099,7 +2099,7 @@ public class gameCard : OCGobject ...@@ -2099,7 +2099,7 @@ public class gameCard : OCGobject
refreshFunctions.Remove(SOH_sum); refreshFunctions.Remove(SOH_sum);
var shower = var shower =
create(Program.I().Pro1_superCardShower, Program.I().ocgcore.centre(true), Vector3.zero, false, create(Program.I().Pro1_superCardShower, Program.I().ocgcore.centre(true), Vector3.zero, false,
Program.ui_main_2d).GetComponent<YGO1superShower>(); Program.I().ui_main_2d).GetComponent<YGO1superShower>();
shower.card.mainTexture = tex; shower.card.mainTexture = tex;
shower.closeup.mainTexture = texc; shower.closeup.mainTexture = texc;
shower.closeup.height = (int) (500f / k); shower.closeup.height = (int) (500f / k);
...@@ -2117,7 +2117,7 @@ public class gameCard : OCGobject ...@@ -2117,7 +2117,7 @@ public class gameCard : OCGobject
refreshFunctions.Remove(SOH_nSum); refreshFunctions.Remove(SOH_nSum);
var shower = var shower =
create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false, create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false,
Program.ui_main_2d).GetComponent<pro1CardShower>(); Program.I().ui_main_2d).GetComponent<pro1CardShower>();
shower.card.mainTexture = tex; shower.card.mainTexture = tex;
shower.mask.mainTexture = GameTextureManager.Mask; shower.mask.mainTexture = GameTextureManager.Mask;
shower.disable.mainTexture = GameTextureManager.negated; shower.disable.mainTexture = GameTextureManager.negated;
...@@ -2141,7 +2141,7 @@ public class gameCard : OCGobject ...@@ -2141,7 +2141,7 @@ public class gameCard : OCGobject
refreshFunctions.Remove(SOH_dis); refreshFunctions.Remove(SOH_dis);
var shower = var shower =
create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false, create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false,
Program.ui_main_2d).GetComponent<pro1CardShower>(); Program.I().ui_main_2d).GetComponent<pro1CardShower>();
shower.card.mainTexture = tex; shower.card.mainTexture = tex;
shower.mask.mainTexture = GameTextureManager.Mask; shower.mask.mainTexture = GameTextureManager.Mask;
shower.disable.mainTexture = GameTextureManager.negated; shower.disable.mainTexture = GameTextureManager.negated;
...@@ -2296,7 +2296,7 @@ public class gameCard : OCGobject ...@@ -2296,7 +2296,7 @@ public class gameCard : OCGobject
if (ballChain != null) if (ballChain != null)
{ {
del_all_decoration_by_string("chaining"); del_all_decoration_by_string("chaining");
var pos = UIHelper.get_close(gameObject.transform.position, Program.camera_game_main, 5); var pos = UIHelper.get_close(gameObject.transform.position, Program.I().main_camera, 5);
if (Program.I().setting.setting.Vchain.value) if (Program.I().setting.setting.Vchain.value)
Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity), 5f); Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity), 5f);
if (ballChain != null) destroy(ballChain); if (ballChain != null) destroy(ballChain);
......
...@@ -83,7 +83,7 @@ public class GameField : OCGobject ...@@ -83,7 +83,7 @@ public class GameField : OCGobject
public GameField() public GameField()
{ {
gameObject = create(Program.I().new_ocgcore_field, getGoodPosition(), Vector3.zero, false, gameObject = create(Program.I().new_ocgcore_field, getGoodPosition(), Vector3.zero, false,
Program.ui_container_3d, false); Program.I().ui_container_3d, false);
UIHelper.getByName(gameObject, "obj_0").transform.localScale = Vector3.zero; UIHelper.getByName(gameObject, "obj_0").transform.localScale = Vector3.zero;
UIHelper.getByName(gameObject, "obj_1").transform.localScale = Vector3.zero; UIHelper.getByName(gameObject, "obj_1").transform.localScale = Vector3.zero;
Phase = gameObject.GetComponentInChildren<phaser>(); Phase = gameObject.GetComponentInChildren<phaser>();
...@@ -138,7 +138,7 @@ public class GameField : OCGobject ...@@ -138,7 +138,7 @@ public class GameField : OCGobject
label = create(Program.I().mod_simple_ngui_text, new Vector3(0, 0, -14.5f), new Vector3(60, 0, 0), false, label = create(Program.I().mod_simple_ngui_text, new Vector3(0, 0, -14.5f), new Vector3(60, 0, 0), false,
Program.ui_container_3d, false).GetComponent<UILabel>(); Program.I().ui_container_3d, false).GetComponent<UILabel>();
label.fontSize = 40; label.fontSize = 40;
label.overflowMethod = UILabel.Overflow.ShrinkContent; label.overflowMethod = UILabel.Overflow.ShrinkContent;
label.alignment = NGUIText.Alignment.Left; label.alignment = NGUIText.Alignment.Left;
...@@ -573,7 +573,7 @@ public class GameField : OCGobject ...@@ -573,7 +573,7 @@ public class GameField : OCGobject
if (Ocgcore.inSkiping) return; if (Ocgcore.inSkiping) return;
if (only) destroy(big_string); if (only) destroy(big_string);
big_string = create(Program.I().New_phase, Program.I().ocgcore.centre(), Vector3.zero, false, big_string = create(Program.I().New_phase, Program.I().ocgcore.centre(), Vector3.zero, false,
Program.ui_main_2d, true, Program.I().ui_main_2d, true,
new Vector3(Screen.height / 1000f * Program.fieldSize, Screen.height / 1000f * Program.fieldSize, new Vector3(Screen.height / 1000f * Program.fieldSize, Screen.height / 1000f * Program.fieldSize,
Screen.height / 1000f * Program.fieldSize)); Screen.height / 1000f * Program.fieldSize));
big_string.GetComponentInChildren<UITexture>().mainTexture = tex; big_string.GetComponentInChildren<UITexture>().mainTexture = tex;
...@@ -705,13 +705,13 @@ public class GameField : OCGobject ...@@ -705,13 +705,13 @@ public class GameField : OCGobject
if (player == 0) if (player == 0)
{ {
screen_p = new Vector3(Program.I().ocgcore.getScreenCenter(), 100f, 5); screen_p = new Vector3(Program.I().ocgcore.getScreenCenter(), 100f, 5);
position = Program.camera_game_main.ScreenToWorldPoint(new Vector3(Program.I().ocgcore.getScreenCenter(), position = Program.I().main_camera.ScreenToWorldPoint(new Vector3(Program.I().ocgcore.getScreenCenter(),
100f, 5)); 100f, 5));
} }
else else
{ {
screen_p = new Vector3(Program.I().ocgcore.getScreenCenter(), Screen.height - 100f, 5); screen_p = new Vector3(Program.I().ocgcore.getScreenCenter(), Screen.height - 100f, 5);
position = Program.camera_game_main.ScreenToWorldPoint(new Vector3(Program.I().ocgcore.getScreenCenter(), position = Program.I().main_camera.ScreenToWorldPoint(new Vector3(Program.I().ocgcore.getScreenCenter(),
Screen.height - 100f, 5)); Screen.height - 100f, 5));
} }
...@@ -754,7 +754,7 @@ public class GameField : OCGobject ...@@ -754,7 +754,7 @@ public class GameField : OCGobject
if (player == 0) if (player == 0)
{ {
Program.I().ocgcore.Sleep((int) (60 * (float) amount / 2500f)); Program.I().ocgcore.Sleep((int) (60 * (float) amount / 2500f));
iTween.ShakePosition(Program.camera_game_main.gameObject, iTween.Hash( iTween.ShakePosition(Program.I().main_camera.gameObject, iTween.Hash(
"x", amount / 1500f, "x", amount / 1500f,
"y", amount / 1500f, "y", amount / 1500f,
"z", amount / 1500f, "z", amount / 1500f,
...@@ -796,7 +796,7 @@ public class GameField : OCGobject ...@@ -796,7 +796,7 @@ public class GameField : OCGobject
// text_mesh.alignment = TMPro.TextAlignmentOptions.Center; // text_mesh.alignment = TMPro.TextAlignmentOptions.Center;
// Vector3 screenP = Program.camera_game_main.WorldToScreenPoint(Vector3.zero); // Vector3 screenP = Program.I().main_camera.WorldToScreenPoint(Vector3.zero);
// screenP.z = 18f; // screenP.z = 18f;
// int bun = Screen.height / 3; // int bun = Screen.height / 3;
// if (screenP.y > Screen.height / 2 + bun) // if (screenP.y > Screen.height / 2 + bun)
...@@ -807,7 +807,7 @@ public class GameField : OCGobject ...@@ -807,7 +807,7 @@ public class GameField : OCGobject
// { // {
// screenP.y = Screen.height / 2 - bun; // screenP.y = Screen.height / 2 - bun;
// } // }
// big_string.transform.position = Program.camera_game_main.ScreenToWorldPoint(screenP); // big_string.transform.position = Program.I().main_camera.ScreenToWorldPoint(screenP);
// big_string.AddComponent<animation_screen_lock2>(); // big_string.AddComponent<animation_screen_lock2>();
// big_string.transform.localScale = Vector3.zero; // big_string.transform.localScale = Vector3.zero;
......
...@@ -165,7 +165,7 @@ public class gameHiddenButton : OCGobject ...@@ -165,7 +165,7 @@ public class gameHiddenButton : OCGobject
Program.I().book.lab = Program.I().book.lab =
create(Program.I().New_decker, Vector3.zero, Vector3.zero, false, Program.ui_main_2d) create(Program.I().New_decker, Vector3.zero, Vector3.zero, false, Program.I().ui_main_2d)
.GetComponent<UILabel>(); .GetComponent<UILabel>();
Program.I().book.realize(); Program.I().book.realize();
...@@ -174,7 +174,7 @@ public class gameHiddenButton : OCGobject ...@@ -174,7 +174,7 @@ public class gameHiddenButton : OCGobject
screenPosition.x -= 90; screenPosition.x -= 90;
screenPosition.y += Program.I().book.lab.height / 4; screenPosition.y += Program.I().book.lab.height / 4;
screenPosition.z = 0; screenPosition.z = 0;
var worldPositin = Program.camera_main_2d.ScreenToWorldPoint(screenPosition); var worldPositin = Program.I().camera_main_2d.ScreenToWorldPoint(screenPosition);
Program.I().book.lab.transform.position = worldPositin; Program.I().book.lab.transform.position = worldPositin;
return; return;
...@@ -192,7 +192,7 @@ public class gameHiddenButton : OCGobject ...@@ -192,7 +192,7 @@ public class gameHiddenButton : OCGobject
Program.I().book.labop = Program.I().book.labop =
create(Program.I().New_decker, Vector3.zero, Vector3.zero, false, Program.ui_main_2d) create(Program.I().New_decker, Vector3.zero, Vector3.zero, false, Program.I().ui_main_2d)
.GetComponent<UILabel>(); .GetComponent<UILabel>();
Program.I().book.realize(); Program.I().book.realize();
...@@ -201,7 +201,7 @@ public class gameHiddenButton : OCGobject ...@@ -201,7 +201,7 @@ public class gameHiddenButton : OCGobject
screenPosition.x -= 90; screenPosition.x -= 90;
screenPosition.y -= Program.I().book.labop.height / 4; screenPosition.y -= Program.I().book.labop.height / 4;
screenPosition.z = 0; screenPosition.z = 0;
var worldPositin = Program.camera_main_2d.ScreenToWorldPoint(screenPosition); var worldPositin = Program.I().camera_main_2d.ScreenToWorldPoint(screenPosition);
Program.I().book.labop.transform.position = worldPositin; Program.I().book.labop.transform.position = worldPositin;
return; return;
......
...@@ -480,7 +480,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -480,7 +480,7 @@ public class Ocgcore : ServantWithCardDescription
Vector3.zero, Vector3.zero,
Vector3.zero, Vector3.zero,
false, false,
Program.ui_back_ground_2d Program.I().ui_back_ground_2d
).GetComponent<gameInfo>(); ).GetComponent<gameInfo>();
gameInfo.ini(); gameInfo.ini();
UIHelper.InterGameObject(gameInfo.gameObject); UIHelper.InterGameObject(gameInfo.gameObject);
...@@ -1666,7 +1666,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -1666,7 +1666,7 @@ public class Ocgcore : ServantWithCardDescription
} }
var handres = create(Program.I().new_ui_handShower, Vector3.zero, Vector3.zero, false, var handres = create(Program.I().new_ui_handShower, Vector3.zero, Vector3.zero, false,
Program.ui_main_2d); Program.I().ui_main_2d);
destroy(handres, 10f); destroy(handres, 10f);
Sleep(60); Sleep(60);
break; break;
...@@ -2339,7 +2339,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -2339,7 +2339,7 @@ public class Ocgcore : ServantWithCardDescription
EventDelegate.Execute(UIHelper.getByName<UIButton>(toolBar, "stop_").onClick); EventDelegate.Execute(UIHelper.getByName<UIButton>(toolBar, "stop_").onClick);
RMSshow_clear(); RMSshow_clear();
var real = (Program.fieldSize - 1) * 0.9f + 1f; var real = (Program.fieldSize - 1) * 0.9f + 1f;
var point = Program.camera_game_main.WorldToScreenPoint(new Vector3(0, 0, -5.65f * real)); var point = Program.I().main_camera.WorldToScreenPoint(new Vector3(0, 0, -5.65f * real));
point.z = 2; point.z = 2;
if (Program.I().setting.setting.Vwin.value) if (Program.I().setting.setting.Vwin.value)
{ {
...@@ -2356,10 +2356,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -2356,10 +2356,10 @@ public class Ocgcore : ServantWithCardDescription
winCaculator = create winCaculator = create
( (
Program.I().New_winCaculatorRecord, Program.I().New_winCaculatorRecord,
Program.camera_main_2d.ScreenToWorldPoint(point), Program.I().camera_main_2d.ScreenToWorldPoint(point),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
).GetComponent<lazyWin>(); ).GetComponent<lazyWin>();
...@@ -2369,10 +2369,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -2369,10 +2369,10 @@ public class Ocgcore : ServantWithCardDescription
winCaculator = create winCaculator = create
( (
Program.I().New_winCaculator, Program.I().New_winCaculator,
Program.camera_main_2d.ScreenToWorldPoint(point), Program.I().camera_main_2d.ScreenToWorldPoint(point),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
).GetComponent<lazyWin>(); ).GetComponent<lazyWin>();
...@@ -4343,7 +4343,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4343,7 +4343,7 @@ public class Ocgcore : ServantWithCardDescription
UIHelper.playSound("addcounter", 1); UIHelper.playSound("addcounter", 1);
//if (Program.YGOPro1 == false) //if (Program.YGOPro1 == false)
{ {
var pos = UIHelper.get_close(card.gameObject.transform.position, Program.camera_game_main, var pos = UIHelper.get_close(card.gameObject.transform.position, Program.I().main_camera,
5); 5);
Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity), Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity),
5f); 5f);
...@@ -4365,7 +4365,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4365,7 +4365,7 @@ public class Ocgcore : ServantWithCardDescription
UIHelper.playSound("removecounter", 1); UIHelper.playSound("removecounter", 1);
//if (Program.YGOPro1 == false) //if (Program.YGOPro1 == false)
{ {
var pos = UIHelper.get_close(card.gameObject.transform.position, Program.camera_game_main, var pos = UIHelper.get_close(card.gameObject.transform.position, Program.I().main_camera,
5); 5);
Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity), Object.Destroy(Object.Instantiate(Program.I().mod_ocgcore_cs_end, pos, Quaternion.identity),
5f); 5f);
...@@ -4483,7 +4483,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4483,7 +4483,7 @@ public class Ocgcore : ServantWithCardDescription
r.ReadByte(); r.ReadByte();
UIHelper.playSound("explode", 0.4f); UIHelper.playSound("explode", 0.4f);
var amount = (int) (Mathf.Clamp(attackCard.get_data().Attack, 0, 3500) * 0.8f); var amount = (int) (Mathf.Clamp(attackCard.get_data().Attack, 0, 3500) * 0.8f);
iTween.ShakePosition(Program.camera_game_main.gameObject, iTween.Hash( iTween.ShakePosition(Program.I().main_camera.gameObject, iTween.Hash(
"x", amount / 1500f, "x", amount / 1500f,
"y", amount / 1500f, "y", amount / 1500f,
"z", amount / 1500f, "z", amount / 1500f,
...@@ -4787,9 +4787,9 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4787,9 +4787,9 @@ public class Ocgcore : ServantWithCardDescription
{ {
if (waitObject == null) if (waitObject == null)
waitObject = create_s(Program.I().new_ocgcore_wait, waitObject = create_s(Program.I().new_ocgcore_wait,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(getScreenCenter(), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(getScreenCenter(),
Screen.height - 15f - 15f * (1.21f - Program.fieldSize) / 0.21f)), Vector3.zero, true, Screen.height - 15f - 15f * (1.21f - Program.fieldSize) / 0.21f)), Vector3.zero, true,
Program.ui_main_2d); Program.I().ui_main_2d);
} }
private void removeAttackHandler() private void removeAttackHandler()
...@@ -6848,9 +6848,9 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6848,9 +6848,9 @@ public class Ocgcore : ServantWithCardDescription
base.show(); base.show();
Program.I().light.transform.eulerAngles = new Vector3(50, -50, 0); Program.I().light.transform.eulerAngles = new Vector3(50, -50, 0);
Program.cameraPosition = new Vector3(0, 23, -18.5f - 3.2f * (Program.fieldSize - 1f) / 0.21f); Program.cameraPosition = new Vector3(0, 23, -18.5f - 3.2f * (Program.fieldSize - 1f) / 0.21f);
Program.camera_game_main.transform.position = Program.cameraPosition * 1.5f; Program.I().main_camera.transform.position = Program.cameraPosition * 1.5f;
Program.cameraRotation = new Vector3(60, 0, 0); Program.cameraRotation = new Vector3(60, 0, 0);
Program.camera_game_main.transform.eulerAngles = Program.cameraRotation; Program.I().main_camera.transform.eulerAngles = Program.cameraRotation;
Program.reMoveCam(getScreenCenter()); Program.reMoveCam(getScreenCenter());
gameField = new GameField(); gameField = new GameField();
if (paused) if (paused)
...@@ -7671,7 +7671,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -7671,7 +7671,7 @@ public class Ocgcore : ServantWithCardDescription
if (texture != null) if (texture != null)
{ {
RemoveUpdateAction_s(animation_show_card_code_handler); RemoveUpdateAction_s(animation_show_card_code_handler);
//Vector3 position = Program.camera_game_main.ScreenToWorldPoint(new Vector3(getScreenCenter(), Screen.height / 2f, 10)); //Vector3 position = Program.I().main_camera.ScreenToWorldPoint(new Vector3(getScreenCenter(), Screen.height / 2f, 10));
//GameObject obj = create_s(Program.I().mod_simple_quad); //GameObject obj = create_s(Program.I().mod_simple_quad);
//obj.AddComponent<animation_screen_lock>().screen_point = new Vector3(getScreenCenter(), Screen.height / 2f, 6); //obj.AddComponent<animation_screen_lock>().screen_point = new Vector3(getScreenCenter(), Screen.height / 2f, 6);
//obj.transform.eulerAngles = new Vector3(60, 0, 0); //obj.transform.eulerAngles = new Vector3(60, 0, 0);
...@@ -7681,7 +7681,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -7681,7 +7681,7 @@ public class Ocgcore : ServantWithCardDescription
//destroy(obj, 1f); //destroy(obj, 1f);
var shower = var shower =
create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false, create(Program.I().Pro1_CardShower, Program.I().ocgcore.centre(), Vector3.zero, false,
Program.ui_main_2d).GetComponent<pro1CardShower>(); Program.I().ui_main_2d).GetComponent<pro1CardShower>();
shower.card.mainTexture = texture; shower.card.mainTexture = texture;
shower.mask.mainTexture = GameTextureManager.Mask; shower.mask.mainTexture = GameTextureManager.Mask;
shower.disable.mainTexture = GameTextureManager.negated; shower.disable.mainTexture = GameTextureManager.negated;
......
...@@ -15,13 +15,24 @@ public class Program : MonoBehaviour ...@@ -15,13 +15,24 @@ public class Program : MonoBehaviour
#region Resources #region Resources
public Camera main_camera; [Header("场景里的对象引用")] public Camera main_camera;
public facer face;
public Light light; public Light light;
public AudioSource audio; public AudioSource audio;
public GameObject ui_back_ground_2d;
public Camera camera_back_ground_2d;
public GameObject ui_windows_2d;
public Camera camera_windows_2d;
public GameObject ui_main_2d;
public Camera camera_main_2d;
public GameObject ui_container_3d;
public Camera camera_container_3d;
public GameObject ui_main_3d;
public Camera camera_main_3d;
[Header("Prefab")] public facer face;
public AudioClip zhankai; public AudioClip zhankai;
public GameObject mod_ui_2d;
public GameObject mod_ui_3d;
public GameObject mod_winExplode; public GameObject mod_winExplode;
public GameObject mod_loseExplode; public GameObject mod_loseExplode;
public GameObject mod_audio_effect; public GameObject mod_audio_effect;
...@@ -257,17 +268,6 @@ public class Program : MonoBehaviour ...@@ -257,17 +268,6 @@ public class Program : MonoBehaviour
return transparency; return transparency;
} }
public static GameObject ui_back_ground_2d;
public static Camera camera_back_ground_2d;
public static GameObject ui_container_3d;
public static Camera camera_container_3d;
public static Camera camera_game_main;
public static GameObject ui_windows_2d;
public static Camera camera_windows_2d;
public static GameObject ui_main_2d;
public static Camera camera_main_2d;
public static GameObject ui_main_3d;
public static Camera camera_main_3d;
public static Vector3 cameraPosition = new Vector3(0, 23, -23); public static Vector3 cameraPosition = new Vector3(0, 23, -23);
public static Vector3 cameraRotation = new Vector3(60, 0, 0); public static Vector3 cameraRotation = new Vector3(60, 0, 0);
...@@ -549,102 +549,6 @@ public class Program : MonoBehaviour ...@@ -549,102 +549,6 @@ public class Program : MonoBehaviour
if (i == 15) continue; if (i == 15) continue;
rayFilter |= (int) Math.Pow(2, i); rayFilter |= (int) Math.Pow(2, i);
} }
if (camera_game_main == null) camera_game_main = main_camera;
camera_game_main.transform.position = new Vector3(0, 23, -23);
camera_game_main.transform.eulerAngles = new Vector3(60, 0, 0);
camera_game_main.transform.localScale = new Vector3(1, 1, 1);
camera_game_main.rect = new Rect(0, 0, 1, 1);
camera_game_main.depth = 0;
camera_game_main.gameObject.layer = 0;
camera_game_main.clearFlags = CameraClearFlags.Depth;
if (ui_back_ground_2d == null)
{
ui_back_ground_2d = create(mod_ui_2d);
camera_back_ground_2d = ui_back_ground_2d.transform.Find("Camera").GetComponent<Camera>();
}
camera_back_ground_2d.depth = -2;
ui_back_ground_2d.layer = 8;
ui_back_ground_2d.transform.Find("Camera").gameObject.layer = 8;
camera_back_ground_2d.cullingMask = (int) Mathf.Pow(2, 8);
camera_back_ground_2d.clearFlags = CameraClearFlags.Depth;
if (ui_container_3d == null)
{
ui_container_3d = create(mod_ui_3d);
camera_container_3d = ui_container_3d.transform.Find("Camera").GetComponent<Camera>();
}
camera_container_3d.depth = -1;
ui_container_3d.layer = 9;
ui_container_3d.transform.Find("Camera").gameObject.layer = 9;
camera_container_3d.cullingMask = (int) Mathf.Pow(2, 9);
camera_container_3d.fieldOfView = 75;
camera_container_3d.rect = camera_game_main.rect;
camera_container_3d.transform.position = new Vector3(0, 23, -23);
camera_container_3d.transform.eulerAngles = new Vector3(60, 0, 0);
camera_container_3d.transform.localScale = new Vector3(1, 1, 1);
camera_container_3d.rect = new Rect(0, 0, 1, 1);
camera_container_3d.clearFlags = CameraClearFlags.Depth;
if (ui_main_2d == null)
{
ui_main_2d = create(mod_ui_2d);
camera_main_2d = ui_main_2d.transform.Find("Camera").GetComponent<Camera>();
}
camera_main_2d.depth = 3;
ui_main_2d.layer = 11;
ui_main_2d.transform.Find("Camera").gameObject.layer = 11;
camera_main_2d.cullingMask = (int) Mathf.Pow(2, 11);
camera_main_2d.clearFlags = CameraClearFlags.Depth;
if (ui_windows_2d == null)
{
ui_windows_2d = create(mod_ui_2d);
camera_windows_2d = ui_windows_2d.transform.Find("Camera").GetComponent<Camera>();
}
camera_windows_2d.depth = 2;
ui_windows_2d.layer = 19;
ui_windows_2d.transform.Find("Camera").gameObject.layer = 19;
camera_windows_2d.cullingMask = (int) Mathf.Pow(2, 19);
camera_windows_2d.clearFlags = CameraClearFlags.Depth;
if (ui_main_3d == null)
{
ui_main_3d = create(mod_ui_3d);
camera_main_3d = ui_main_3d.transform.Find("Camera").GetComponent<Camera>();
}
camera_main_3d.depth = 1;
ui_main_3d.layer = 10;
ui_main_3d.transform.Find("Camera").gameObject.layer = 10;
camera_main_3d.cullingMask = (int) Mathf.Pow(2, 10);
camera_main_3d.fieldOfView = 75;
camera_main_3d.rect = new Rect(0, 0, 1, 1);
camera_main_3d.transform.position = new Vector3(0, 23, -23);
camera_main_3d.transform.eulerAngles = new Vector3(60, 0, 0);
camera_main_3d.transform.localScale = new Vector3(1, 1, 1);
camera_main_3d.clearFlags = CameraClearFlags.Depth;
camera_main_3d.transform.localPosition = camera_game_main.transform.position;
camera_container_3d.transform.localPosition = camera_game_main.transform.position;
camera_main_3d.transform.localEulerAngles = camera_game_main.transform.localEulerAngles;
camera_container_3d.transform.localEulerAngles = camera_game_main.transform.localEulerAngles;
camera_main_3d.fieldOfView = camera_game_main.fieldOfView;
camera_container_3d.fieldOfView = camera_game_main.fieldOfView;
camera_main_3d.rect = camera_game_main.rect;
camera_container_3d.rect = camera_game_main.rect;
} }
public static float deltaTime = 1f / 120f; public static float deltaTime = 1f / 120f;
...@@ -653,25 +557,26 @@ public class Program : MonoBehaviour ...@@ -653,25 +557,26 @@ public class Program : MonoBehaviour
{ {
deltaTime = Time.deltaTime; deltaTime = Time.deltaTime;
if (deltaTime > 1f / 40f) deltaTime = 1f / 40f; if (deltaTime > 1f / 40f) deltaTime = 1f / 40f;
if (camera_game_main != null) if (main_camera != null)
{ {
camera_game_main.transform.position += main_camera.transform.position +=
(cameraPosition - camera_game_main.transform.position) * deltaTime * 3.5f; (cameraPosition - main_camera.transform.position) * deltaTime * 3.5f;
camera_container_3d.transform.localPosition = camera_game_main.transform.position; camera_container_3d.transform.localPosition = main_camera.transform.position;
if (cameraFacing == false) if (cameraFacing == false)
camera_game_main.transform.localEulerAngles += main_camera.transform.localEulerAngles +=
(cameraRotation - camera_game_main.transform.localEulerAngles) * deltaTime * 3.5f; (cameraRotation - main_camera.transform.localEulerAngles) * deltaTime * 3.5f;
else else
camera_game_main.transform.LookAt(Vector3.zero); main_camera.transform.LookAt(Vector3.zero);
camera_container_3d.transform.localEulerAngles = camera_game_main.transform.localEulerAngles; camera_container_3d.transform.localEulerAngles = main_camera.transform.localEulerAngles;
camera_container_3d.fieldOfView = camera_game_main.fieldOfView; camera_container_3d.fieldOfView = main_camera.fieldOfView;
camera_container_3d.rect = camera_game_main.rect; camera_container_3d.rect = main_camera.rect;
} }
} }
public void fixScreenProblems() public void fixScreenProblems()
{ {
for (var i = 0; i < servants.Count; i++) servants[i].fixScreenProblem(); foreach (var t in servants)
t.fixScreenProblem();
} }
public GameObject create( public GameObject create(
...@@ -774,9 +679,9 @@ public class Program : MonoBehaviour ...@@ -774,9 +679,9 @@ public class Program : MonoBehaviour
var all = Screen.width / 2f; var all = Screen.width / 2f;
var it = xINscreen - Screen.width / 2f; var it = xINscreen - Screen.width / 2f;
var val = it / all; var val = it / all;
camera_game_main.rect = new Rect(val, 0, 1, 1); I().main_camera.rect = new Rect(val, 0, 1, 1);
camera_container_3d.rect = camera_game_main.rect; I().camera_container_3d.rect = I().main_camera.rect;
camera_main_3d.rect = camera_game_main.rect; I().camera_main_3d.rect = I().main_camera.rect;
} }
public static void ShiftUIenabled(GameObject ui, bool enabled) public static void ShiftUIenabled(GameObject ui, bool enabled)
......
...@@ -381,7 +381,7 @@ public class Room : WindowServantSP ...@@ -381,7 +381,7 @@ public class Room : WindowServantSP
int opResult = r.ReadByte(); int opResult = r.ReadByte();
Program.I().new_ui_handShower.GetComponent<handShower>().me = meResult - 1; Program.I().new_ui_handShower.GetComponent<handShower>().me = meResult - 1;
Program.I().new_ui_handShower.GetComponent<handShower>().op = opResult - 1; Program.I().new_ui_handShower.GetComponent<handShower>().op = opResult - 1;
handres = create(Program.I().new_ui_handShower, Vector3.zero, Vector3.zero, false, Program.ui_main_2d); handres = create(Program.I().new_ui_handShower, Vector3.zero, Vector3.zero, false, Program.I().ui_main_2d);
destroy(handres, 10f); destroy(handres, 10f);
animationTime = 1300; animationTime = 1300;
} }
...@@ -560,7 +560,7 @@ public class Room : WindowServantSP ...@@ -560,7 +560,7 @@ public class Room : WindowServantSP
if (Program.I().ocgcore.isShowed == false) if (Program.I().ocgcore.isShowed == false)
{ {
Program.camera_game_main.transform.position = new Vector3(0, 230, -230); Program.I().main_camera.transform.position = new Vector3(0, 230, -230);
if (mode != 2) if (mode != 2)
{ {
if (selftype == 1) if (selftype == 1)
......
...@@ -118,7 +118,7 @@ public class Servant ...@@ -118,7 +118,7 @@ public class Servant
if (toolBar != null) if (toolBar != null)
{ {
var vectorOfShowedBar_Screen = new Vector3(Screen.width - RightToScreen, buttomToScreen, 0); var vectorOfShowedBar_Screen = new Vector3(Screen.width - RightToScreen, buttomToScreen, 0);
iTween.MoveTo(toolBar, Program.camera_back_ground_2d.ScreenToWorldPoint(vectorOfShowedBar_Screen), 0.6f); iTween.MoveTo(toolBar, Program.I().camera_back_ground_2d.ScreenToWorldPoint(vectorOfShowedBar_Screen), 0.6f);
toolBar.transform.localScale = toolBar.transform.localScale =
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f); new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f);
var items = toolBar.GetComponentsInChildren<toolShift>(); var items = toolBar.GetComponentsInChildren<toolShift>();
...@@ -131,7 +131,7 @@ public class Servant ...@@ -131,7 +131,7 @@ public class Servant
if (toolBar != null) if (toolBar != null)
{ {
var vectorOfHidedBar_Screen = new Vector3(Screen.width - RightToScreen, -100, 0); var vectorOfHidedBar_Screen = new Vector3(Screen.width - RightToScreen, -100, 0);
iTween.MoveTo(toolBar, Program.camera_back_ground_2d.ScreenToWorldPoint(vectorOfHidedBar_Screen), 0.6f); iTween.MoveTo(toolBar, Program.I().camera_back_ground_2d.ScreenToWorldPoint(vectorOfHidedBar_Screen), 0.6f);
toolBar.transform.localScale = toolBar.transform.localScale =
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f); new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f);
var items = toolBar.GetComponentsInChildren<toolShift>(); var items = toolBar.GetComponentsInChildren<toolShift>();
...@@ -255,10 +255,10 @@ public class Servant ...@@ -255,10 +255,10 @@ public class Servant
toolBar = create toolBar = create
( (
mod, mod,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - RightToScreen, -100, 0)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - RightToScreen, -100, 0)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
false, false,
Program.ui_main_2d Program.I().ui_main_2d
); );
UIHelper.InterGameObject(toolBar); UIHelper.InterGameObject(toolBar);
fixScreenProblem(); fixScreenProblem();
...@@ -287,7 +287,7 @@ public class Servant ...@@ -287,7 +287,7 @@ public class Servant
{ {
if (Program.I().ocgcore.isShowed || Program.I().deckManager.isShowed) if (Program.I().ocgcore.isShowed || Program.I().deckManager.isShowed)
{ {
var screenP = Program.camera_game_main.WorldToScreenPoint(Vector3.zero); var screenP = Program.I().main_camera.WorldToScreenPoint(Vector3.zero);
screenP.z = 0; screenP.z = 0;
if (fix) if (fix)
{ {
...@@ -295,10 +295,10 @@ public class Servant ...@@ -295,10 +295,10 @@ public class Servant
if (screenP.y < 350f) screenP.y = 350f; if (screenP.y < 350f) screenP.y = 350f;
} }
return Program.camera_main_2d.ScreenToWorldPoint(screenP); return Program.I().camera_main_2d.ScreenToWorldPoint(screenP);
} }
return Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0)); return Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0));
} }
private Vector3 MSentre() private Vector3 MSentre()
...@@ -306,19 +306,19 @@ public class Servant ...@@ -306,19 +306,19 @@ public class Servant
if (Program.I().ocgcore.isShowed) if (Program.I().ocgcore.isShowed)
{ {
var real = (Program.fieldSize - 1) * 0.9f + 1f; var real = (Program.fieldSize - 1) * 0.9f + 1f;
var screenP = Program.camera_game_main.WorldToScreenPoint(new Vector3(0, 0, -5.65f * real)); var screenP = Program.I().main_camera.WorldToScreenPoint(new Vector3(0, 0, -5.65f * real));
screenP.z = 0; screenP.z = 0;
return Program.camera_main_2d.ScreenToWorldPoint(screenP); return Program.I().camera_main_2d.ScreenToWorldPoint(screenP);
} }
if (Program.I().deckManager.isShowed) if (Program.I().deckManager.isShowed)
{ {
var screenP = Program.camera_game_main.WorldToScreenPoint(Vector3.zero); var screenP = Program.I().main_camera.WorldToScreenPoint(Vector3.zero);
screenP.z = 0; screenP.z = 0;
return Program.camera_main_2d.ScreenToWorldPoint(screenP); return Program.I().camera_main_2d.ScreenToWorldPoint(screenP);
} }
return Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0)); return Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0));
} }
private enum messageSystemType private enum messageSystemType
...@@ -438,7 +438,7 @@ public class Servant ...@@ -438,7 +438,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -458,7 +458,7 @@ public class Servant ...@@ -458,7 +458,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -479,7 +479,7 @@ public class Servant ...@@ -479,7 +479,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -510,7 +510,7 @@ public class Servant ...@@ -510,7 +510,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -531,7 +531,7 @@ public class Servant ...@@ -531,7 +531,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -553,7 +553,7 @@ public class Servant ...@@ -553,7 +553,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -594,7 +594,7 @@ public class Servant ...@@ -594,7 +594,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -633,7 +633,7 @@ public class Servant ...@@ -633,7 +633,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -674,7 +674,7 @@ public class Servant ...@@ -674,7 +674,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -695,7 +695,7 @@ public class Servant ...@@ -695,7 +695,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
...@@ -722,7 +722,7 @@ public class Servant ...@@ -722,7 +722,7 @@ public class Servant
MSentre(), MSentre(),
Vector3.zero, Vector3.zero,
true, true,
Program.ui_main_2d, Program.I().ui_main_2d,
true, true,
new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f) new Vector3(Screen.height / 700f, Screen.height / 700f, Screen.height / 700f)
); );
......
...@@ -8,7 +8,7 @@ public class WindowServant2D : Servant ...@@ -8,7 +8,7 @@ public class WindowServant2D : Servant
{ {
UIHelper.clearITWeen(gameObject); UIHelper.clearITWeen(gameObject);
iTween.MoveTo(gameObject, iTween.MoveTo(gameObject,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 0)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 0)),
0.6f); 0.6f);
} }
} }
...@@ -19,20 +19,20 @@ public class WindowServant2D : Servant ...@@ -19,20 +19,20 @@ public class WindowServant2D : Servant
{ {
UIHelper.clearITWeen(gameObject); UIHelper.clearITWeen(gameObject);
iTween.MoveTo(gameObject, iTween.MoveTo(gameObject,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0)), 0.6f); Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0)), 0.6f);
} }
} }
public override void hide() public override void hide()
{ {
base.hide(); base.hide();
Program.ShiftUIenabled(Program.ui_main_3d, true); Program.ShiftUIenabled(Program.I().ui_main_3d, true);
} }
public override void show() public override void show()
{ {
base.show(); base.show();
Program.ShiftUIenabled(Program.ui_main_3d, false); Program.ShiftUIenabled(Program.I().ui_main_3d, false);
} }
public static GameObject createWindow(Servant servant, GameObject mod) public static GameObject createWindow(Servant servant, GameObject mod)
...@@ -40,10 +40,10 @@ public class WindowServant2D : Servant ...@@ -40,10 +40,10 @@ public class WindowServant2D : Servant
var re = servant.create var re = servant.create
( (
mod, mod,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 600)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 600)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
false, false,
Program.ui_main_2d Program.I().ui_main_2d
); );
UIHelper.InterGameObject(re); UIHelper.InterGameObject(re);
return re; return re;
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
// public override void hide() // public override void hide()
// { // {
// base.hide(); // base.hide();
// Program.shiftCameraPan(Program.camera_main_3d, false); // Program.shiftCameraPan(Program.I().camera_main_3d, false);
// } // }
// public override void show() // public override void show()
// { // {
// base.show(); // base.show();
// Program.shiftCameraPan(Program.camera_main_3d, true); // Program.shiftCameraPan(Program.I().camera_main_3d, true);
// } // }
// public override void applyHideArrangement() // public override void applyHideArrangement()
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
// private void killani() // private void killani()
// { // {
// gameObject.transform.localPosition = Program.camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 1000)); // gameObject.transform.localPosition = Program.I().camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 1000));
// } // }
// public override void applyShowArrangement() // public override void applyShowArrangement()
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
// } // }
// panelKIller.set(true); // panelKIller.set(true);
// Program.notGo(killani); // Program.notGo(killani);
// gameObject.transform.localPosition = Program.camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 500)); // gameObject.transform.localPosition = Program.I().camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 500));
// } // }
// } // }
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
// GameObject re = servant.create // GameObject re = servant.create
// ( // (
// mod, // mod,
// Program.camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 600)), // Program.I().camera_main_3d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 600)),
// new Vector3(60, 0, 0), // new Vector3(60, 0, 0),
// false, // false,
// Program.ui_main_3d // Program.I().ui_main_3d
// ); // );
// UIHelper.InterGameObject(re); // UIHelper.InterGameObject(re);
// return re; // return re;
......
...@@ -86,7 +86,7 @@ public class WindowServantSP : Servant ...@@ -86,7 +86,7 @@ public class WindowServantSP : Servant
Vector3.zero, Vector3.zero,
Vector3.zero, Vector3.zero,
false, false,
Program.ui_windows_2d Program.I().ui_windows_2d
); );
UIHelper.InterGameObject(gameObject); UIHelper.InterGameObject(gameObject);
var v = new Vector3(); var v = new Vector3();
......
...@@ -42,11 +42,11 @@ public class DeckManager : ServantWithCardDescription ...@@ -42,11 +42,11 @@ public class DeckManager : ServantWithCardDescription
public override void show() public override void show()
{ {
base.show(); base.show();
Program.camera_game_main.transform.position = new Vector3(0, 35, 0); Program.I().main_camera.transform.position = new Vector3(0, 35, 0);
Program.camera_game_main.transform.localEulerAngles = new Vector3(90, 0, 0); Program.I().main_camera.transform.localEulerAngles = new Vector3(90, 0, 0);
cameraAngle = 90; cameraAngle = 90;
Program.cameraFacing = true; Program.cameraFacing = true;
Program.cameraPosition = Program.camera_game_main.transform.position; Program.cameraPosition = Program.I().main_camera.transform.position;
camrem(); camrem();
Program.I().light.transform.eulerAngles = new Vector3(50, 0, 0); Program.I().light.transform.eulerAngles = new Vector3(50, 0, 0);
gameObjectDesk = create_s(Program.I().new_mod_tableInDeckManager); gameObjectDesk = create_s(Program.I().new_mod_tableInDeckManager);
...@@ -747,18 +747,18 @@ public class DeckManager : ServantWithCardDescription ...@@ -747,18 +747,18 @@ public class DeckManager : ServantWithCardDescription
gameObjectSearch = create gameObjectSearch = create
( (
Program.I().new_ui_search, Program.I().new_ui_search,
Program.camera_back_ground_2d.ScreenToWorldPoint(new Vector3(Screen.width + 600, Screen.height / 2, 600)), Program.I().camera_back_ground_2d.ScreenToWorldPoint(new Vector3(Screen.width + 600, Screen.height / 2, 600)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
false, false,
Program.ui_back_ground_2d Program.I().ui_back_ground_2d
); );
gameObjectDetailedSearch = create gameObjectDetailedSearch = create
( (
Program.I().new_ui_searchDetailed, Program.I().new_ui_searchDetailed,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height * 2f, 0)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height * 2f, 0)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
false, false,
Program.ui_main_2d Program.I().ui_main_2d
); );
UIHelper.InterGameObject(gameObjectSearch); UIHelper.InterGameObject(gameObjectSearch);
UIHelper.InterGameObject(gameObjectDetailedSearch); UIHelper.InterGameObject(gameObjectDetailedSearch);
...@@ -822,7 +822,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -822,7 +822,7 @@ public class DeckManager : ServantWithCardDescription
{ {
GameObject returnValue = null; GameObject returnValue = null;
returnValue = create(Program.I().new_ui_cardOnSearchList, Vector3.zero, Vector3.zero, false, returnValue = create(Program.I().new_ui_cardOnSearchList, Vector3.zero, Vector3.zero, false,
Program.ui_back_ground_2d); Program.I().ui_back_ground_2d);
UIHelper.getRealEventGameObject(returnValue).name = Args[0]; UIHelper.getRealEventGameObject(returnValue).name = Args[0];
UIHelper.trySetLableText(returnValue, Args[2]); UIHelper.trySetLableText(returnValue, Args[2]);
var cardPicLoader_ = UIHelper.getRealEventGameObject(returnValue).AddComponent<cardPicLoader>(); var cardPicLoader_ = UIHelper.getRealEventGameObject(returnValue).AddComponent<cardPicLoader>();
...@@ -839,7 +839,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -839,7 +839,7 @@ public class DeckManager : ServantWithCardDescription
base.applyHideArrangement(); base.applyHideArrangement();
Program.cameraFacing = false; Program.cameraFacing = false;
iTween.MoveTo(gameObjectSearch, iTween.MoveTo(gameObjectSearch,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width + 600, Screen.height / 2, 600)), 1.2f); Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width + 600, Screen.height / 2, 600)), 1.2f);
refreshDetail(); refreshDetail();
} }
...@@ -850,7 +850,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -850,7 +850,7 @@ public class DeckManager : ServantWithCardDescription
var tex = UIHelper.getByName<UITexture>(gameObjectSearch, "under_"); var tex = UIHelper.getByName<UITexture>(gameObjectSearch, "under_");
tex.height = Screen.height; tex.height = Screen.height;
iTween.MoveTo(gameObjectSearch, iTween.MoveTo(gameObjectSearch,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - tex.width / 2, Screen.height / 2, 0)), Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - tex.width / 2, Screen.height / 2, 0)),
1.2f); 1.2f);
refreshDetail(); refreshDetail();
} }
...@@ -866,7 +866,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -866,7 +866,7 @@ public class DeckManager : ServantWithCardDescription
switch (condition) switch (condition)
{ {
case Condition.editDeck: case Condition.editDeck:
UIHelper.setParent(gameObjectSearch, Program.ui_back_ground_2d); UIHelper.setParent(gameObjectSearch, Program.I().ui_back_ground_2d);
SetBar(Program.I().new_bar_editDeck, 0, 230); SetBar(Program.I().new_bar_editDeck, 0, 230);
UIPopupList_banlist = UIHelper.getByName<UIPopupList>(toolBar, "lfList_"); UIPopupList_banlist = UIHelper.getByName<UIPopupList>(toolBar, "lfList_");
var banlistNames = BanlistManager.getAllName(); var banlistNames = BanlistManager.getAllName();
...@@ -882,7 +882,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -882,7 +882,7 @@ public class DeckManager : ServantWithCardDescription
UIHelper.registEvent(toolBar, "copy_", onCopy); UIHelper.registEvent(toolBar, "copy_", onCopy);
break; break;
case Condition.changeSide: case Condition.changeSide:
UIHelper.setParent(gameObjectSearch, Program.ui_main_2d); UIHelper.setParent(gameObjectSearch, Program.I().ui_main_2d);
SetBar(Program.I().new_bar_changeSide, 0, 230); SetBar(Program.I().new_bar_changeSide, 0, 230);
UIPopupList_banlist = null; UIPopupList_banlist = null;
UIHelper.registEvent(toolBar, "rand_", rand); UIHelper.registEvent(toolBar, "rand_", rand);
...@@ -1069,7 +1069,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1069,7 +1069,7 @@ public class DeckManager : ServantWithCardDescription
{ {
gameObjectDetailedSearch.GetComponent<UITexture>().height = 700; gameObjectDetailedSearch.GetComponent<UITexture>().height = 700;
iTween.MoveTo(gameObjectDetailedSearch, iTween.MoveTo(gameObjectDetailedSearch,
Program.camera_main_2d.ScreenToWorldPoint( Program.I().camera_main_2d.ScreenToWorldPoint(
new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 0.5f, 0)), new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 0.5f, 0)),
0.6f); 0.6f);
reShowBar(0, 230 + 230 * Screen.height / 700f); reShowBar(0, 230 + 230 * Screen.height / 700f);
...@@ -1078,7 +1078,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1078,7 +1078,7 @@ public class DeckManager : ServantWithCardDescription
{ {
gameObjectDetailedSearch.GetComponent<UITexture>().height = 700; gameObjectDetailedSearch.GetComponent<UITexture>().height = 700;
iTween.MoveTo(gameObjectDetailedSearch, iTween.MoveTo(gameObjectDetailedSearch,
Program.camera_main_2d.ScreenToWorldPoint( Program.I().camera_main_2d.ScreenToWorldPoint(
new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 1.5f, 0)), new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 1.5f, 0)),
0.6f); 0.6f);
reShowBar(0, 230); reShowBar(0, 230);
...@@ -1091,7 +1091,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1091,7 +1091,7 @@ public class DeckManager : ServantWithCardDescription
{ {
gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height; gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height;
iTween.MoveTo(gameObjectDetailedSearch, iTween.MoveTo(gameObjectDetailedSearch,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f, Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f,
Screen.height * 0.5f, 0)), 0.6f); Screen.height * 0.5f, 0)), 0.6f);
reShowBar(0, 460); reShowBar(0, 460);
} }
...@@ -1099,7 +1099,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1099,7 +1099,7 @@ public class DeckManager : ServantWithCardDescription
{ {
gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height; gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height;
iTween.MoveTo(gameObjectDetailedSearch, iTween.MoveTo(gameObjectDetailedSearch,
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f, Program.I().camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f,
Screen.height * 1.5f, 0)), 0.6f); Screen.height * 1.5f, 0)), 0.6f);
reShowBar(0, 230); reShowBar(0, 230);
} }
......
...@@ -13,7 +13,7 @@ OcclusionCullingSettings: ...@@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2 --- !u!104 &2
RenderSettings: RenderSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 8 serializedVersion: 9
m_Fog: 0 m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3 m_FogMode: 3
...@@ -38,31 +38,31 @@ RenderSettings: ...@@ -38,31 +38,31 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.43667546, g: 0.48427135, b: 0.5645225, a: 1} m_IndirectSpecularColor: {r: 0.43667555, g: 0.48427176, b: 0.56452405, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4 --- !u!157 &4
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 9 serializedVersion: 12
m_GIWorkflowMode: 0 m_GIWorkflowMode: 0
m_GISettings: m_GISettings:
serializedVersion: 2 serializedVersion: 2
m_BounceScale: 1 m_BounceScale: 1
m_IndirectOutputScale: 1 m_IndirectOutputScale: 1
m_AlbedoBoost: 1 m_AlbedoBoost: 1
m_TemporalCoherenceThreshold: 1
m_EnvironmentLightingMode: 0 m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1 m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1 m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings: m_LightmapEditorSettings:
serializedVersion: 8 serializedVersion: 12
m_Resolution: 2 m_Resolution: 2
m_BakeResolution: 40 m_BakeResolution: 40
m_TextureWidth: 1024 m_AtlasSize: 1024
m_TextureHeight: 1024
m_AO: 0 m_AO: 0
m_AOMaxDistance: 1 m_AOMaxDistance: 1
m_CompAOExponent: 0 m_CompAOExponent: 0
m_CompAOExponentDirect: 0 m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2 m_Padding: 2
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1 m_LightmapsBakeMode: 1
...@@ -77,10 +77,16 @@ LightmapSettings: ...@@ -77,10 +77,16 @@ LightmapSettings:
m_PVRDirectSampleCount: 32 m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500 m_PVRSampleCount: 500
m_PVRBounces: 2 m_PVRBounces: 2
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 0
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0 m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0 m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 0 m_PVREnvironmentMIS: 0
m_PVRCulling: 1 m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusIndirect: 5
...@@ -88,8 +94,11 @@ LightmapSettings: ...@@ -88,8 +94,11 @@ LightmapSettings:
m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 0}
m_ShadowMaskMode: 2 m_LightingSettings: {fileID: 221277033}
--- !u!196 &5 --- !u!196 &5
NavMeshSettings: NavMeshSettings:
serializedVersion: 2 serializedVersion: 2
...@@ -109,13 +118,85 @@ NavMeshSettings: ...@@ -109,13 +118,85 @@ NavMeshSettings:
manualTileSize: 0 manualTileSize: 0
tileSize: 256 tileSize: 256
accuratePlacement: 0 accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!20 &28483481 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 1360968357697421714}
m_PrefabAsset: {fileID: 0}
--- !u!850595691 &221277033
LightingSettings:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Settings.lighting
serializedVersion: 3
m_GIWorkflowMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_BakeBackend: 0
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_TextureCompression: 1
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 0
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 1
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 1024
m_FinalGatherFiltering: 1
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVREnvironmentSampleCount: 500
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 0
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRDenoiserTypeAO: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
--- !u!1 &251477558 --- !u!1 &251477558
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
serializedVersion: 5 m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 251477560} - component: {fileID: 251477560}
- component: {fileID: 251477559} - component: {fileID: 251477559}
...@@ -129,8 +210,9 @@ GameObject: ...@@ -129,8 +210,9 @@ GameObject:
--- !u!82 &251477559 --- !u!82 &251477559
AudioSource: AudioSource:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 251477558} m_GameObject: {fileID: 251477558}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 4 serializedVersion: 4
...@@ -155,62 +237,78 @@ AudioSource: ...@@ -155,62 +237,78 @@ AudioSource:
rolloffCustomCurve: rolloffCustomCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 2 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 1
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- serializedVersion: 2 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1 time: 1
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
panLevelCustomCurve: panLevelCustomCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 2 - serializedVersion: 3
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
spreadCustomCurve: spreadCustomCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 2 - serializedVersion: 3
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
reverbZoneMixCustomCurve: reverbZoneMixCustomCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- serializedVersion: 2 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 1
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
--- !u!4 &251477560 --- !u!4 &251477560
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 251477558} m_GameObject: {fileID: 251477558}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
...@@ -219,12 +317,19 @@ Transform: ...@@ -219,12 +317,19 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &266211071 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5,
type: 3}
m_PrefabInstance: {fileID: 1655039121}
m_PrefabAsset: {fileID: 0}
--- !u!1 &274446996 --- !u!1 &274446996
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
serializedVersion: 5 m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 274446998} - component: {fileID: 274446998}
- component: {fileID: 274446997} - component: {fileID: 274446997}
...@@ -238,16 +343,19 @@ GameObject: ...@@ -238,16 +343,19 @@ GameObject:
--- !u!108 &274446997 --- !u!108 &274446997
Light: Light:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274446996} m_GameObject: {fileID: 274446996}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 8 serializedVersion: 10
m_Type: 1 m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 10 m_Range: 10
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize: 10
m_Shadows: m_Shadows:
m_Type: 2 m_Type: 2
...@@ -257,6 +365,24 @@ Light: ...@@ -257,6 +365,24 @@ Light:
m_Bias: 0.05 m_Bias: 0.05
m_NormalBias: 0.4 m_NormalBias: 0.4
m_NearPlane: 0.2 m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0} m_Cookie: {fileID: 0}
m_DrawHalo: 0 m_DrawHalo: 0
m_Flare: {fileID: 0} m_Flare: {fileID: 0}
...@@ -264,18 +390,24 @@ Light: ...@@ -264,18 +390,24 @@ Light:
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4 m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1} m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1 m_BounceIntensity: 1
m_ColorTemperature: 6570 m_ColorTemperature: 6570
m_UseColorTemperature: 0 m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0 m_ShadowRadius: 0
m_ShadowAngle: 0 m_ShadowAngle: 0
--- !u!4 &274446998 --- !u!4 &274446998
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274446996} m_GameObject: {fileID: 274446996}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 20, z: 0} m_LocalPosition: {x: 0, y: 20, z: 0}
...@@ -284,495 +416,313 @@ Transform: ...@@ -284,495 +416,313 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1237806114 --- !u!1 &737802519 stripped
Prefab: GameObject:
m_CorrespondingSourceObject: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 1360968357697421714}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &826725925
PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Name
value: ui_main_2d
objectReference: {fileID: 0}
- target: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Layer
value: 11
objectReference: {fileID: 0}
- target: {fileID: 142116, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Layer
value: 11
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Depth
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 2048
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
--- !u!1 &826725926 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 826725925}
m_PrefabAsset: {fileID: 0}
--- !u!20 &826725927 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 826725925}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &863808012
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 190650, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Name
value: ui_main_3d
objectReference: {fileID: 0}
- target: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_RootOrder propertyPath: m_LocalRotation.x
value: 2 value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 137784, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.y
value: 23
objectReference: {fileID: 0}
- target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.z
value: -23
objectReference: {fileID: 0}
- target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: field of view
value: 75
objectReference: {fileID: 0}
- target: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 1024
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
--- !u!1 &863808013 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5,
type: 3}
m_PrefabInstance: {fileID: 863808012}
m_PrefabAsset: {fileID: 0}
--- !u!20 &863808014 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5,
type: 3}
m_PrefabInstance: {fileID: 863808012}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1237806114
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 137784, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Program value: Program
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: main_camera propertyPath: m_RootOrder
value: value: 2
objectReference: {fileID: 1534402469}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: nem_ui_menu propertyPath: m_LocalPosition.x
value: value: 0
objectReference: {fileID: 165656, guid: fae4cfbce28452640b604b896612cf1c, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_menu propertyPath: m_LocalPosition.y
value: value: 0
objectReference: {fileID: 167656, guid: 4e3c1289cf09fad40bde488731159a6a, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_setting propertyPath: m_LocalPosition.z
value: value: 0
objectReference: {fileID: 133012, guid: b1ec81ad075831c4da5c2baaaa65594b, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_selectDeck propertyPath: m_LocalRotation.w
value:
objectReference: {fileID: 130306, guid: 3f3413f157dbbca4ab323edf4c8d9038, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_roomTag
value:
objectReference: {fileID: 122496, guid: d9283ce25ce3e5c4080c427436ecc99f, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_hint
value:
objectReference: {fileID: 136706, guid: fc44d419e3659744390a8324350ea4a4, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_selectWindow
value:
objectReference: {fileID: 182546, guid: 3fd45a06851078f45ab553571c7afcea, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_singleOption
value:
objectReference: {fileID: 155626, guid: 648ac3c45eefd0144824a494eec5657a, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_multipleOption
value:
objectReference: {fileID: 130128, guid: 08dba45da45e70040b801cbabd7068e7, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_inputWindow
value:
objectReference: {fileID: 132680, guid: 7e363280ac8352049b4e4c3272e07cb6, type: 2}
- target: {fileID: 137784, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_selectDeckOnList propertyPath: m_LocalRotation.x
value: value: 0
objectReference: {fileID: 103724, guid: 55b086a9c1307904685f5979547a2d61, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_cardDescription propertyPath: m_LocalRotation.y
value: value: 0
objectReference: {fileID: 194658, guid: dd57848b7cec7c441b1e5e16bfaf237f, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_cardOnSearchList propertyPath: m_LocalRotation.z
value: value: 0
objectReference: {fileID: 121738, guid: 2b6ccbb323c719640a5956255df6e60f, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_search propertyPath: m_LocalEulerAnglesHint.x
value: value: 0
objectReference: {fileID: 175576, guid: 589b9f7f12556814fb7cc2371ef35649, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_ui_searchDetailed propertyPath: m_LocalEulerAnglesHint.y
value: value: 0
objectReference: {fileID: 108072, guid: 78d905a01dddef64b9cb440dc62b50a9, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 431276, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_bar_changeSide propertyPath: m_LocalEulerAnglesHint.z
value: value: 0
objectReference: {fileID: 122638, guid: 63e044f7c8ec2f941bdf744dfc74c476, type: 2} objectReference: {fileID: 0}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: new_bar_duel
value:
objectReference: {fileID: 123392, guid: 829bf6713f5afeb40840803e21e03092, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_bar_editDeck
value:
objectReference: {fileID: 178988, guid: 765dbdb0e4818974a91597f4abb24ee1, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_bar_watchDuel
value:
objectReference: {fileID: 117332, guid: c31923f847d652f428563c70ae9126c0, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_bar_watchRecord
value:
objectReference: {fileID: 101550, guid: c2bfacfbd9e90a145a2e44e65731cecf, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_gameInfo
value:
objectReference: {fileID: 139962, guid: 0f5784805788a664da2c92f42ec39685, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_mod_cardInDeckManager
value:
objectReference: {fileID: 189694, guid: 6747c695cb6d93142b1f445a7896ea98, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_mod_tableInDeckManager
value:
objectReference: {fileID: 124102, guid: 19e5c6880e40e3a4183c21c56af33744, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_selectServer
value:
objectReference: {fileID: 165948, guid: 66c270580b57825498511f78f7bc78bb, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_faceShower
value:
objectReference: {fileID: 177542, guid: b95df28529e1a6745bc96e720b1dbc53, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: face
value:
objectReference: {fileID: 11468716, guid: faf0ce5c46e971049a20f2597b5f6194,
type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_serverOnList
value:
objectReference: {fileID: 155522, guid: 80fabd717ba003c40aad8c7848312894, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_selectDeckOnRoomList
value:
objectReference: {fileID: 181946, guid: 4e4bf400588fabf4b9c275d9d566f460, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_room
value:
objectReference: {fileID: 176292, guid: 2276c0ccec681fe4e9dc462af1e50f05, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_selectTp
value:
objectReference: {fileID: 185980, guid: 24d3e49302334614c9fa8d1383eb5fbd, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_handShower
value:
objectReference: {fileID: 124728, guid: dfb4acd85c948fa44975eab80c157b45, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_book
value:
objectReference: {fileID: 154202, guid: 26b8ac8b01eea214c9aa2dda03224bf8, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_selectReplayOnList
value:
objectReference: {fileID: 192938, guid: 7bc321f75c5fa2f468fe453947b6f8ec, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ocgcore_field
value:
objectReference: {fileID: 110048, guid: b1633e26122bb4749a19a5c38826336b, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_textMesh
value:
objectReference: {fileID: 141456, guid: f2d3ae60f92063649838be32d3c95bcf, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ss_dark_hole
value:
objectReference: {fileID: 170424, guid: b8fc61e501987aa4d836d532a2003eaf, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_selectPosition
value:
objectReference: {fileID: 192730, guid: d1ab3a754f38fe94db06f9cba559bd58, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ocgcore_wait
value:
objectReference: {fileID: 192526, guid: ebe9fe8493cc48b4d8fc206976a5e897, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_superButton
value:
objectReference: {fileID: 175034, guid: d0dca316780477b4fab4ba9122bdbc5e, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: light
value:
objectReference: {fileID: 274446997}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_aiRoom
value:
objectReference: {fileID: 137880, guid: eaffbd8c582dbcb4b82ee73629e34013, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_bs_atk_decoration
value:
objectReference: {fileID: 175090, guid: a3ab6c7363ebb2244958942a1cc2d847, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_bs_atk_sign
value:
objectReference: {fileID: 132788, guid: 447e9897cded44e4491e769e379fbb50, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_mouse
value:
objectReference: {fileID: 136044, guid: 19638d3f760fa38429c40cca2b503881, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_selectDeck_sort
value:
objectReference: {fileID: 130306, guid: 6778e4ccca27e0b44a662487e125b9d0, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_selectWindowSmall
value:
objectReference: {fileID: 134802, guid: bcd8610a6119a7442bdb20fee4844424, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_msg_singleOptionSmall
value:
objectReference: {fileID: 120970, guid: cb52500c77e43054aa4db0ca4f7890e4, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: field
value:
objectReference: {fileID: 2800000, guid: 7a61dbe90e9d4544a987801d1bb8a823, type: 3}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_superButtonTransparent
value:
objectReference: {fileID: 175034, guid: 1a9f43e6666f73d499018b0bc50fa87f, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_selection
value:
objectReference: {fileID: 109442, guid: e2eaaba2f256356478626798dd6ff33d, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_deckManager
value:
objectReference: {fileID: 175342, guid: e0266c76a82b162439c48c7fe64921ab, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_input
value:
objectReference: {fileID: 169056, guid: dd31e15b57e5f354e94eb55af88bdaae, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_1
value:
objectReference: {fileID: 152348, guid: 49504cab875642a4a89768cf637df4e0, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_2
value:
objectReference: {fileID: 125396, guid: c5cf793ce3857464eafa8aa15c1cfc06, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_3cancle
value:
objectReference: {fileID: 136638, guid: b40821dc1a2e1374981ee75e4c966c3f, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_3see
value:
objectReference: {fileID: 115232, guid: 3b9b335956deb544091a15596ede68ac, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_Single_multiple_window
value:
objectReference: {fileID: 124974, guid: 973d36324e25edb4e937f0d46b67d978, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_multiple_option
value:
objectReference: {fileID: 160692, guid: 2f2ccdda83cade9439f7a615e3943a17, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_Single_option
value:
objectReference: {fileID: 140558, guid: c67c5053dc1b3c14db4efc960bc8f57c, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_position
value:
objectReference: {fileID: 197414, guid: ebf9fc604e38b7348be638f5deaa91db, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_Tp
value:
objectReference: {fileID: 139314, guid: 3cafe5fcc84bd994cb64aaf0fc2b4ec6, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_Face
value:
objectReference: {fileID: 195852, guid: b8748dafca1e28c4d9e882fb8b3ff68b, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_puzzleManager
value:
objectReference: {fileID: 186134, guid: 888e20adbca53df4cb24411246bb1b11, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_replayManager
value:
objectReference: {fileID: 197804, guid: 0ba65c521a7de0d46a9e31380654c3b4, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_tagRoom
value:
objectReference: {fileID: 154246, guid: 95580b5915bf1eb4eaf9b6b19a82f92d, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_bar_room
value:
objectReference: {fileID: 154124, guid: 4450e27d91ca638499a5b7792d561372, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: remaster_room
value:
objectReference: {fileID: 154246, guid: fa04b5d4defb9284aa6b679865c5b9f1, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_FS
value:
objectReference: {fileID: 150976, guid: e371745b12d178b4ebe42e879820c9bb, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_2big
value:
objectReference: {fileID: 115232, guid: 3b9b335956deb544091a15596ede68ac, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_dark
value:
objectReference: {fileID: 177540, guid: f8c81e2a945e8684185b6651939f9fff, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_earth
value:
objectReference: {fileID: 198160, guid: 0bf96b39484b0c84882da34e17130819, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_fire
value:
objectReference: {fileID: 106852, guid: 694d7f4e1b6aae34d9a75a59d952582a, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_light
value:
objectReference: {fileID: 161610, guid: 38661326c4038fd488de6981c1d31186, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_water
value:
objectReference: {fileID: 126488, guid: 3dad3d277b4f1b44caa32fdf134d60dd, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_ol_wind
value:
objectReference: {fileID: 178198, guid: 127e39fbba512d546a78ebb15efcfa59, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_2Force
value:
objectReference: {fileID: 125396, guid: f687813851d9d9548b710c198d84db01, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_1Force
value:
objectReference: {fileID: 159576, guid: 51ebb42d1f03f2548a1d248d1cf79c91, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ocgcore_chainCircle
value:
objectReference: {fileID: 139058, guid: d32a4ff301257644a9d5e19d14ba7010, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_earth
value:
objectReference: {fileID: 188516, guid: 403bf6eadecab084d837692d99aa1726, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_water
value:
objectReference: {fileID: 188516, guid: b047e754820a2474b96b2dfee7860503, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_fire
value:
objectReference: {fileID: 188516, guid: bae56cf07e83c1149880df9ed7dadd83, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_wind
value:
objectReference: {fileID: 188516, guid: c3852330021b739439c28049b6fb2763, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_light
value:
objectReference: {fileID: 188516, guid: c837d314ee4b9db45a738925e4159c9f, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: mod_ocgcore_cs_mon_dark
value:
objectReference: {fileID: 188516, guid: 204f43277a3085942a86f7275acc0177, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: Pro1_CardShower
value:
objectReference: {fileID: 166874, guid: 7b9a1520ac854164d80116f4c9cd49f4, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: New_arrow
value:
objectReference: {fileID: 139724, guid: 65847fa9d4d916b4993e5b907ab5262f, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: New_selectKuang
value:
objectReference: {fileID: 161760, guid: f72715be2fc64e64a98ae2101b915fd1, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: New_chainKuang
value:
objectReference: {fileID: 123774, guid: 00f2b7eecbee10a4b8c086ed3d7dc683, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: New_phase
value:
objectReference: {fileID: 108702, guid: 1150c172f7a9d634a824727a558df871, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: Pro1_superCardShower
value:
objectReference: {fileID: 166874, guid: 9c687fe8a2487c34a857f20d148bce8e, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: Pro1_superCardShowerA
value:
objectReference: {fileID: 166874, guid: ed7ee42be6f2d9742ab3af7f921085ad, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: audio propertyPath: audio
value: value:
objectReference: {fileID: 251477559} objectReference: {fileID: 251477559}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: dididi propertyPath: light
value:
objectReference: {fileID: 8300000, guid: 4ecb26c462ed72b4dbfba168ff91e2fa, type: 3}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: zhankai
value: value:
objectReference: {fileID: 8300000, guid: cab912f3009b43843b0a48ac3120c6ad, type: 3} objectReference: {fileID: 274446997}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: beep propertyPath: ui_main_2d
value: value:
objectReference: {fileID: 8300000, guid: be20fa32fcc80b64bb25b987f230f812, type: 3} objectReference: {fileID: 826725926}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: New_decker propertyPath: ui_main_3d
value: value:
objectReference: {fileID: 156862, guid: 7b12ea4fd69f4184b97c15f847459773, type: 2} objectReference: {fileID: 863808013}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_winExplode propertyPath: main_camera
value: value:
objectReference: {fileID: 100000, guid: d0bd642121bd8624ea5f79bc25a0be69, type: 2} objectReference: {fileID: 1534402469}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: New_winCaculator propertyPath: ui_windows_2d
value: value:
objectReference: {fileID: 150246, guid: 139670d91598eab40a849ab0d82b2d41, type: 2} objectReference: {fileID: 2097968810}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_loseExplode propertyPath: camera_main_2d
value: value:
objectReference: {fileID: 100000, guid: aeb251af760080f47baeb0265cc0e81f, type: 2} objectReference: {fileID: 826725927}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: New_winCaculatorRecord propertyPath: camera_main_3d
value: value:
objectReference: {fileID: 130352, guid: 23c629e0cb8735a4ea8ea3136526cc89, type: 2} objectReference: {fileID: 863808014}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_ocgcore_card propertyPath: ui_container_3d
value: value:
objectReference: {fileID: 100424, guid: 08fe3824ce347a4489d1818f98bd6989, type: 2} objectReference: {fileID: 1681655558}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_ocgcore_card_number_shower propertyPath: camera_windows_2d
value: value:
objectReference: {fileID: 166554, guid: e37612c8e3dbad54db0e428866080c5c, type: 2} objectReference: {fileID: 2097968811}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: New_ocgcore_placeSelector propertyPath: ui_back_ground_2d
value: value:
objectReference: {fileID: 114714, guid: 86a90872c7957c84db384fd3d2961da2, type: 2} objectReference: {fileID: 737802519}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_ocgcore_ss_spsummon_link propertyPath: camera_container_3d
value: value:
objectReference: {fileID: 150870, guid: 8feaa1cb8c38fb94ab91d7f27b7d6722, type: 2} objectReference: {fileID: 266211071}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
propertyPath: mod_ocgcore_ss_link_mark propertyPath: camera_back_ground_2d
value: value:
objectReference: {fileID: 193842, guid: 31f237d5f58cc3d44b8c6f489981cdbe, type: 2} objectReference: {fileID: 28483481}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 995e2fa1a1156d248955c5fb98502585, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
m_IsPrefabParent: 0
--- !u!1 &1534402465 --- !u!1 &1534402465
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
serializedVersion: 5 m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1534402470} - component: {fileID: 1534402470}
- component: {fileID: 1534402469} - component: {fileID: 1534402469}
- component: {fileID: 1534402468}
- component: {fileID: 1534402467} - component: {fileID: 1534402467}
- component: {fileID: 1534402466} - component: {fileID: 1534402466}
- component: {fileID: 1534402471} - component: {fileID: 1534402471}
...@@ -786,34 +736,36 @@ GameObject: ...@@ -786,34 +736,36 @@ GameObject:
--- !u!81 &1534402466 --- !u!81 &1534402466
AudioListener: AudioListener:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_GameObject: {fileID: 1534402465}
m_Enabled: 1 m_Enabled: 1
--- !u!124 &1534402467 --- !u!124 &1534402467
Behaviour: Behaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_PrefabAsset: {fileID: 0}
m_Enabled: 1
--- !u!92 &1534402468
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_GameObject: {fileID: 1534402465}
m_Enabled: 1 m_Enabled: 1
--- !u!20 &1534402469 --- !u!20 &1534402469
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_GameObject: {fileID: 1534402465}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 1 m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
...@@ -825,7 +777,7 @@ Camera: ...@@ -825,7 +777,7 @@ Camera:
field of view: 75 field of view: 75
orthographic: 0 orthographic: 0
orthographic size: 5 orthographic size: 5
m_Depth: -1 m_Depth: 0
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294017231 m_Bits: 4294017231
...@@ -835,19 +787,20 @@ Camera: ...@@ -835,19 +787,20 @@ Camera:
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 0 m_HDR: 0
m_AllowMSAA: 1 m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: 0.022 m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!4 &1534402470 --- !u!4 &1534402470
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_GameObject: {fileID: 1534402465}
m_LocalRotation: {x: 0.50000006, y: 0, z: 0, w: 0.8660254} m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254}
m_LocalPosition: {x: 0, y: 23, z: -17.5} m_LocalPosition: {x: 0, y: 23, z: -23}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -856,8 +809,9 @@ Transform: ...@@ -856,8 +809,9 @@ Transform:
--- !u!114 &1534402471 --- !u!114 &1534402471
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534402465} m_GameObject: {fileID: 1534402465}
m_Enabled: 0 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
...@@ -870,3 +824,248 @@ MonoBehaviour: ...@@ -870,3 +824,248 @@ MonoBehaviour:
blurMinSpread: 0.65 blurMinSpread: 0.65
blurSpread: 0.25 blurSpread: 0.25
_blurIntensity: 0.3 _blurIntensity: 0.3
--- !u!1001 &1655039121
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 190650, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Name
value: ui_container_3d
objectReference: {fileID: 0}
- target: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 404414, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.y
value: 23
objectReference: {fileID: 0}
- target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalPosition.z
value: -23
objectReference: {fileID: 0}
- target: {fileID: 495516, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_Depth
value: -1
objectReference: {fileID: 0}
- target: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: field of view
value: 75
objectReference: {fileID: 0}
- target: {fileID: 2094976, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 512
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
--- !u!1 &1681655558 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5,
type: 3}
m_PrefabInstance: {fileID: 1655039121}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2097968809
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Name
value: ui_windows_2d
objectReference: {fileID: 0}
- target: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Layer
value: 19
objectReference: {fileID: 0}
- target: {fileID: 142116, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Layer
value: 19
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Depth
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 524288
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
--- !u!1 &2097968810 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 2097968809}
m_PrefabAsset: {fileID: 0}
--- !u!20 &2097968811 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd,
type: 3}
m_PrefabInstance: {fileID: 2097968809}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1360968357697421714
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Name
value: ui_back_ground_2d
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 455926, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_Depth
value: -2
objectReference: {fileID: 0}
- target: {fileID: 2064156, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
propertyPath: m_CullingMask.m_Bits
value: 256
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
...@@ -16,7 +16,7 @@ public class screenFader : MonoBehaviour ...@@ -16,7 +16,7 @@ public class screenFader : MonoBehaviour
void Update() void Update()
{ {
screen_point = Program.camera_game_main.WorldToScreenPoint(Vector3.zero); screen_point = Program.I().main_camera.WorldToScreenPoint(Vector3.zero);
screen_point.z = 8f; screen_point.z = 8f;
int bun = Screen.height / 3; int bun = Screen.height / 3;
if (screen_point.y > Screen.height / 2 + bun) if (screen_point.y > Screen.height / 2 + bun)
...@@ -27,7 +27,7 @@ public class screenFader : MonoBehaviour ...@@ -27,7 +27,7 @@ public class screenFader : MonoBehaviour
{ {
screen_point.y = Screen.height / 2 - bun; screen_point.y = Screen.height / 2 - bun;
} }
Vector3 to = Program.camera_game_main.ScreenToWorldPoint(screen_point); Vector3 to = Program.I().main_camera.ScreenToWorldPoint(screen_point);
......
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
--- !u!1 &137784 --- !u!1 &137784
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
serializedVersion: 5 m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 431276} - component: {fileID: 431276}
- component: {fileID: 11419100} - component: {fileID: 11419100}
...@@ -18,9 +19,10 @@ GameObject: ...@@ -18,9 +19,10 @@ GameObject:
m_IsActive: 1 m_IsActive: 1
--- !u!4 &431276 --- !u!4 &431276
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 137784} m_GameObject: {fileID: 137784}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
...@@ -31,9 +33,10 @@ Transform: ...@@ -31,9 +33,10 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11419100 --- !u!114 &11419100
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 137784} m_GameObject: {fileID: 137784}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
...@@ -41,185 +44,191 @@ MonoBehaviour: ...@@ -41,185 +44,191 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
main_camera: {fileID: 0} main_camera: {fileID: 0}
face: {fileID: 0} face: {fileID: 11468716, guid: faf0ce5c46e971049a20f2597b5f6194, type: 3}
light: {fileID: 0} light: {fileID: 0}
audio: {fileID: 0} audio: {fileID: 0}
zhankai: {fileID: 0} zhankai: {fileID: 8300000, guid: cab912f3009b43843b0a48ac3120c6ad, type: 3}
mod_ui_2d: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 2} mod_ui_2d: {fileID: 115194, guid: 110e0a191727d5f4f8860ae0957652dd, type: 3}
mod_ui_3d: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 2} mod_ui_3d: {fileID: 195504, guid: c5a2efa85dfe2e241aeb34c422f115e5, type: 3}
mod_winExplode: {fileID: 0} mod_winExplode: {fileID: 100000, guid: d0bd642121bd8624ea5f79bc25a0be69, type: 3}
mod_loseExplode: {fileID: 0} mod_loseExplode: {fileID: 100000, guid: aeb251af760080f47baeb0265cc0e81f, type: 3}
mod_audio_effect: {fileID: 147400, guid: ef457fec355425b4fbbcaee0c3f8e24e, type: 2} mod_audio_effect: {fileID: 147400, guid: ef457fec355425b4fbbcaee0c3f8e24e, type: 3}
mod_ocgcore_card: {fileID: 100424, guid: b5a84437478652141a934a354b3e3601, type: 2} mod_ocgcore_card: {fileID: 100424, guid: 08fe3824ce347a4489d1818f98bd6989, type: 3}
mod_ocgcore_card_cloude: {fileID: 110566, guid: b25dd4ff3da664943ac6df33917760df, mod_ocgcore_card_cloude: {fileID: 110566, guid: b25dd4ff3da664943ac6df33917760df,
type: 2} type: 3}
mod_ocgcore_card_number_shower: {fileID: 166554, guid: 7bd46bc0bcd905642a0ce222a38c10ef, mod_ocgcore_card_number_shower: {fileID: 166554, guid: e37612c8e3dbad54db0e428866080c5c,
type: 2} type: 3}
mod_ocgcore_card_figure_line: {fileID: 183720, guid: 3114747afcca84e4d81360d5b19e5cab, mod_ocgcore_card_figure_line: {fileID: 183720, guid: 3114747afcca84e4d81360d5b19e5cab,
type: 2} type: 3}
mod_ocgcore_hidden_button: {fileID: 166824, guid: 01f966aaa639fcb468309549dec9b2e6, mod_ocgcore_hidden_button: {fileID: 166824, guid: 01f966aaa639fcb468309549dec9b2e6,
type: 2} type: 3}
mod_ocgcore_coin: {fileID: 116782, guid: 46b964b7c9b416348a9b4f55c97a3b5e, type: 2} mod_ocgcore_coin: {fileID: 116782, guid: 46b964b7c9b416348a9b4f55c97a3b5e, type: 3}
mod_ocgcore_dice: {fileID: 192632, guid: 8ba8e306049b10a4dabc04533d2b59c3, type: 2} mod_ocgcore_dice: {fileID: 192632, guid: 8ba8e306049b10a4dabc04533d2b59c3, type: 3}
mod_simple_quad: {fileID: 153178, guid: 7e032b6b717b6594ca1d7a2f7c279f0a, type: 2} mod_simple_quad: {fileID: 153178, guid: 7e032b6b717b6594ca1d7a2f7c279f0a, type: 3}
mod_simple_ngui_background_texture: {fileID: 197510, guid: 4bcf544bc00b6e84daf5bf79d2238069, mod_simple_ngui_background_texture: {fileID: 197510, guid: 4bcf544bc00b6e84daf5bf79d2238069,
type: 2} type: 3}
mod_simple_ngui_text: {fileID: 151012, guid: dd963d913f8da854093ea817838d4e6e, type: 2} mod_simple_ngui_text: {fileID: 151012, guid: dd963d913f8da854093ea817838d4e6e, type: 3}
mod_ocgcore_number: {fileID: 174198, guid: f65670976d5ffc0469cafb02eb365281, type: 2} mod_ocgcore_number: {fileID: 174198, guid: f65670976d5ffc0469cafb02eb365281, type: 3}
mod_ocgcore_decoration_chain_selecting: {fileID: 113922, guid: 7f3c7b73f5951bc46b55a925c39e5100, mod_ocgcore_decoration_chain_selecting: {fileID: 113922, guid: 7f3c7b73f5951bc46b55a925c39e5100,
type: 2} type: 3}
mod_ocgcore_decoration_card_selected: {fileID: 125802, guid: ea01e87d0549f9d4a9b683849a1a94ac, mod_ocgcore_decoration_card_selected: {fileID: 125802, guid: ea01e87d0549f9d4a9b683849a1a94ac,
type: 2} type: 3}
mod_ocgcore_decoration_card_selecting: {fileID: 121074, guid: 7c6151eed97886444a7fe80b34799937, mod_ocgcore_decoration_card_selecting: {fileID: 121074, guid: 7c6151eed97886444a7fe80b34799937,
type: 2} type: 3}
mod_ocgcore_decoration_card_active: {fileID: 100012, guid: 9a7a05fb80cccd94d875499f64d8929f, mod_ocgcore_decoration_card_active: {fileID: 100012, guid: 9a7a05fb80cccd94d875499f64d8929f,
type: 2} type: 3}
mod_ocgcore_decoration_spsummon: {fileID: 100006, guid: e0ece19172c71f04ea0bfb7e4865dbe9, mod_ocgcore_decoration_spsummon: {fileID: 100006, guid: e0ece19172c71f04ea0bfb7e4865dbe9,
type: 2} type: 3}
mod_ocgcore_decoration_thunder: {fileID: 185390, guid: ae40f05e43b39ac41bb85107368b3722, mod_ocgcore_decoration_thunder: {fileID: 185390, guid: ae40f05e43b39ac41bb85107368b3722,
type: 2} type: 3}
mod_ocgcore_decoration_trap_activated: {fileID: 170606, guid: 60715b5bd03961046b6505cbf86eabae, mod_ocgcore_decoration_trap_activated: {fileID: 170606, guid: 60715b5bd03961046b6505cbf86eabae,
type: 2} type: 3}
mod_ocgcore_decoration_magic_activated: {fileID: 135170, guid: e1020196a14a1954b920066c69ccad08, mod_ocgcore_decoration_magic_activated: {fileID: 135170, guid: e1020196a14a1954b920066c69ccad08,
type: 2} type: 3}
mod_ocgcore_decoration_magic_zhuangbei: {fileID: 100018, guid: 2f28e66d12f2ab349b1d9b8ba5062c6e, mod_ocgcore_decoration_magic_zhuangbei: {fileID: 100018, guid: 2f28e66d12f2ab349b1d9b8ba5062c6e,
type: 2} type: 3}
mod_ocgcore_decoration_removed: {fileID: 194634, guid: 576d137ab03133744a60dbc343d3adee, mod_ocgcore_decoration_removed: {fileID: 194634, guid: 576d137ab03133744a60dbc343d3adee,
type: 2} type: 3}
mod_ocgcore_decoration_tograve: {fileID: 100000, guid: 897386993fd43bc4cb52b9fc6151b39d, mod_ocgcore_decoration_tograve: {fileID: 100000, guid: 897386993fd43bc4cb52b9fc6151b39d,
type: 2} type: 3}
mod_ocgcore_decoration_card_setted: {fileID: 100006, guid: ab72d295ef12bc14d9e99b3daa8d84b7, mod_ocgcore_decoration_card_setted: {fileID: 100006, guid: ab72d295ef12bc14d9e99b3daa8d84b7,
type: 2} type: 3}
mod_ocgcore_blood: {fileID: 154148, guid: a1ab56112f979df4b8a38ce78f30bdee, type: 2} mod_ocgcore_blood: {fileID: 154148, guid: a1ab56112f979df4b8a38ce78f30bdee, type: 3}
mod_ocgcore_blood_screen: {fileID: 100004, guid: 4826a28e01211e64ab63e8aab65bf799, mod_ocgcore_blood_screen: {fileID: 100004, guid: 4826a28e01211e64ab63e8aab65bf799,
type: 2} type: 3}
mod_ocgcore_bs_atk_decoration: {fileID: 175090, guid: 2f2cada2fe5e43d41ae45f887daa5080, mod_ocgcore_bs_atk_decoration: {fileID: 175090, guid: a3ab6c7363ebb2244958942a1cc2d847,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_earth: {fileID: 151680, guid: cb70567038412554480a054359dad8e2, mod_ocgcore_bs_atk_line_earth: {fileID: 151680, guid: cb70567038412554480a054359dad8e2,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_water: {fileID: 136688, guid: f0c57bf00f98b844586c7f6a2b479f04, mod_ocgcore_bs_atk_line_water: {fileID: 136688, guid: f0c57bf00f98b844586c7f6a2b479f04,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_fire: {fileID: 129408, guid: 9abbee9e8a70372468d1cfc1e389295c, mod_ocgcore_bs_atk_line_fire: {fileID: 129408, guid: 9abbee9e8a70372468d1cfc1e389295c,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_wind: {fileID: 140622, guid: d5d4d53e7b9c3fd45bca4ad92a4cc74a, mod_ocgcore_bs_atk_line_wind: {fileID: 140622, guid: d5d4d53e7b9c3fd45bca4ad92a4cc74a,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_dark: {fileID: 168002, guid: 01cab1d8e05c8ea469dfd4c55d3f6590, mod_ocgcore_bs_atk_line_dark: {fileID: 168002, guid: 01cab1d8e05c8ea469dfd4c55d3f6590,
type: 2} type: 3}
mod_ocgcore_bs_atk_line_light: {fileID: 179022, guid: 7dba31b90c96b564dbdf9e0971777138, mod_ocgcore_bs_atk_line_light: {fileID: 179022, guid: 7dba31b90c96b564dbdf9e0971777138,
type: 2} type: 3}
mod_ocgcore_cs_chaining: {fileID: 100010, guid: eb8a90c9a22c2544493ff578f226d994, mod_ocgcore_cs_chaining: {fileID: 100010, guid: eb8a90c9a22c2544493ff578f226d994,
type: 2} type: 3}
mod_ocgcore_cs_end: {fileID: 100012, guid: 9fb41bc61b608b149b5288295fea40aa, type: 2} mod_ocgcore_cs_end: {fileID: 100012, guid: 9fb41bc61b608b149b5288295fea40aa, type: 3}
mod_ocgcore_cs_bomb: {fileID: 100000, guid: 3c0d69c6607bfe744b7da0ab6ff53b67, type: 2} mod_ocgcore_cs_bomb: {fileID: 100000, guid: 3c0d69c6607bfe744b7da0ab6ff53b67, type: 3}
mod_ocgcore_cs_negated: {fileID: 197450, guid: 060605917b7456e48a265ed2f97acede, mod_ocgcore_cs_negated: {fileID: 197450, guid: 060605917b7456e48a265ed2f97acede,
type: 2} type: 3}
mod_ocgcore_cs_mon_earth: {fileID: 0} mod_ocgcore_cs_mon_earth: {fileID: 188516, guid: 403bf6eadecab084d837692d99aa1726,
mod_ocgcore_cs_mon_water: {fileID: 0} type: 3}
mod_ocgcore_cs_mon_fire: {fileID: 0} mod_ocgcore_cs_mon_water: {fileID: 188516, guid: b047e754820a2474b96b2dfee7860503,
mod_ocgcore_cs_mon_wind: {fileID: 0} type: 3}
mod_ocgcore_cs_mon_light: {fileID: 0} mod_ocgcore_cs_mon_fire: {fileID: 188516, guid: bae56cf07e83c1149880df9ed7dadd83,
mod_ocgcore_cs_mon_dark: {fileID: 0} type: 3}
mod_ocgcore_cs_mon_wind: {fileID: 188516, guid: c3852330021b739439c28049b6fb2763,
type: 3}
mod_ocgcore_cs_mon_light: {fileID: 188516, guid: c837d314ee4b9db45a738925e4159c9f,
type: 3}
mod_ocgcore_cs_mon_dark: {fileID: 188516, guid: 204f43277a3085942a86f7275acc0177,
type: 3}
mod_ocgcore_ss_summon_earth: {fileID: 148964, guid: f32dc027b2d1be6459f901a0b050c942, mod_ocgcore_ss_summon_earth: {fileID: 148964, guid: f32dc027b2d1be6459f901a0b050c942,
type: 2} type: 3}
mod_ocgcore_ss_summon_water: {fileID: 100004, guid: c5b9f6599e8c9c9478a02e9985f3b1c3, mod_ocgcore_ss_summon_water: {fileID: 100004, guid: c5b9f6599e8c9c9478a02e9985f3b1c3,
type: 2} type: 3}
mod_ocgcore_ss_summon_fire: {fileID: 100014, guid: 88c5db92014a0de49bbd528500c200b3, mod_ocgcore_ss_summon_fire: {fileID: 100014, guid: 88c5db92014a0de49bbd528500c200b3,
type: 2} type: 3}
mod_ocgcore_ss_summon_wind: {fileID: 189074, guid: ecf3c4980b27d8d42a8b20c84b6cac83, mod_ocgcore_ss_summon_wind: {fileID: 189074, guid: ecf3c4980b27d8d42a8b20c84b6cac83,
type: 2} type: 3}
mod_ocgcore_ss_summon_dark: {fileID: 187834, guid: 1b813d3d389b63746b48cd105c252810, mod_ocgcore_ss_summon_dark: {fileID: 187834, guid: 1b813d3d389b63746b48cd105c252810,
type: 2} type: 3}
mod_ocgcore_ss_summon_light: {fileID: 100000, guid: cdab8f13fdb5149499cf316800062215, mod_ocgcore_ss_summon_light: {fileID: 100000, guid: cdab8f13fdb5149499cf316800062215,
type: 2} type: 3}
mod_ocgcore_ol_earth: {fileID: 0} mod_ocgcore_ol_earth: {fileID: 198160, guid: 0bf96b39484b0c84882da34e17130819, type: 3}
mod_ocgcore_ol_water: {fileID: 0} mod_ocgcore_ol_water: {fileID: 126488, guid: 3dad3d277b4f1b44caa32fdf134d60dd, type: 3}
mod_ocgcore_ol_fire: {fileID: 0} mod_ocgcore_ol_fire: {fileID: 106852, guid: 694d7f4e1b6aae34d9a75a59d952582a, type: 3}
mod_ocgcore_ol_wind: {fileID: 0} mod_ocgcore_ol_wind: {fileID: 178198, guid: 127e39fbba512d546a78ebb15efcfa59, type: 3}
mod_ocgcore_ol_dark: {fileID: 0} mod_ocgcore_ol_dark: {fileID: 177540, guid: f8c81e2a945e8684185b6651939f9fff, type: 3}
mod_ocgcore_ol_light: {fileID: 0} mod_ocgcore_ol_light: {fileID: 161610, guid: 38661326c4038fd488de6981c1d31186, type: 3}
mod_ocgcore_ss_spsummon_normal: {fileID: 125854, guid: ae7e84d855783134f9a09d0ca5cebfed, mod_ocgcore_ss_spsummon_normal: {fileID: 125854, guid: ae7e84d855783134f9a09d0ca5cebfed,
type: 2} type: 3}
mod_ocgcore_ss_spsummon_ronghe: {fileID: 188150, guid: 1e478768a2b045e4bb691d22be794c09, mod_ocgcore_ss_spsummon_ronghe: {fileID: 188150, guid: 1e478768a2b045e4bb691d22be794c09,
type: 2} type: 3}
mod_ocgcore_ss_spsummon_tongtiao: {fileID: 153922, guid: 9e9b2e1d27abff74fa680e1645e4ce50, mod_ocgcore_ss_spsummon_tongtiao: {fileID: 153922, guid: 9e9b2e1d27abff74fa680e1645e4ce50,
type: 2} type: 3}
mod_ocgcore_ss_spsummon_yishi: {fileID: 100010, guid: f931792496a8f834799e88ea5ded6b80, mod_ocgcore_ss_spsummon_yishi: {fileID: 100010, guid: f931792496a8f834799e88ea5ded6b80,
type: 2} type: 3}
mod_ocgcore_ss_spsummon_link: {fileID: 0} mod_ocgcore_ss_spsummon_link: {fileID: 150870, guid: 8feaa1cb8c38fb94ab91d7f27b7d6722,
type: 3}
mod_ocgcore_ss_p_idle_effect: {fileID: 113812, guid: 4eee7fd80ee672d4f8cdaa9179879637, mod_ocgcore_ss_p_idle_effect: {fileID: 113812, guid: 4eee7fd80ee672d4f8cdaa9179879637,
type: 2} type: 3}
mod_ocgcore_ss_p_sum_effect: {fileID: 192278, guid: 4a755177320618248bc717e4dc49926b, mod_ocgcore_ss_p_sum_effect: {fileID: 192278, guid: 4a755177320618248bc717e4dc49926b,
type: 2} type: 3}
mod_ocgcore_ss_dark_hole: {fileID: 125294, guid: 7293a93c0f10df4469dff5d874100ce8, mod_ocgcore_ss_dark_hole: {fileID: 170424, guid: b8fc61e501987aa4d836d532a2003eaf,
type: 2} type: 3}
mod_ocgcore_ss_link_mark: {fileID: 0} mod_ocgcore_ss_link_mark: {fileID: 193842, guid: 31f237d5f58cc3d44b8c6f489981cdbe,
new_ui_menu: {fileID: 0} type: 3}
new_ui_setting: {fileID: 0} new_ui_menu: {fileID: 167656, guid: 4e3c1289cf09fad40bde488731159a6a, type: 3}
new_ui_book: {fileID: 0} new_ui_setting: {fileID: 133012, guid: b1ec81ad075831c4da5c2baaaa65594b, type: 3}
new_ui_selectServer: {fileID: 0} new_ui_book: {fileID: 154202, guid: 26b8ac8b01eea214c9aa2dda03224bf8, type: 3}
new_ui_gameInfo: {fileID: 0} new_ui_selectServer: {fileID: 165948, guid: 66c270580b57825498511f78f7bc78bb, type: 3}
new_ui_cardDescription: {fileID: 0} new_ui_gameInfo: {fileID: 139962, guid: 0f5784805788a664da2c92f42ec39685, type: 3}
new_ui_search: {fileID: 0} new_ui_cardDescription: {fileID: 194658, guid: dd57848b7cec7c441b1e5e16bfaf237f,
new_ui_searchDetailed: {fileID: 0} type: 3}
new_ui_cardOnSearchList: {fileID: 0} new_ui_search: {fileID: 175576, guid: 589b9f7f12556814fb7cc2371ef35649, type: 3}
new_bar_changeSide: {fileID: 0} new_ui_searchDetailed: {fileID: 108072, guid: 78d905a01dddef64b9cb440dc62b50a9,
new_bar_duel: {fileID: 0} type: 3}
new_bar_room: {fileID: 0} new_ui_cardOnSearchList: {fileID: 121738, guid: 2b6ccbb323c719640a5956255df6e60f,
new_bar_editDeck: {fileID: 0} type: 3}
new_bar_watchDuel: {fileID: 0} new_bar_changeSide: {fileID: 122638, guid: 63e044f7c8ec2f941bdf744dfc74c476, type: 3}
new_bar_watchRecord: {fileID: 0} new_bar_duel: {fileID: 123392, guid: 829bf6713f5afeb40840803e21e03092, type: 3}
new_mod_cardInDeckManager: {fileID: 0} new_bar_room: {fileID: 154124, guid: 4450e27d91ca638499a5b7792d561372, type: 3}
new_mod_tableInDeckManager: {fileID: 0} new_bar_editDeck: {fileID: 178988, guid: 765dbdb0e4818974a91597f4abb24ee1, type: 3}
new_ui_handShower: {fileID: 0} new_bar_watchDuel: {fileID: 117332, guid: c31923f847d652f428563c70ae9126c0, type: 3}
new_ui_textMesh: {fileID: 0} new_bar_watchRecord: {fileID: 101550, guid: c2bfacfbd9e90a145a2e44e65731cecf, type: 3}
new_ui_superButton: {fileID: 0} new_mod_cardInDeckManager: {fileID: 189694, guid: 6747c695cb6d93142b1f445a7896ea98,
new_ui_superButtonTransparent: {fileID: 0} type: 3}
new_ui_aiRoom: {fileID: 0} new_mod_tableInDeckManager: {fileID: 124102, guid: 19e5c6880e40e3a4183c21c56af33744,
new_ocgcore_field: {fileID: 0} type: 3}
new_ocgcore_chainCircle: {fileID: 0} new_ui_handShower: {fileID: 124728, guid: dfb4acd85c948fa44975eab80c157b45, type: 3}
new_ocgcore_wait: {fileID: 0} new_ui_textMesh: {fileID: 141456, guid: f2d3ae60f92063649838be32d3c95bcf, type: 3}
new_mouse: {fileID: 0} new_ui_superButton: {fileID: 175034, guid: d0dca316780477b4fab4ba9122bdbc5e, type: 3}
remaster_deckManager: {fileID: 0} new_ui_superButtonTransparent: {fileID: 175034, guid: 1a9f43e6666f73d499018b0bc50fa87f,
remaster_replayManager: {fileID: 0} type: 3}
remaster_puzzleManager: {fileID: 0} new_ui_aiRoom: {fileID: 137880, guid: eaffbd8c582dbcb4b82ee73629e34013, type: 3}
remaster_tagRoom: {fileID: 0} new_ocgcore_field: {fileID: 110048, guid: b1633e26122bb4749a19a5c38826336b, type: 3}
remaster_room: {fileID: 0} new_ocgcore_chainCircle: {fileID: 139058, guid: d32a4ff301257644a9d5e19d14ba7010,
ES_1: {fileID: 0} type: 3}
ES_2: {fileID: 0} new_ocgcore_wait: {fileID: 192526, guid: ebe9fe8493cc48b4d8fc206976a5e897, type: 3}
ES_2Force: {fileID: 0} new_mouse: {fileID: 136044, guid: 19638d3f760fa38429c40cca2b503881, type: 3}
ES_3cancle: {fileID: 0} remaster_deckManager: {fileID: 175342, guid: e0266c76a82b162439c48c7fe64921ab, type: 3}
ES_Single_multiple_window: {fileID: 0} remaster_replayManager: {fileID: 197804, guid: 0ba65c521a7de0d46a9e31380654c3b4,
ES_Single_option: {fileID: 0} type: 3}
ES_multiple_option: {fileID: 0} remaster_puzzleManager: {fileID: 186134, guid: 888e20adbca53df4cb24411246bb1b11,
ES_input: {fileID: 0} type: 3}
ES_position: {fileID: 0} remaster_tagRoom: {fileID: 154246, guid: 95580b5915bf1eb4eaf9b6b19a82f92d, type: 3}
ES_Tp: {fileID: 0} remaster_room: {fileID: 154246, guid: fa04b5d4defb9284aa6b679865c5b9f1, type: 3}
ES_Face: {fileID: 0} ES_1: {fileID: 152348, guid: 49504cab875642a4a89768cf637df4e0, type: 3}
ES_FS: {fileID: 0} ES_2: {fileID: 125396, guid: c5cf793ce3857464eafa8aa15c1cfc06, type: 3}
Pro1_CardShower: {fileID: 0} ES_2Force: {fileID: 125396, guid: f687813851d9d9548b710c198d84db01, type: 3}
Pro1_superCardShower: {fileID: 0} ES_3cancle: {fileID: 136638, guid: b40821dc1a2e1374981ee75e4c966c3f, type: 3}
Pro1_superCardShowerA: {fileID: 0} ES_Single_multiple_window: {fileID: 124974, guid: 973d36324e25edb4e937f0d46b67d978,
New_arrow: {fileID: 0} type: 3}
New_selectKuang: {fileID: 0} ES_Single_option: {fileID: 140558, guid: c67c5053dc1b3c14db4efc960bc8f57c, type: 3}
New_chainKuang: {fileID: 0} ES_multiple_option: {fileID: 160692, guid: 2f2ccdda83cade9439f7a615e3943a17, type: 3}
New_phase: {fileID: 0} ES_input: {fileID: 169056, guid: dd31e15b57e5f354e94eb55af88bdaae, type: 3}
New_decker: {fileID: 0} ES_position: {fileID: 197414, guid: ebf9fc604e38b7348be638f5deaa91db, type: 3}
New_winCaculator: {fileID: 0} ES_Tp: {fileID: 139314, guid: 3cafe5fcc84bd994cb64aaf0fc2b4ec6, type: 3}
New_winCaculatorRecord: {fileID: 0} ES_Face: {fileID: 195852, guid: b8748dafca1e28c4d9e882fb8b3ff68b, type: 3}
New_ocgcore_placeSelector: {fileID: 0} ES_FS: {fileID: 150976, guid: e371745b12d178b4ebe42e879820c9bb, type: 3}
Pro1_CardShower: {fileID: 166874, guid: 7b9a1520ac854164d80116f4c9cd49f4, type: 3}
Pro1_superCardShower: {fileID: 166874, guid: 9c687fe8a2487c34a857f20d148bce8e, type: 3}
Pro1_superCardShowerA: {fileID: 166874, guid: ed7ee42be6f2d9742ab3af7f921085ad,
type: 3}
New_arrow: {fileID: 139724, guid: 65847fa9d4d916b4993e5b907ab5262f, type: 3}
New_selectKuang: {fileID: 161760, guid: f72715be2fc64e64a98ae2101b915fd1, type: 3}
New_chainKuang: {fileID: 123774, guid: 00f2b7eecbee10a4b8c086ed3d7dc683, type: 3}
New_phase: {fileID: 108702, guid: 1150c172f7a9d634a824727a558df871, type: 3}
New_decker: {fileID: 156862, guid: 7b12ea4fd69f4184b97c15f847459773, type: 3}
New_winCaculator: {fileID: 150246, guid: 139670d91598eab40a849ab0d82b2d41, type: 3}
New_winCaculatorRecord: {fileID: 130352, guid: 23c629e0cb8735a4ea8ea3136526cc89,
type: 3}
New_ocgcore_placeSelector: {fileID: 114714, guid: 86a90872c7957c84db384fd3d2961da2,
type: 3}
mouseParticle: {fileID: 0} mouseParticle: {fileID: 0}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 0}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 137784}
m_IsPrefabParent: 1
...@@ -16,10 +16,10 @@ TagManager: ...@@ -16,10 +16,10 @@ TagManager:
- UI - UI
- -
- -
- layer_8 - ui_back_ground_2d
- layer_9 - ui_container_3d
- layer_10 - ui_main_3d
- layer_11 - ui_main_2d
- layer_12 - layer_12
- layer_13 - layer_13
- layer_14 - layer_14
...@@ -27,7 +27,7 @@ TagManager: ...@@ -27,7 +27,7 @@ TagManager:
- card_data_manager - card_data_manager
- mouse - mouse
- debug - debug
- windows - ui_windows_2d
- -
- -
- -
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment