diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1001.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1001.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1001.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1002.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1002.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1002.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1002.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1003.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1003.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1003.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1003.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1004.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1004.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1004.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1004.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1006.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1005.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1006.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1005.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1005.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1006.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1005.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1006.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1007.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1007.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1007.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1007.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1008.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1008.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1008.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1008.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1009.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1009.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1009.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1009.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1011.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1010.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1011.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1010.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1012.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1011.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1012.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1011.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1013.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1012.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1013.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1012.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1014.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1013.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1014.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1013.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1015.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1014.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1015.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1014.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1016.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1015.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1016.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1015.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1017.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1016.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1017.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1016.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1018.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1017.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1018.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1017.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1019.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1018.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1019.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1018.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1020.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1019.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1020.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1019.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1021.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1020.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1021.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1020.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1022.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1021.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1022.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1021.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1023.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1022.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1023.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1022.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1023.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1023.png new file mode 100644 index 0000000..9c6b339 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1023.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:686c7d8df32ed66d9624ec76877bf6012d5f14eca392b843a9d4b84f510d1a61 +size 14970 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1010.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1024.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1010.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1024.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1025.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1025.png new file mode 100644 index 0000000..7f2da2b --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1025.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:283c2c1d3a9a6036c042b414b5f2c6837c33315b629064b1f6f186939439f868 +size 2973725 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1024.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1026.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem1024.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1026.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1027.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1027.png new file mode 100644 index 0000000..749aa1f --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1027.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2577325819b7d1586eee8a67be051a6b2406e9cb6b18efa7092402de85333a15 +size 5417 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1028.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1028.png new file mode 100644 index 0000000..5b6b8dc --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1028.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a7dbf411a5882d6e472b0933ab0631aea23194f45ce7f42a3131d63e22d566 +size 20244 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1029.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1029.png new file mode 100644 index 0000000..6af5549 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1029.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0449e5af115a56c1c50e2f4093842511db16e8cb2d1031af2b0ad0017e085eb7 +size 16246 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1030.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1030.png new file mode 100644 index 0000000..e70537c --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1030.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3b54ab05f32f2039acf6910f7aa2660256e5e4677aca680c6c9d427ca8ab2a5 +size 19254 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1031.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1031.png new file mode 100644 index 0000000..10836fe --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1031.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19d13dda47e293af3385bc210d450160acd45405d27402d262ba7852ffdb9c94 +size 19164 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1032.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1032.png new file mode 100644 index 0000000..dbc9e09 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1032.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f4ba192328da76ff88bc2e4f90e7306abc1e97e5d4158ded23a03ba51bcb5c +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1033.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1033.png new file mode 100644 index 0000000..ea12987 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1033.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84c5914b4156f79710fa5266feec0b8b3c80d7ec9012fe9acac2a9f0415c561c +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1034.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1034.png new file mode 100644 index 0000000..2b79c19 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1034.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:648eff345b86a01fb598e3d50c8028aa0a42b0fef108a27887a6a9c629ada8bf +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1035.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1035.png new file mode 100644 index 0000000..59ac04f --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1035.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb90a014f15d5b4b2461711209300824aa6cb81b601490d813816e11d206eb2d +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1036.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1036.png new file mode 100644 index 0000000..99db58b --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1036.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a46d8b439a5a023c13640c7883459b1ab0735f5b6fce51fbcaf35980bf27aa26 +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1037.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1037.png new file mode 100644 index 0000000..3ad8635 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1037.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f865fa198e3e8257138b617c8ca47c90581656ef81cbafe37c5897e0e48d80 +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1038.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1038.png new file mode 100644 index 0000000..7158ccb --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1038.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d05a8ef1f91878541385a5c7d3771ae3b4a778504623acbbb91a65d5096453d +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1039.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1039.png new file mode 100644 index 0000000..b2f85ce --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1039.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b146601ce0b0341ad82535b58e2bcfd52918dbcf294d932ef0cfd27bfaaf6f6f +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1040.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1040.png new file mode 100644 index 0000000..27445f3 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1040.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dd00447419629eeb4c5c0a3b5b1e072f151844517cca89f9cd89014c7f74872 +size 2968839 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1041.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1041.png new file mode 100644 index 0000000..c116337 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1041.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9f87005b41fc37d22d26048f88ac87d2595d2f0b228dccc69d849560eb363cf +size 16842 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1042.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1042.png new file mode 100644 index 0000000..1e7abd0 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1042.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f5c83e51ca44c42a22af0c4e62eb509a4daef7baca60210614aec9655393cb +size 12500 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1043.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1043.png new file mode 100644 index 0000000..a7dd530 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1043.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc832ee680838f783cc9d7fbc81d07f994343118045c019cb269613e0d04c8c +size 13543 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1044.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1044.png new file mode 100644 index 0000000..c761390 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1044.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dd63d1dd25fa2ec9c80f1bb90d5b99913fb7163ab6f9463cf1ebce2f26be373 +size 16247 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1045.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1045.png new file mode 100644 index 0000000..1359b88 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1045.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a587a39b7613c720c19c3c62c4c87401d45c57abad1a3f8a713cc35d56e2ab39 +size 16804 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1046.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1046.png new file mode 100644 index 0000000..1ab7a39 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1046.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7632df53b36b5427ef9ec422c48e24f0805da800616c532a578179e721c43fd8 +size 17791 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1047.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1047.png new file mode 100644 index 0000000..4ca7fba --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1047.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c5fcf662b1f4f63ecfb40be133d9a8473f5c380996e0f30fbf695235f011fee +size 18591 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1048.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1048.png new file mode 100644 index 0000000..ebe47be --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1048.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa7861b0cf1e0ae9f76622339491cc2be8225de29d636badb378170bba075ee1 +size 17781 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1049.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1049.png new file mode 100644 index 0000000..411a279 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1049.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1df9b463a738767f12ad71091f3e14d12acc5df035084fa1021a4e132e36123 +size 2974540 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1050.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1050.png new file mode 100644 index 0000000..a3a6125 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1050.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99639b99509976adf20421367c75991f9b2f9caf81568e942c8540c0de6ca55a +size 18085 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1051.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1051.png new file mode 100644 index 0000000..af1550f --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1051.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:637f0a892e84a217442cd1814b01cb862f34b9704ac1fa4ec5705593ff1e1828 +size 17532 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1052.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1052.png new file mode 100644 index 0000000..d277207 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_1052.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af122ac1380f45a08aebf7a15b2422505b426b8b98c30fec62973128e05423ee +size 6307 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2001.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2001.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2001.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2002.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2002.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2002.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2002.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2003.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2003.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2003.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2003.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2004.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2004.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2004.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2004.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2005.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2005.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2005.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2005.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2006.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2006.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem2006.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2006.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2013.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2013.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2013.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2014.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2014.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2014.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2015.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2015.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2015.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2016.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2016.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2016.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2017.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2017.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2017.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2018.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2018.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2018.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2019.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2019.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2019.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2020.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2020.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2020.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2021.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2021.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2021.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2022.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2022.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2022.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2023.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2023.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2023.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2024.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2024.png new file mode 100644 index 0000000..39a3275 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_2024.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a72faba44ce8f005ca3d11e018e9c5eaa5c3c811b88b2ca5689afa64aa01b76 +size 30957 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3001.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3001.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3001.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3002.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3002.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3002.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3002.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3003.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3003.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3003.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3003.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3004.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3004.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem3004.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_3004.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4001.png new file mode 100644 index 0000000..d7e906f --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4001.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a3fd3e93b42b91bf5eb1f753c94fe3630b2d16b5614fe760f3cf7fe4f9259a9 +size 65412 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4002.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4001.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4002.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4003.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4003.png new file mode 100644 index 0000000..4fb8fa5 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4003.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79adb112dd473484386956ad61558a621240deb8a74ceec06c1c1d5d1f6d78c +size 14153 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4005.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4004.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4005.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4004.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4006.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4005.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4006.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4005.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4003.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4006.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4003.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4006.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4007.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4007.png new file mode 100644 index 0000000..c23c2e4 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4007.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0c8f17f51b60afe05777d83d7ae7dad31aa4407b66d1629afd6304eebf6c03d +size 17756 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4004.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4008.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4004.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4008.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4009.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4009.png new file mode 100644 index 0000000..3e78b27 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4009.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1318e11fc363a4b4dc3b67eda9c86257902edf78a6601dd8ff73206ec00ce0c +size 23192 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4002.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4010.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem4002.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4010.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4011.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4011.png new file mode 100644 index 0000000..8c23865 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_4011.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c60078af2f36d9fb05a632bcf94e9f56ca847280957f1989077e99bc2d4507f3 +size 17805 diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem6001.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_6001.png similarity index 100% rename from FGUIProject/FUI_ET/assets/AllItem/Items/AllItem6001.png rename to FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_6001.png diff --git a/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_6002.png b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_6002.png new file mode 100644 index 0000000..1fc7d91 --- /dev/null +++ b/FGUIProject/FUI_ET/assets/AllItem/Items/AllItem_6002.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0a0f16cfe62bd5a0454fe5c4027bdd52f44b8216da2f5722605c3fa63423ab0 +size 52110 diff --git a/FGUIProject/FUI_ET/assets/AllItem/package.xml b/FGUIProject/FUI_ET/assets/AllItem/package.xml index 1598e1f..805fd92 100644 --- a/FGUIProject/FUI_ET/assets/AllItem/package.xml +++ b/FGUIProject/FUI_ET/assets/AllItem/package.xml @@ -1,47 +1,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Unity/Assets/Bundles/Building/Build1001.prefab b/Unity/Assets/Bundles/Building/Build_1001.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build1001.prefab rename to Unity/Assets/Bundles/Building/Build_1001.prefab diff --git a/Unity/Assets/Bundles/Building/Build1001.prefab.meta b/Unity/Assets/Bundles/Building/Build_1001.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build1001.prefab.meta rename to Unity/Assets/Bundles/Building/Build_1001.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build1002.prefab b/Unity/Assets/Bundles/Building/Build_1002.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build1002.prefab rename to Unity/Assets/Bundles/Building/Build_1002.prefab diff --git a/Unity/Assets/Bundles/Building/Build1002.prefab.meta b/Unity/Assets/Bundles/Building/Build_1002.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build1002.prefab.meta rename to Unity/Assets/Bundles/Building/Build_1002.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build1004.prefab b/Unity/Assets/Bundles/Building/Build_1004.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build1004.prefab rename to Unity/Assets/Bundles/Building/Build_1004.prefab diff --git a/Unity/Assets/Bundles/Building/Build1004.prefab.meta b/Unity/Assets/Bundles/Building/Build_1004.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build1004.prefab.meta rename to Unity/Assets/Bundles/Building/Build_1004.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build1005.prefab b/Unity/Assets/Bundles/Building/Build_1005.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build1005.prefab rename to Unity/Assets/Bundles/Building/Build_1005.prefab diff --git a/Unity/Assets/Bundles/Building/Build1005.prefab.meta b/Unity/Assets/Bundles/Building/Build_1005.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build1005.prefab.meta rename to Unity/Assets/Bundles/Building/Build_1005.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build1006.prefab b/Unity/Assets/Bundles/Building/Build_1006.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build1006.prefab rename to Unity/Assets/Bundles/Building/Build_1006.prefab diff --git a/Unity/Assets/Bundles/Building/Build1006.prefab.meta b/Unity/Assets/Bundles/Building/Build_1006.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build1006.prefab.meta rename to Unity/Assets/Bundles/Building/Build_1006.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build2001.prefab b/Unity/Assets/Bundles/Building/Build_2001.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build2001.prefab rename to Unity/Assets/Bundles/Building/Build_2001.prefab diff --git a/Unity/Assets/Bundles/Building/Build2001.prefab.meta b/Unity/Assets/Bundles/Building/Build_2001.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build2001.prefab.meta rename to Unity/Assets/Bundles/Building/Build_2001.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build2002.prefab b/Unity/Assets/Bundles/Building/Build_2002.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build2002.prefab rename to Unity/Assets/Bundles/Building/Build_2002.prefab diff --git a/Unity/Assets/Bundles/Building/Build2002.prefab.meta b/Unity/Assets/Bundles/Building/Build_2002.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build2002.prefab.meta rename to Unity/Assets/Bundles/Building/Build_2002.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build2003.prefab b/Unity/Assets/Bundles/Building/Build_2003.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build2003.prefab rename to Unity/Assets/Bundles/Building/Build_2003.prefab diff --git a/Unity/Assets/Bundles/Building/Build2003.prefab.meta b/Unity/Assets/Bundles/Building/Build_2003.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build2003.prefab.meta rename to Unity/Assets/Bundles/Building/Build_2003.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build2006.prefab b/Unity/Assets/Bundles/Building/Build_2006.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build2006.prefab rename to Unity/Assets/Bundles/Building/Build_2006.prefab diff --git a/Unity/Assets/Bundles/Building/Build2006.prefab.meta b/Unity/Assets/Bundles/Building/Build_2006.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build2006.prefab.meta rename to Unity/Assets/Bundles/Building/Build_2006.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build2007.prefab b/Unity/Assets/Bundles/Building/Build_2007.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build2007.prefab rename to Unity/Assets/Bundles/Building/Build_2007.prefab diff --git a/Unity/Assets/Bundles/Building/Build2007.prefab.meta b/Unity/Assets/Bundles/Building/Build_2007.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build2007.prefab.meta rename to Unity/Assets/Bundles/Building/Build_2007.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3001.prefab b/Unity/Assets/Bundles/Building/Build_3001.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3001.prefab rename to Unity/Assets/Bundles/Building/Build_3001.prefab diff --git a/Unity/Assets/Bundles/Building/Build3001.prefab.meta b/Unity/Assets/Bundles/Building/Build_3001.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3001.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3001.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3002.prefab b/Unity/Assets/Bundles/Building/Build_3002.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3002.prefab rename to Unity/Assets/Bundles/Building/Build_3002.prefab diff --git a/Unity/Assets/Bundles/Building/Build3002.prefab.meta b/Unity/Assets/Bundles/Building/Build_3002.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3002.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3002.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3003.prefab b/Unity/Assets/Bundles/Building/Build_3003.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3003.prefab rename to Unity/Assets/Bundles/Building/Build_3003.prefab diff --git a/Unity/Assets/Bundles/Building/Build3003.prefab.meta b/Unity/Assets/Bundles/Building/Build_3003.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3003.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3003.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3004.prefab b/Unity/Assets/Bundles/Building/Build_3004.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3004.prefab rename to Unity/Assets/Bundles/Building/Build_3004.prefab diff --git a/Unity/Assets/Bundles/Building/Build3004.prefab.meta b/Unity/Assets/Bundles/Building/Build_3004.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3004.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3004.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3005.prefab b/Unity/Assets/Bundles/Building/Build_3005.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3005.prefab rename to Unity/Assets/Bundles/Building/Build_3005.prefab diff --git a/Unity/Assets/Bundles/Building/Build3005.prefab.meta b/Unity/Assets/Bundles/Building/Build_3005.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3005.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3005.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3006.prefab b/Unity/Assets/Bundles/Building/Build_3006.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3006.prefab rename to Unity/Assets/Bundles/Building/Build_3006.prefab diff --git a/Unity/Assets/Bundles/Building/Build3006.prefab.meta b/Unity/Assets/Bundles/Building/Build_3006.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3006.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3006.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3007.prefab b/Unity/Assets/Bundles/Building/Build_3007.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3007.prefab rename to Unity/Assets/Bundles/Building/Build_3007.prefab diff --git a/Unity/Assets/Bundles/Building/Build3007.prefab.meta b/Unity/Assets/Bundles/Building/Build_3007.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3007.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3007.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3008.prefab b/Unity/Assets/Bundles/Building/Build_3008.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3008.prefab rename to Unity/Assets/Bundles/Building/Build_3008.prefab diff --git a/Unity/Assets/Bundles/Building/Build3008.prefab.meta b/Unity/Assets/Bundles/Building/Build_3008.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3008.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3008.prefab.meta diff --git a/Unity/Assets/Bundles/Building/Build3009.prefab b/Unity/Assets/Bundles/Building/Build_3009.prefab similarity index 100% rename from Unity/Assets/Bundles/Building/Build3009.prefab rename to Unity/Assets/Bundles/Building/Build_3009.prefab diff --git a/Unity/Assets/Bundles/Building/Build3009.prefab.meta b/Unity/Assets/Bundles/Building/Build_3009.prefab.meta similarity index 100% rename from Unity/Assets/Bundles/Building/Build3009.prefab.meta rename to Unity/Assets/Bundles/Building/Build_3009.prefab.meta diff --git a/Unity/Assets/Bundles/FUI/AllItem_atlas0.png b/Unity/Assets/Bundles/FUI/AllItem_atlas0.png index a08d9d9..4ad60e4 100644 --- a/Unity/Assets/Bundles/FUI/AllItem_atlas0.png +++ b/Unity/Assets/Bundles/FUI/AllItem_atlas0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72d0470c0805adf9aa2c63adec9b3f19d144cbcad5dfb17b336e639f51ac4d21 -size 1624838 +oid sha256:88362319b38ca8cbc0785edb341b15d66c6c304f35719057ae370d735357a08d +size 2320117 diff --git a/Unity/Assets/Bundles/FUI/AllItem_fui.bytes b/Unity/Assets/Bundles/FUI/AllItem_fui.bytes index a041cef..db1f63e 100644 Binary files a/Unity/Assets/Bundles/FUI/AllItem_fui.bytes and b/Unity/Assets/Bundles/FUI/AllItem_fui.bytes differ diff --git a/Unity/Assets/Res/Images/Buildings/Build1001.png b/Unity/Assets/Res/Images/Buildings/Build_1001.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1001.png rename to Unity/Assets/Res/Images/Buildings/Build_1001.png diff --git a/Unity/Assets/Res/Images/Buildings/Build1001.png.meta b/Unity/Assets/Res/Images/Buildings/Build_1001.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1001.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_1001.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build1002.png b/Unity/Assets/Res/Images/Buildings/Build_1002.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1002.png rename to Unity/Assets/Res/Images/Buildings/Build_1002.png diff --git a/Unity/Assets/Res/Images/Buildings/Build1002.png.meta b/Unity/Assets/Res/Images/Buildings/Build_1002.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1002.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_1002.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build1004.png b/Unity/Assets/Res/Images/Buildings/Build_1004.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1004.png rename to Unity/Assets/Res/Images/Buildings/Build_1004.png diff --git a/Unity/Assets/Res/Images/Buildings/Build1004.png.meta b/Unity/Assets/Res/Images/Buildings/Build_1004.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1004.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_1004.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build1005.png b/Unity/Assets/Res/Images/Buildings/Build_1005.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1005.png rename to Unity/Assets/Res/Images/Buildings/Build_1005.png diff --git a/Unity/Assets/Res/Images/Buildings/Build1005.png.meta b/Unity/Assets/Res/Images/Buildings/Build_1005.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1005.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_1005.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build1006.png b/Unity/Assets/Res/Images/Buildings/Build_1006.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build1006.png rename to Unity/Assets/Res/Images/Buildings/Build_1006.png diff --git a/Unity/Assets/Res/Images/Buildings/Build1006.png.meta b/Unity/Assets/Res/Images/Buildings/Build_1006.png.meta similarity index 98% rename from Unity/Assets/Res/Images/Buildings/Build1006.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_1006.png.meta index 3175c0c..d0fd123 100644 --- a/Unity/Assets/Res/Images/Buildings/Build1006.png.meta +++ b/Unity/Assets/Res/Images/Buildings/Build_1006.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9e646eadf8e7224385da6343afb869b +guid: ff1beb4e83245a045bfabc3d96183aca TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Unity/Assets/Res/Images/Buildings/Build2001.png b/Unity/Assets/Res/Images/Buildings/Build_2001.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2001.png rename to Unity/Assets/Res/Images/Buildings/Build_2001.png diff --git a/Unity/Assets/Res/Images/Buildings/Build2001.png.meta b/Unity/Assets/Res/Images/Buildings/Build_2001.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2001.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_2001.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build2002.png b/Unity/Assets/Res/Images/Buildings/Build_2002.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2002.png rename to Unity/Assets/Res/Images/Buildings/Build_2002.png diff --git a/Unity/Assets/Res/Images/Buildings/Build2002.png.meta b/Unity/Assets/Res/Images/Buildings/Build_2002.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2002.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_2002.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build2003.png b/Unity/Assets/Res/Images/Buildings/Build_2003.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2003.png rename to Unity/Assets/Res/Images/Buildings/Build_2003.png diff --git a/Unity/Assets/Res/Images/Buildings/Build2003.png.meta b/Unity/Assets/Res/Images/Buildings/Build_2003.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2003.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_2003.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build2006.png b/Unity/Assets/Res/Images/Buildings/Build_2006.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2006.png rename to Unity/Assets/Res/Images/Buildings/Build_2006.png diff --git a/Unity/Assets/Res/Images/Buildings/Build2006.png.meta b/Unity/Assets/Res/Images/Buildings/Build_2006.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2006.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_2006.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build2007.png b/Unity/Assets/Res/Images/Buildings/Build_2007.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2007.png rename to Unity/Assets/Res/Images/Buildings/Build_2007.png diff --git a/Unity/Assets/Res/Images/Buildings/Build2007.png.meta b/Unity/Assets/Res/Images/Buildings/Build_2007.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build2007.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_2007.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3001.png b/Unity/Assets/Res/Images/Buildings/Build_3001.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3001.png rename to Unity/Assets/Res/Images/Buildings/Build_3001.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3001.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3001.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3001.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3001.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3002.png b/Unity/Assets/Res/Images/Buildings/Build_3002.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3002.png rename to Unity/Assets/Res/Images/Buildings/Build_3002.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3002.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3002.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3002.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3002.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3003.png b/Unity/Assets/Res/Images/Buildings/Build_3003.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3003.png rename to Unity/Assets/Res/Images/Buildings/Build_3003.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3003.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3003.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3003.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3003.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3004.png b/Unity/Assets/Res/Images/Buildings/Build_3004.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3004.png rename to Unity/Assets/Res/Images/Buildings/Build_3004.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3004.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3004.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3004.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3004.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3005.png b/Unity/Assets/Res/Images/Buildings/Build_3005.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3005.png rename to Unity/Assets/Res/Images/Buildings/Build_3005.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3005.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3005.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3005.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3005.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3006.png b/Unity/Assets/Res/Images/Buildings/Build_3006.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3006.png rename to Unity/Assets/Res/Images/Buildings/Build_3006.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3006.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3006.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3006.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3006.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3007.png b/Unity/Assets/Res/Images/Buildings/Build_3007.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3007.png rename to Unity/Assets/Res/Images/Buildings/Build_3007.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3007.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3007.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3007.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3007.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3008.png b/Unity/Assets/Res/Images/Buildings/Build_3008.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3008.png rename to Unity/Assets/Res/Images/Buildings/Build_3008.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3008.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3008.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3008.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3008.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/Build3009.png b/Unity/Assets/Res/Images/Buildings/Build_3009.png similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3009.png rename to Unity/Assets/Res/Images/Buildings/Build_3009.png diff --git a/Unity/Assets/Res/Images/Buildings/Build3009.png.meta b/Unity/Assets/Res/Images/Buildings/Build_3009.png.meta similarity index 100% rename from Unity/Assets/Res/Images/Buildings/Build3009.png.meta rename to Unity/Assets/Res/Images/Buildings/Build_3009.png.meta diff --git a/Unity/Assets/Res/Images/Buildings/BuildingAtlas.spriteatlas b/Unity/Assets/Res/Images/Buildings/BuildingAtlas.spriteatlas index 24f7173..e0dee11 100644 --- a/Unity/Assets/Res/Images/Buildings/BuildingAtlas.spriteatlas +++ b/Unity/Assets/Res/Images/Buildings/BuildingAtlas.spriteatlas @@ -51,33 +51,33 @@ SpriteAtlas: - {fileID: 21300000, guid: 49b30f3ae2be7ac448d810c3baecd3cf, type: 3} - {fileID: 21300000, guid: 13f90a7a83fd004459413f32479b3299, type: 3} - {fileID: 21300000, guid: a3a39eda891f4984b8034e03bd7e0864, type: 3} - - {fileID: 21300000, guid: a9e646eadf8e7224385da6343afb869b, type: 3} - {fileID: 21300000, guid: e556a99cc68e08847b888a527e1a02fe, type: 3} - {fileID: 21300000, guid: e046c08de67dad0429aacb6784aca8db, type: 3} - {fileID: 21300000, guid: 3aef39dd78e395747897e0f593f078d8, type: 3} - {fileID: 21300000, guid: c933030e51e77cf43b42918f7a9514e0, type: 3} + - {fileID: 21300000, guid: ff1beb4e83245a045bfabc3d96183aca, type: 3} - {fileID: 21300000, guid: 09f0829e697ef3d4b980428a2a85064d, type: 3} - {fileID: 21300000, guid: 242aa7ffd9e1b404aa7d4b5620f9f81e, type: 3} m_PackedSpriteNamesToIndex: - - Build2001 - - Build3004 - - Build1002 - - Build2002 - - Build2007 - - Build1001 - - Build3003 - - Build1005 - - Build3001 - - Build3007 - - Build2003 - - Build2006 - - Build1006 - - Build3006 - - Build3002 - - Build3009 - - Build1004 - - Build3005 - - Build3008 + - Build_2001 + - Build_3004 + - Build_1002 + - Build_2002 + - Build_2007 + - Build_1001 + - Build_3003 + - Build_1005 + - Build_3001 + - Build_3007 + - Build_2003 + - Build_2006 + - Build_3006 + - Build_3002 + - Build_3009 + - Build_1004 + - Build_1006 + - Build_3005 + - Build_3008 m_RenderDataMap: {} m_Tag: Assets/Res/Images/Buildings/BuildingAtlas.spriteatlas m_IsVariant: 0 diff --git a/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs b/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs index f13e06d..a4347b2 100644 --- a/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs @@ -169,6 +169,11 @@ namespace ET #endif } + public static SeasonConfig GetSeasonConfig(this Unit self) + { + return UnitOperate.GetSeasonConfigByDay(self.Day, self.Season); + } + public static void SetEmbattle(this Unit self, Dictionary FighterDic) { self.FighterDic = FighterDic; diff --git a/Unity/Codes/HotfixView/Demo/FUI/Logic/Building/FUIBuildingWindowComponentSystem.cs b/Unity/Codes/HotfixView/Demo/FUI/Logic/Building/FUIBuildingWindowComponentSystem.cs index e031511..4764529 100644 --- a/Unity/Codes/HotfixView/Demo/FUI/Logic/Building/FUIBuildingWindowComponentSystem.cs +++ b/Unity/Codes/HotfixView/Demo/FUI/Logic/Building/FUIBuildingWindowComponentSystem.cs @@ -1,5 +1,6 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ +using System; using FairyGUI; using UnityEngine; using UnityEngine.Search; @@ -70,7 +71,20 @@ namespace ET var synConfig = (SynthesisConfig) config.Value; if (synConfig.MixtureTpye == (int)MixtureType.Building) // 建筑 { - var buildingConfig = StructureConfigCategory.Instance.Get(synConfig.MixtureID); + StructureConfig buildingConfig = null; + try + { + buildingConfig = StructureConfigCategory.Instance.Get(synConfig.MixtureID); + } + catch (Exception e) + { + Console.WriteLine(e); + } + + if (buildingConfig == null) + { + continue; + } if (buildingConfig.Type == self.CurSelectBuildingType) { BuildingItem item = (BuildingItem) list.AddItemFromPool(); diff --git a/Unity/Codes/HotfixView/Demo/FUI/Logic/Main/FUIMainComponentSystem.cs b/Unity/Codes/HotfixView/Demo/FUI/Logic/Main/FUIMainComponentSystem.cs index 1d8ea81..a30a41b 100644 --- a/Unity/Codes/HotfixView/Demo/FUI/Logic/Main/FUIMainComponentSystem.cs +++ b/Unity/Codes/HotfixView/Demo/FUI/Logic/Main/FUIMainComponentSystem.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using ET.EventType; +using UnityEngine; namespace ET { @@ -141,7 +142,7 @@ namespace ET SeasonConfig seasonConfig = SeasonConfigCategory.Instance.Get(season); int seasonDay = WorldParametersConfigCategory.Instance.Get(WorldParam.SeasonDay).Value[0]; - string seasonName = seasonConfig.Name; ; + string seasonName = seasonConfig.Name; string fColor = string.Empty; string bColor = string.Empty; switch (season) @@ -151,17 +152,14 @@ namespace ET bColor = "#00FF00"; break; case 2: - seasonName = "夏"; fColor = "#00FF00"; bColor = "#FF6600"; break; case 3: - seasonName = "秋"; fColor = "#FF6600"; bColor = "#0066FF"; break; case 4: - seasonName = "冬"; fColor = "#0066FF"; bColor = "#CC0000"; break; @@ -209,6 +207,8 @@ namespace ET { tile2.FGComp.position = new Vector3(x + pgsFullWidth, 0, 0); } + + Game.EventSystem.Publish(new GameTime(){ Unit = unit, Hour = hour, Minute = minute}); } private static void OpenSeasonInfo(this FUIMainComponent self) @@ -231,17 +231,14 @@ namespace ET bColor = "#00FF00"; break; case 2: - seasonName = "夏"; fColor = "#00FF00"; bColor = "#FF6600"; break; case 3: - seasonName = "秋"; fColor = "#FF6600"; bColor = "#0066FF"; break; case 4: - seasonName = "冬"; fColor = "#0066FF"; bColor = "#CC0000"; break; diff --git a/Unity/Codes/HotfixView/Demo/FUI/Logic/Resource/FUIResourceWindowComponentSystem.cs b/Unity/Codes/HotfixView/Demo/FUI/Logic/Resource/FUIResourceWindowComponentSystem.cs index 72cebf0..a418f7e 100644 --- a/Unity/Codes/HotfixView/Demo/FUI/Logic/Resource/FUIResourceWindowComponentSystem.cs +++ b/Unity/Codes/HotfixView/Demo/FUI/Logic/Resource/FUIResourceWindowComponentSystem.cs @@ -175,7 +175,13 @@ namespace ET { for (int i = 0; i < resourceConfig.ExtraOut.Length; i++) { - var extraOutputConfig = ExtraOutputConfigCategory.Instance.Get(resourceConfig.ExtraOut[i]); + var extraOut = resourceConfig.ExtraOut[i]; + if (extraOut == 0) + { + continue; + } + + var extraOutputConfig = ExtraOutputConfigCategory.Instance.Get(extraOut); // var dropConfig = DropGroupConfigCategory.Instance.Get(extraOutputConfig.ItemId); var itemId = extraOutputConfig.ItemId; diff --git a/Unity/Codes/HotfixView/Demo/Scene/GameTime_UpdateLight.cs b/Unity/Codes/HotfixView/Demo/Scene/GameTime_UpdateLight.cs new file mode 100644 index 0000000..3302d41 --- /dev/null +++ b/Unity/Codes/HotfixView/Demo/Scene/GameTime_UpdateLight.cs @@ -0,0 +1,19 @@ +using ET.EventType; + +namespace ET +{ + public class GameTime_UpdateLight : AEvent + { + protected override void Run(GameTime args) + { + var peachValleyComp = args.Unit.ZoneScene().CurrentScene().GetComponent(); + + if (peachValleyComp == null) + { + return; + } + + peachValleyComp.UpdateLightByTime(args.Hour, args.Minute); + } + } +} \ No newline at end of file diff --git a/Unity/Codes/HotfixView/Demo/Scene/PeachValleyComponent.cs b/Unity/Codes/HotfixView/Demo/Scene/PeachValleyComponent.cs new file mode 100644 index 0000000..4140073 --- /dev/null +++ b/Unity/Codes/HotfixView/Demo/Scene/PeachValleyComponent.cs @@ -0,0 +1,52 @@ +using UnityEngine; +using UnityEngine.Rendering.Universal; +using UnityEngine.U2D; + +namespace ET +{ + public class PeachValleyComponentAwakeSystem: AwakeSystem + { + public override void Awake(PeachValleyComponent self) + { + self.Awake(); + } + } + + public static class PeachValleyComponentSystem + { + private const float MinutePerHouse = 60.0f; + public static void Awake(this PeachValleyComponent self) + { + self.GlobalLight = GameObject.Find("/GlobalLight").GetComponent(); + } + + public static void UpdateLightByTime(this PeachValleyComponent self, int hour, int minute) + { + if (hour > 0 && hour < 6) + { + self.GlobalLight.intensity = self.NightIntensity; + } + else if (hour >= 6 && hour < 16) + { + self.GlobalLight.color = self.DayColor; + self.GlobalLight.intensity = self.DayIntensity; + } + else if (hour >= 16 && hour < 17) + { + float percent = minute / MinutePerHouse; + self.GlobalLight.color = Color.Lerp(self.DayColor, self.SunsetColor, percent); + self.GlobalLight.intensity = Mathf.Lerp(self.DayIntensity, self.SunsetIntensity, percent); + } + else if (hour >= 17 && hour < 18) + { + float percent = minute / MinutePerHouse; + self.GlobalLight.intensity = Mathf.Lerp(self.SunsetIntensity, self.NightIntensity, percent); + } + else if (hour >= 18 && hour <= 24) + { + self.GlobalLight.color = self.DayColor; + self.GlobalLight.intensity = self.NightIntensity; + } + } + } +} diff --git a/Unity/Codes/HotfixView/Demo/Scene/SceneChangeStart_AddComponent.cs b/Unity/Codes/HotfixView/Demo/Scene/SceneChangeStart_AddComponent.cs index 18fdcd7..238e4de 100644 --- a/Unity/Codes/HotfixView/Demo/Scene/SceneChangeStart_AddComponent.cs +++ b/Unity/Codes/HotfixView/Demo/Scene/SceneChangeStart_AddComponent.cs @@ -39,6 +39,7 @@ namespace ET currentScene.AddComponent(); currentScene.AddComponent(); currentScene.AddComponent(); + currentScene.AddComponent(); Unit unit = UnitComponent.unit; diff --git a/Unity/Codes/Model/Core/Event/IEvent.cs b/Unity/Codes/Model/Core/Event/IEvent.cs index c2aa6bd..0a1bdb1 100644 --- a/Unity/Codes/Model/Core/Event/IEvent.cs +++ b/Unity/Codes/Model/Core/Event/IEvent.cs @@ -43,7 +43,7 @@ namespace ET return typeof (A); } - protected abstract void Run(A a); + protected abstract void Run(A args); public void Handle(A a) { diff --git a/Unity/Codes/Model/Demo/Unit/Unit.cs b/Unity/Codes/Model/Demo/Unit/Unit.cs index 567cd20..da921e0 100644 --- a/Unity/Codes/Model/Demo/Unit/Unit.cs +++ b/Unity/Codes/Model/Demo/Unit/Unit.cs @@ -62,9 +62,10 @@ namespace ET [BsonIgnore] public long UpdateValleyTime; - + [BsonIgnore] public SeasonConfig SeasonConfig; + [BsonIgnore] public long BattleId; diff --git a/Unity/Codes/ModelView/Demo/Scene/PeachValleyComponent.cs b/Unity/Codes/ModelView/Demo/Scene/PeachValleyComponent.cs new file mode 100644 index 0000000..6f161c1 --- /dev/null +++ b/Unity/Codes/ModelView/Demo/Scene/PeachValleyComponent.cs @@ -0,0 +1,16 @@ +using UnityEngine; +using UnityEngine.Rendering.Universal; + +namespace ET +{ + public class PeachValleyComponent: Entity, IAwake + { + public Light2D GlobalLight; + public Color SunsetColor = new Color(1, 0.8f,0.4f); + public Color DayColor = Color.white; + + public float DayIntensity = 1.0f; + public float SunsetIntensity = 0.5f; + public float NightIntensity = 0.2f; + } +} diff --git a/Unity/Codes/ModelView/Demo/ViewEventType.cs b/Unity/Codes/ModelView/Demo/ViewEventType.cs index c63a5d5..c1f28d9 100644 --- a/Unity/Codes/ModelView/Demo/ViewEventType.cs +++ b/Unity/Codes/ModelView/Demo/ViewEventType.cs @@ -41,5 +41,12 @@ namespace ET public long AttackerId; public long TargetId; } + + public struct GameTime + { + public Unit Unit; + public int Hour; + public int Minute; + } } } \ No newline at end of file