Commit 4f2e5489 authored by SherryChaos's avatar SherryChaos

MyCard Update

parent f39efe01
......@@ -15,28 +15,28 @@ MonoBehaviour:
m_GroupName: Prefab
m_GUID: 7c094f02978cc7b4381bcbc23867f4a1
m_SerializeEntries:
- m_GUID: 7d4efd242cec1c842a0e4e7265f1c614
m_Address: DuelPrefabs
- m_GUID: 02c91043684f6a242881ca48081026b3
m_Address: CardListItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b3d14bf1e85b69749a45e2e2b6dc16b8
m_Address: Items
- m_GUID: 1742a846ded491441b8c88bc64d8563f
m_Address: PopupDuelSelectCard
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ecdefd6bfde9ff14ba575ae1790d1e23
m_Address: TextureContainer
- m_GUID: 1bf5c7233eeff3d4bbde18036508cc10
m_Address: PopupSearchOrder
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b29b580caddf5cc4dbd68a9b3b8b3cf4
m_Address: AppearanceItem
- m_GUID: 1c23a57a1f226df41b4e82b4c948e996
m_Address: PopupDuelYesOrNo
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a5766182ec7221648b76d07b7ba2d2b4
m_Address: ButtonHostAddress
- m_GUID: 248673a4dcb02924f9d75ff4836b11d0
m_Address: OnlineDeckOnSelect
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
......@@ -45,58 +45,63 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 92023704990539444929b2b66f3adefb
m_Address: ButtonMonsterCutin
- m_GUID: 3166a00cfe00fbe4480a459014a87cf5
m_Address: PopupDuelInput
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e148d2228a762fc4abd6a91f96ad39fb
m_Address: ButtonTwoStageForPuzzle
- m_GUID: 376ee4be6da218548bcff4efe2a9702c
m_Address: PopupRockPaperScissors
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 52021a3ce6620a54aab293765f6ee1fe
m_Address: ButtonTwoStageForReplay
- m_GUID: 379855939c2877c4bbd1a7d6d1e68bbb
m_Address: ChatItemSystem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3f5fffcd248d6b44d9d5228eff3c21ec
m_Address: ButtonTwoStageForSolo
- m_GUID: 39697873c1073b9449a94b26523ee5c5
m_Address: CardOnEdit
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 02c91043684f6a242881ca48081026b3
m_Address: CardListItem
- m_GUID: 3efc94c5395f1764ca7a23342daf724f
m_Address: MessageCard
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 39697873c1073b9449a94b26523ee5c5
m_Address: CardOnEdit
- m_GUID: 3f5fffcd248d6b44d9d5228eff3c21ec
m_Address: ButtonTwoStageForSolo
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a7b6c57d0c1eb5b46bb3350b776ca7fb
m_Address: CardOnList
- m_GUID: 4ad2d53755714454ba62b9efb222fd02
m_Address: PopupSelection
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dcfc2b5ee4955ff4ab34c37e1bcff876
m_Address: ChatItemMe
- m_GUID: 52021a3ce6620a54aab293765f6ee1fe
m_Address: ButtonTwoStageForReplay
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cd4cb732ca0103e42a6a46056b4d77df
m_Address: ChatItemOp
- m_GUID: 5546c023a1a63f44a902a94920974f6a
m_Address: PopupSelectionItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 379855939c2877c4bbd1a7d6d1e68bbb
m_Address: ChatItemSystem
- m_GUID: 55cd0283ea1395741b79e3f0028bfec6
m_Address: ButtonWatchList
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f19643292c7362049ac05ce16cfc1e7a
m_Address: DeckOnSelect
- m_GUID: 7d4efd242cec1c842a0e4e7265f1c614
m_Address: DuelPrefabs
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7f82328728cccd949a929b323a6ec6ce
m_Address: PopupSearchFilter
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
......@@ -105,83 +110,88 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3efc94c5395f1764ca7a23342daf724f
m_Address: MessageCard
- m_GUID: 92023704990539444929b2b66f3adefb
m_Address: ButtonMonsterCutin
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d56e1c337cc49e94ebfba268e09ea992
m_Address: MessageItem
- m_GUID: 92618befbaca46b419d8a758dfb18164
m_Address: PopupDuelPosition
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0af4f28a448014468a39068e3925183
m_Address: PopupConfirm
- m_GUID: a5766182ec7221648b76d07b7ba2d2b4
m_Address: ButtonHostAddress
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3166a00cfe00fbe4480a459014a87cf5
m_Address: PopupDuelInput
- m_GUID: a7b6c57d0c1eb5b46bb3350b776ca7fb
m_Address: CardOnList
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e31e0126eb188e34192b03c781d544cc
m_Address: PopupDuelPhase
- m_GUID: b29b580caddf5cc4dbd68a9b3b8b3cf4
m_Address: AppearanceItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 92618befbaca46b419d8a758dfb18164
m_Address: PopupDuelPosition
- m_GUID: b3d14bf1e85b69749a45e2e2b6dc16b8
m_Address: Items
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1742a846ded491441b8c88bc64d8563f
m_Address: PopupDuelSelectCard
- m_GUID: b5381e98f7c24c74a8b6308e7d991caa
m_Address: PopupText
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ce73ce44e2b27d746b40914a6ec1a5c4
m_Address: PopupDuelSelectCardItem
- m_GUID: c0af4f28a448014468a39068e3925183
m_Address: PopupConfirm
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e0fa18609d04c96409d72c9e5fc78d6c
m_Address: PopupDuelSelection
- m_GUID: cd4cb732ca0103e42a6a46056b4d77df
m_Address: ChatItemOp
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1c23a57a1f226df41b4e82b4c948e996
m_Address: PopupDuelYesOrNo
- m_GUID: ce73ce44e2b27d746b40914a6ec1a5c4
m_Address: PopupDuelSelectCardItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e96857ec649a2d949aa20587f3fa0b2a
m_Address: PopupInput
- m_GUID: d56e1c337cc49e94ebfba268e09ea992
m_Address: MessageItem
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 376ee4be6da218548bcff4efe2a9702c
m_Address: PopupRockPaperScissors
- m_GUID: dc5aa99c209bd19488d5e51b5d159e2b
m_Address: PopupYesOrNoOrCancel
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7f82328728cccd949a929b323a6ec6ce
m_Address: PopupSearchFilter
- m_GUID: dcfc2b5ee4955ff4ab34c37e1bcff876
m_Address: ChatItemMe
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1bf5c7233eeff3d4bbde18036508cc10
m_Address: PopupSearchOrder
- m_GUID: e05ef8b21e4b8e6489bea68da574b806
m_Address: PopupYesOrNo
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4ad2d53755714454ba62b9efb222fd02
m_Address: PopupSelection
- m_GUID: e0fa18609d04c96409d72c9e5fc78d6c
m_Address: PopupDuelSelection
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5546c023a1a63f44a902a94920974f6a
m_Address: PopupSelectionItem
- m_GUID: e148d2228a762fc4abd6a91f96ad39fb
m_Address: ButtonTwoStageForPuzzle
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e31e0126eb188e34192b03c781d544cc
m_Address: PopupDuelPhase
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
......@@ -190,18 +200,18 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b5381e98f7c24c74a8b6308e7d991caa
m_Address: PopupText
- m_GUID: e96857ec649a2d949aa20587f3fa0b2a
m_Address: PopupInput
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e05ef8b21e4b8e6489bea68da574b806
m_Address: PopupYesOrNo
- m_GUID: ecdefd6bfde9ff14ba575ae1790d1e23
m_Address: TextureContainer
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 248673a4dcb02924f9d75ff4836b11d0
m_Address: OnlineDeckOnSelect
- m_GUID: f19643292c7362049ac05ce16cfc1e7a
m_Address: DeckOnSelect
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
......
......@@ -24,5 +24,5 @@ MonoBehaviour:
m_Settings: {fileID: 11400000, guid: e38330e9272b0a94a916f68bd5115c96, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: de30e0384f049fd41b40516a242b7e8b, type: 2}
- {fileID: 11400000, guid: 3cfc4f69803cb0d4dbafd14d5558c73d, type: 2}
- {fileID: 11400000, guid: de30e0384f049fd41b40516a242b7e8b, type: 2}
This diff is collapsed.
fileFormatVersion: 2
guid: b72fbb1df51e3e149ade6fe28a73d5d4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
MDPro3 v1.1.5更新:
1.新增斩杀动画:三幻神、青眼、黑魔术、真红眼。
2.集成MyCard功能,并增加以MyCard账号为依据的卡组同步。
3.修复卡片效果无效时,卡片特效依然播放的错误。
MDPro3 v1.1.4更新:
1.新增在线卡组功能。
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: db3f23043d1754d4b9c96ddb5ab457c9
folderAsset: yes
timeCreated: 1492395437
licenseType: Store
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Any:
second:
enabled: 0
settings: {}
data:
first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
data:
first:
Standalone: OSXIntel
second:
enabled: 1
settings: {}
data:
first:
Standalone: OSXIntel64
second:
enabled: 1
settings: {}
data:
first:
Standalone: OSXUniversal
second:
enabled: 1
settings: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 19150ffd969374afd9b181cd8c71f662
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>21G320</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>UniWebView</string>
<key>CFBundleIdentifier</key>
<string>com.onevcat.UniWebViewMac</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>UniWebView</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>14C18</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>13.1</string>
<key>DTSDKBuild</key>
<string>22C55</string>
<key>DTSDKName</key>
<string>macosx13.1</string>
<key>DTXcode</key>
<string>1420</string>
<key>DTXcodeBuild</key>
<string>14C18</string>
<key>LSMinimumSystemVersion</key>
<string>10.10</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017年 OneV's Den. All rights reserved.</string>
</dict>
</plist>
fileFormatVersion: 2
guid: 495312126946747a3b197461eaff9687
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 80fcb824c01d44613803213f4b1ed096
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict/>
<key>files2</key>
<dict/>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
This diff is collapsed.
fileFormatVersion: 2
guid: 55cd0283ea1395741b79e3f0028bfec6
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -28,9 +28,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746385571272}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -103,9 +103,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746225455783}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
......@@ -180,13 +180,13 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648746225455783}
- {fileID: 6305648746066734664}
- {fileID: 6305648746458738646}
- {fileID: 6305648746398079749}
m_Father: {fileID: 6305648747176641661}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -221,9 +221,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746617202834}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -300,9 +300,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648747174983254}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -379,11 +379,11 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648746484835619}
- {fileID: 6305648746177535860}
m_Father: {fileID: 6305648745328750899}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
......@@ -456,9 +456,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746225455783}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
......@@ -531,9 +531,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746066734664}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -572,9 +572,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: cdf4c81f8bf6eb248a105d8a5edf19fd, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 2
m_MaxSize: 40
m_MaxSize: 25
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
......@@ -610,11 +610,11 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648746082042701}
- {fileID: 6305648745316138392}
m_Father: {fileID: 6305648745328750899}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
......@@ -686,11 +686,11 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7776129882806202646}
- {fileID: 6305648747176641661}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -746,9 +746,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648745328750899}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -821,11 +821,11 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648747174983254}
- {fileID: 6305648746617202834}
m_Father: {fileID: 6305648745328750899}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
......@@ -898,9 +898,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746066734664}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -975,10 +975,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648745512110531}
m_Father: {fileID: 6305648746458738646}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
......@@ -1123,10 +1123,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648747218796591}
m_Father: {fileID: 6305648747176641661}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......@@ -1201,10 +1201,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648745631350335}
m_Father: {fileID: 6305648746458738646}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
......@@ -1347,11 +1347,11 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6305648746763370051}
- {fileID: 6305648745328750899}
m_Father: {fileID: 6305648746385571272}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -1386,9 +1386,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6305648746763370051}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
......
This diff is collapsed.
fileFormatVersion: 2
guid: dc5aa99c209bd19488d5e51b5d159e2b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 5798534189433487584
- rid: 5798534627664068694
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 5798534189433487585
- rid: 5798534189433487586
- rid: 5798534627664068695
- rid: 5798534627664068696
- rid: 5650211206403981518
- rid: 5798534189433487587
- rid: 5798534627664068697
- rid: 5650211206403981520
- rid: 5798534189433487588
- rid: 5798534627664068698
- rid: 5650211206403981522
- rid: 5798534189433487589
- rid: 5798534189433487590
- rid: 5798534189433487591
- rid: 5798534189433487592
- rid: 5798534189433487593
- rid: 5798534627664068699
- rid: 5798534627664068700
- rid: 5798534627664068701
- rid: 5798534627664068702
- rid: 5798534627664068703
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -159,7 +159,7 @@ MonoBehaviour:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 5798534189433487584
- rid: 5798534627664068694
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -174,14 +174,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 5798534189433487585
- rid: 5798534627664068695
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 5798534189433487586
- rid: 5798534627664068696
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -189,7 +189,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 5798534189433487587
- rid: 5798534627664068697
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -201,7 +201,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 5798534189433487588
- rid: 5798534627664068698
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -214,7 +214,7 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 5798534189433487589
- rid: 5798534627664068699
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -227,12 +227,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
- rid: 5798534189433487590
- rid: 5798534627664068700
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5798534189433487591
- rid: 5798534627664068701
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -242,14 +242,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5798534189433487592
- rid: 5798534627664068702
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 5798534189433487593
- rid: 5798534627664068703
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
......@@ -70,6 +70,7 @@ namespace MDPro3
public enum ItemType
{
Unknown,
Wallpaper,
Face,
Frame,
......@@ -104,7 +105,7 @@ namespace MDPro3
Dictionary<int, string> descriptions = new Dictionary<int, string>();
Dictionary<int, int> ydkIds = new Dictionary<int, int>();
static Items instance;
static bool initialized = false;
public static bool initialized = false;
public void Initialize()
{
if (!initialized)
......@@ -300,9 +301,12 @@ namespace MDPro3
}
return returnValue;
}
public string CodeToPath(string code, ItemType type)
public string GetPathByCode(string code, ItemType type)
{
string returnValue = "";
if(type == ItemType.Unknown)
return CodeToIconPath(code);
foreach (var kind in kinds)
foreach (var item in kind)
if (item.id.ToString() == code)
......
......@@ -371,6 +371,27 @@ MonoBehaviour:
toggleM: {fileID: 21300000, guid: b4b6f990bf52e9e41a3157d2c0701a28, type: 3}
toggleM_On: {fileID: 21300000, guid: 77342bb8b8bac73418a111be27a694e5, type: 3}
toggleM_Over: {fileID: 21300000, guid: 03c22d822bdf72e4680c02fb6caa13a5, type: 3}
rankBG01: {fileID: 21300000, guid: 005f18c0af5a8b74296cedaadea495bd, type: 3}
rankBG02: {fileID: 21300000, guid: 3a0f13be6eefecb459ca292b26396fc1, type: 3}
rankBG03: {fileID: 21300000, guid: 05e08c283e0324d46a3d6fdf42e39744, type: 3}
rankBG04: {fileID: 21300000, guid: 4a40087de21d1634aa2ae89a008c063a, type: 3}
rankBG05: {fileID: 21300000, guid: c4a9f53bc5bcaaf43b63f3505842b2c7, type: 3}
rankBG06: {fileID: 21300000, guid: 4e07ed95ac6f2ed4fb512bec5b578183, type: 3}
rankBG07: {fileID: 21300000, guid: ec6f0285a5f1c5e4bbed8c4bef6f7a40, type: 3}
rankBG08: {fileID: 21300000, guid: d90c16009eabc014db142d529b779969, type: 3}
rankIcon01: {fileID: 21300000, guid: 67fa771e6c68dec4096c059f22a288c0, type: 3}
rankIcon02: {fileID: 21300000, guid: 08fd75c4e54ad1141b6ef4497fb35d2c, type: 3}
rankIcon03: {fileID: 21300000, guid: ca6fc01f6d6a9a040983d4e3b724ba03, type: 3}
rankIcon04: {fileID: 21300000, guid: 96495b3dca03bef4cbb4c98bf6f248f0, type: 3}
rankIcon05: {fileID: 21300000, guid: 5fdfa681bf6c0664da907b3acf04c941, type: 3}
rankIcon06: {fileID: 21300000, guid: 1069dc6e8385e4349a1719bfc2ae64bf, type: 3}
rankIcon07: {fileID: 21300000, guid: 594b2da68531f8748bde385e1c723438, type: 3}
rankIcon08: {fileID: 21300000, guid: 3a644e2a25fa1e840aba0896ccac2915, type: 3}
rankTier01: {fileID: 21300000, guid: 61627c4771c861343afe3cc32446146c, type: 3}
rankTier02: {fileID: 21300000, guid: 9153b3144c7b93146abf018a5612a677, type: 3}
rankTier03: {fileID: 21300000, guid: 4d65ae8b11291f6429d680286710791c, type: 3}
rankTier04: {fileID: 21300000, guid: fd3bc6ca40194e342b6c7209d3eca9d3, type: 3}
rankTier05: {fileID: 21300000, guid: 7ae049f51102ee24a8cd1ef346c430f6, type: 3}
fxt_Arrow: {fileID: 2800000, guid: f7b877a77c7530543815b9cd571203ee, type: 3}
fxt_Arrow_002: {fileID: 2800000, guid: cc77cec8332acc04eb877183efcec954, type: 3}
fxt_Arrow_003: {fileID: 2800000, guid: 89ee305204be7844abd1fc33fd0e8db7, type: 3}
......
using MDPro3;
using MDPro3.YGOSharp.OCGWrapper.Enums;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
......@@ -315,6 +316,29 @@ public class TextureContainer : ScriptableObject
public Sprite toggleM_On;
public Sprite toggleM_Over;
[Header("Rank")]
public Sprite rankBG01;
public Sprite rankBG02;
public Sprite rankBG03;
public Sprite rankBG04;
public Sprite rankBG05;
public Sprite rankBG06;
public Sprite rankBG07;
public Sprite rankBG08;
public Sprite rankIcon01;
public Sprite rankIcon02;
public Sprite rankIcon03;
public Sprite rankIcon04;
public Sprite rankIcon05;
public Sprite rankIcon06;
public Sprite rankIcon07;
public Sprite rankIcon08;
public Sprite rankTier01;
public Sprite rankTier02;
public Sprite rankTier03;
public Sprite rankTier04;
public Sprite rankTier05;
[Header("Other")]
public Texture2D fxt_Arrow;
public Texture2D fxt_Arrow_002;
......@@ -403,4 +427,117 @@ public class TextureContainer : ScriptableObject
return returnValue;
}
int[] rankRange = new int[]
{
1000,
1100,
1200,
1300,
1400,
1500,
1600,
1700
};
public List<Sprite> GetRankSprites(int rank)
{
var returnValue = new List<Sprite>();
if(rank < rankRange[1])
{
returnValue.Add(rankBG01);
returnValue.Add(rankIcon01);
returnValue.Add(GetRankTier(rankRange[0], rankRange[1], rank));
returnValue.Add(transparent);
returnValue.Add(transparent);
}
else if(rank < rankRange[2])
{
returnValue.Add(rankBG02);
returnValue.Add(rankIcon02);
returnValue.Add(GetRankTier(rankRange[1], rankRange[2], rank));
returnValue.Add(transparent);
returnValue.Add(transparent);
}
else if(rank < rankRange[3])
{
returnValue.Add(rankBG03);
returnValue.Add(rankIcon03);
returnValue.Add(GetRankTier(rankRange[2], rankRange[3], rank));
returnValue.Add(transparent);
returnValue.Add(transparent);
}
else if (rank < rankRange[4])
{
returnValue.Add(rankBG04);
returnValue.Add(rankIcon04);
returnValue.Add(GetRankTier(rankRange[3], rankRange[4], rank));
returnValue.Add(transparent);
returnValue.Add(transparent);
}
else if (rank < rankRange[5])
{
returnValue.Add(rankBG05);
returnValue.Add(rankIcon05);
returnValue.Add(transparent);
returnValue.Add(GetRankTier(rankRange[4], rankRange[5], rank));
returnValue.Add(transparent);
}
else if (rank < rankRange[6])
{
returnValue.Add(rankBG06);
returnValue.Add(rankIcon06);
returnValue.Add(transparent);
returnValue.Add(GetRankTier(rankRange[5], rankRange[6], rank));
returnValue.Add(transparent);
}
else if (rank < rankRange[7])
{
returnValue.Add(rankBG07);
returnValue.Add(rankIcon07);
returnValue.Add(transparent);
returnValue.Add(transparent);
returnValue.Add(GetRankTier(rankRange[6], rankRange[7], rank));
}
else
{
returnValue.Add(rankBG08);
returnValue.Add(rankIcon08);
returnValue.Add(transparent);
returnValue.Add(transparent);
returnValue.Add(transparent);
}
return returnValue;
}
Sprite GetRankTier(int rankStart, int rankEnd, int rank)
{
if(rank > rankEnd)
return rankTier05;
if (rank < rankStart)
return rankTier01;
int rangeLength = rankEnd - rankStart;
int segmentSize = rangeLength / 5;
int tier = (int)Math.Floor((double)(rank - rankStart) / segmentSize);
switch (tier)
{
case 0:
return rankTier01;
case 1:
return rankTier02;
case 2:
return rankTier03;
case 3:
return rankTier04;
case 4:
return rankTier05;
default:
return rankTier01;
}
}
}
......@@ -22,6 +22,8 @@ namespace MDPro3.YGOSharp
public const string defaultDeckAuthor = "mdpro3";
public string author = defaultDeckAuthor;
public string userId;
public string deckId;
public Deck()
{
......@@ -52,11 +54,15 @@ namespace MDPro3.YGOSharp
Stand = d.Stand;
Mate = d.Mate;
author = d.author;
userId = d.userId;
deckId = d.deckId;
}
public Deck(string text, string author = defaultDeckAuthor)
public Deck(string text, string author = defaultDeckAuthor, string deckID = "", string userID = "")
{
this.author = author;
deckId = deckID;
userId = userID;
Main = new List<int>();
Extra = new List<int>();
......@@ -73,6 +79,7 @@ namespace MDPro3.YGOSharp
string st = text.Replace("\r", "");
string[] lines = st.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
int flag = -1;
foreach (string line in lines)
{
if (line.StartsWith(deckPrefix))
......@@ -85,6 +92,18 @@ namespace MDPro3.YGOSharp
}
continue;
}
if (line.StartsWith("###") && userId == string.Empty)
{
userId = line.Replace("###", string.Empty);
continue;
}
if (line.StartsWith("##") && deckId == string.Empty)
{
deckId = line.Replace("##", string.Empty);
if (!OnlineDeck.StringIsIdFormat(deckId))
deckId = string.Empty;
continue;
}
if (line == "#main")
flag = 1;
......
......@@ -61,6 +61,8 @@ namespace MDPro3
canJoin = false;
try
{
Debug.LogFormat("Try Address: {0}, Port: {1}, Password: {2}", ipString, portString, pswString);
tcpClient = new TcpClientWithTimeout(ipString, int.Parse(portString), 3000).Connect();
networkStream = tcpClient.GetStream();
var t = new Thread(Receiver);
......@@ -72,6 +74,7 @@ namespace MDPro3
joinedAddress = ipString;
joinedPort = portString;
joinedPassword = pswString;
Debug.LogFormat("Joind Address: {0}, Port: {1}, Password: {2}", joinedAddress, joinedPort, joinedPassword);
}
catch (Exception e)
{
......
......@@ -326,7 +326,7 @@ namespace MDPro3
}
else
{
var ie = LoadFromFileAsync("MasterDuel/" + Program.items.CodeToPath(code.ToString(), Items.ItemType.Mate));
var ie = LoadFromFileAsync("MasterDuel/" + Program.items.GetPathByCode(code.ToString(), Items.ItemType.Mate));
while (ie.MoveNext())
yield return null;
var mateGo = ie.Current;
......
using DG.Tweening;
using MDPro3;
using MDPro3.Net;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class NewsManager : Manager
{
public MyCardNews news;
public RawImage newsPic;
public RawImage newsPic2;
public Text newsText;
public Text newsText2;
public Text textCount;
List<Texture2D> newsPics = new List<Texture2D>();
bool showing;
float width = 455f;
int maxLoad = 5;
private void Start()
{
Hide();
width = GetComponent<RectTransform>().rect.width;
}
float idleTime;
private void Update()
{
if (!showing)
return;
if (!Program.I().menu.isShowed)
return;
idleTime += Time.deltaTime;
if (idleTime > 5f)
OnRight(0.2f);
}
int GetMax()
{
if(news == null)
return 0;
return news.ChineseCN.Length > maxLoad ? maxLoad : news.ChineseCN.Length;
}
public void Show()
{
if (news == null || newsPics.Count == 0)
return;
var cg = GetComponent<CanvasGroup>();
cg.alpha = 1.0f;
cg.interactable = true;
cg.blocksRaycasts = true;
showing = true;
newsPic.texture = newsPics[0];
newsText.text = news.ChineseCN[0].title;
newsPic.rectTransform.anchoredPosition = new Vector2(0, 0);
newsPic2.rectTransform.anchoredPosition = new Vector2(-width, 0);
currentNewsIndex = 0;
textCount.text = $"{currentNewsIndex + 1}/{GetMax()}";
}
public void Hide()
{
var cg = GetComponent<CanvasGroup>();
cg.alpha = 0f;
cg.interactable = false;
cg.blocksRaycasts = false;
showing = false;
}
public void LoadNews()
{
if (news == null)
return;
StartCoroutine(LoadNewsAsync());
}
IEnumerator LoadNewsAsync()
{
Hide();
for(int i = 0; i < news.ChineseCN.Length && i < maxLoad; i++)
{
var load = Tools.DownloadImageAsync(news.ChineseCN[i].image);
while(!load.IsCompleted)
yield return null;
newsPics.Add(load.Result);
if(i == 0)
Show();
}
}
int currentNewsIndex = 0;
public void OnRight(float moveTime = 0.1f)
{
idleTime = 0f;
if (news.ChineseCN.Length < 2)
return;
var next = (currentNewsIndex + 1) % GetMax();
if (newsPics.Count < currentNewsIndex + 1)
newsPic.texture = null;
else
newsPic.texture = newsPics[currentNewsIndex];
newsText.text = news.ChineseCN[currentNewsIndex].title;
if (newsPics.Count < next + 1)
newsPic2.texture = null;
else
newsPic2.texture = newsPics[next];
newsText2.text = news.ChineseCN[next].title;
currentNewsIndex = next;
textCount.text = $"{currentNewsIndex + 1}/{GetMax()}";
newsPic.transform.localPosition = new Vector2 (0, 0);
newsPic2.transform.localPosition = new Vector2(width, 0);
newsPic.transform.DOLocalMoveX(-width, moveTime);
newsPic2.transform.DOLocalMoveX(0, moveTime);
}
public void OnLeft(float moveTime = 0.1f)
{
idleTime = 0f;
if (news.ChineseCN.Length < 2)
return;
var max = GetMax();
var next = (max + currentNewsIndex - 1) % max;
if (newsPics.Count < currentNewsIndex + 1)
newsPic.texture = null;
else
newsPic.texture = newsPics[currentNewsIndex];
newsText.text = news.ChineseCN[currentNewsIndex].title;
if(newsPics.Count < next + 1)
newsPic2.texture = null;
else
newsPic2.texture = newsPics[next];
newsText2.text = news.ChineseCN[next].title;
currentNewsIndex = next;
textCount.text = $"{currentNewsIndex + 1}/{GetMax()}";
newsPic.transform.localPosition = new Vector2(0, 0);
newsPic2.transform.localPosition = new Vector2(-width, 0);
newsPic.transform.DOLocalMoveX(width, moveTime);
newsPic2.transform.DOLocalMoveX(0, moveTime);
}
public void OnNewsClick()
{
Application.OpenURL(news.ChineseCN[currentNewsIndex].url);
}
public void OnClose()
{
Hide();
}
}
fileFormatVersion: 2
guid: 1879e88758561d7478cf6adfd818c929
\ No newline at end of file
using ICSharpCode.SharpZipLib.Zip;
using System.Collections;
using System.Collections.Generic;
using System.IO;
......@@ -14,6 +13,7 @@ using UnityEngine.UI;
using System.Collections.Concurrent;
using System.Linq;
using System;
using System.Threading.Tasks;
namespace MDPro3
{
......@@ -125,9 +125,9 @@ namespace MDPro3
yield break;
string fullPath;
#if !UNITY_EDITOR && UNITY_ANDROID
fullPath = "file://" + Application.persistentDataPath + Program.slash + path;
fullPath = "file://" + Application.persistentDataPath + Program.slash + path;
#else
fullPath = System.Environment.CurrentDirectory + Program.slash + path;
fullPath = Environment.CurrentDirectory + Program.slash + path;
#endif
UnityWebRequest request = UnityWebRequestTexture.GetTexture(fullPath);
request.SendWebRequest();
......@@ -137,6 +137,25 @@ namespace MDPro3
request.Dispose();
}
public static async Task<Texture2D> LoadPicFromLocalFileAsync(string path)
{
if (!File.Exists(path))
return null;
string fullPath;
#if !UNITY_EDITOR && UNITY_ANDROID
fullPath = "file://" + Application.persistentDataPath + Program.slash + path;
#else
fullPath = Environment.CurrentDirectory + Program.slash + path;
#endif
UnityWebRequest request = UnityWebRequestTexture.GetTexture(fullPath);
await request.SendWebRequest();
if(request.result == UnityWebRequest.Result.Success)
return DownloadHandlerTexture.GetContent(request);
else
return null;
}
static readonly object artLock = new object();
static bool loadingArt = false;
public IEnumerator<Texture2D> LoadArtAsync(int code, bool cache = false)
......@@ -371,9 +390,6 @@ namespace MDPro3
}
}
/// <summary>
/// Default cache
/// </summary>
public IEnumerator<Texture2D> LoadCardAsync(int code)
{
if (cachedCards.TryGetValue(code, out var returnValue))
......@@ -856,7 +872,7 @@ namespace MDPro3
}
public static IEnumerator<Sprite> LoadItemIcon(string id)
public static IEnumerator<Sprite> LoadItemIcon(string id, Items.ItemType type)
{
if (cachedIcons.ContainsKey(id))
{
......@@ -866,6 +882,10 @@ namespace MDPro3
var handle = Addressables.LoadAssetAsync<Sprite>(Items.CodeToIconPath(id));
while (!handle.IsDone)
yield return null;
if (handle.Result == null)
yield break;
Sprite returnValue;
if (cachedIcons.ContainsKey(id))
{
......@@ -954,5 +974,6 @@ namespace MDPro3
return container.chainNumSet0;
}
}
}
}
......@@ -9,6 +9,7 @@ using Spine.Unity;
using TMPro;
using UnityEngine.AddressableAssets;
using MDPro3.UI;
using MDPro3.Net;
namespace MDPro3
{
......@@ -56,6 +57,7 @@ namespace MDPro3
CardsManager.Initialize();
Program.items.Initialize();
Program.I().cardRenderer.SwitchLanguage();
Program.I().online.LocalHostInitialize();
UIManager instance = Program.I().ui_;
foreach (var text in instance.GetComponentsInChildren<Text>(true))
{
......@@ -220,7 +222,19 @@ namespace MDPro3
popupYesOrNo.Show();
};
}
public static void ShowPopupYesOrNoOrCancel(List<string> selections, Action confirmAction, Action cancelAction)
{
var handle = Addressables.InstantiateAsync("PopupYesOrNoOrCancel");
handle.Completed += (result) =>
{
result.Result.transform.SetParent(Program.I().ui_.popup, false);
PopupYesOrNo popupYesOrNo = result.Result.GetComponent<PopupYesOrNo>();
popupYesOrNo.selections = selections;
popupYesOrNo.confirmAction = confirmAction;
popupYesOrNo.cancelAction = cancelAction;
popupYesOrNo.Show();
};
}
public static void ShowPopupConfirm(List<string> selections)
{
var handle = Addressables.InstantiateAsync("PopupConfirm");
......
fileFormatVersion: 2
guid: beb704b8c8fa63a499d2a844fd58219d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Data.Common;
using System.Diagnostics;
namespace MDPro3
namespace MDPro3.Net
{
public class DeckShareURL
{
......
This diff is collapsed.
fileFormatVersion: 2
guid: a88129aed4c79c743856ea4e8bf6bf76
\ No newline at end of file
......@@ -25,6 +25,7 @@ namespace MDPro3
public TextureManager texture_;
public MessageManager message_;
public TimelineManager timeline_;
public NewsManager news_;
[Header("Servants")]
public Menu menu;
......@@ -444,6 +445,8 @@ namespace MDPro3
}
catch { }
TcpHelper.tcpClient = null;
MyCard.CloseAthleticWatchListWebSocket();
}
void ClearCache()
......
This diff is collapsed.
......@@ -110,9 +110,9 @@ namespace MDPro3
};
}
public override void Show(int preDepth)
public override void ApplyShowArrangement(int preDepth)
{
base.Show(preDepth);
base.ApplyShowArrangement(preDepth);
Program.I().camera_.light.gameObject.SetActive(true);
CameraManager.DuelOverlay2DPlus();
CameraReset();
......
......@@ -11,13 +11,13 @@ using YgomSystem.LocalFileSystem.Internal;
using System.IO;
using MDPro3.YGOSharp;
using MDPro3.YGOSharp.OCGWrapper.Enums;
using MDPro3.Net;
namespace MDPro3
{
public class Menu : Servant
{
public Text title;
//public Text debugText;
public override void Initialize()
{
depth = 0;
......@@ -25,6 +25,7 @@ namespace MDPro3
base.Initialize();
title.text = "MDPro3 v" + Application.version;
StartCoroutine(CheckUpdate());
StartCoroutine(LoadMyCardNewsAsync());
}
private IEnumerator CheckUpdate()
......@@ -62,6 +63,19 @@ namespace MDPro3
}
IEnumerator LoadMyCardNewsAsync()
{
var news = MyCard.GetNews();
while (!news.IsCompleted)
yield return null;
Program.I().news_.news = news.Result;
Program.I().news_.LoadNews();
}
public void OnSolo()
{
if(Program.exitOnReturn)
......
This diff is collapsed.
This diff is collapsed.
......@@ -37,12 +37,15 @@ public class OnlineDeckViewer : Servant
public override void ApplyHideArrangement(int preDepth)
{
base.ApplyHideArrangement(preDepth);
DOTween.To(v => { }, 0, 0, transitionTime).OnComplete(() =>
DOTween.To(v => { }, 0, 0, transitionTime * 0.9f).OnComplete(() =>
{
btnPickup.OnSwitchOff();
if (superScrollView != null)
foreach (var item in superScrollView.items)
{
item.gameObject.transform.SetParent(Program.I().container_2D, false);
item.gameObject.GetComponent<SuperScrollViewItemForOnlineDeckSelect>().Dispose();
}
Clear();
});
}
......
This diff is collapsed.
......@@ -39,11 +39,12 @@ namespace MDPro3
handle.Completed += (result) => { item = result.Result; };
}
public override void Show(int preDepth)
public override void ApplyShowArrangement(int preDepth)
{
base.Show(preDepth);
base.ApplyShowArrangement(preDepth);
Print();
}
public override void OnExit()
{
if (Program.exitOnReturn)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -47,7 +47,7 @@ namespace MDPro3.UI
}
else if (path.Length > 0)
{
var load = TextureManager.LoadItemIcon(itemID.ToString());
var load = TextureManager.LoadItemIcon(itemID.ToString(), Items.ItemType.Unknown);
while (load.MoveNext())
yield return null;
icon.sprite = load.Current;
......
This diff is collapsed.
fileFormatVersion: 2
guid: 8208e80c6b5628b42a2a368a679feba6
\ No newline at end of file
This diff is collapsed.
fileFormatVersion: 2
guid: 59717f390fbebbe4ab38bcd84a535a46
\ No newline at end of file
......@@ -16,6 +16,7 @@ namespace MDPro3.UI
Text text;
Color textColor;
public float pressColor = 0.5f;
private void Awake()
{
text = transform.GetChild(0).GetComponent<Text>();
......@@ -46,13 +47,15 @@ namespace MDPro3.UI
{
selected = true;
GetComponent<Image>().sprite = selectedSprite;
if(text == null)
text = transform.GetChild(0).gameObject.GetComponent<Text>();
text.color = Color.black;
if (scrollRect != null)
{
scrollRect.gameObject.SetActive(true);
scrollRect.normalizedPosition = new Vector2(0, 1);
}
foreach (var btn in transform.parent.GetComponentsInChildren<ButtonList>())
foreach (var btn in transform.parent.GetComponentsInChildren<ButtonList>(true))
{
if (btn != this)
btn.UnselectThis();
......@@ -63,6 +66,8 @@ namespace MDPro3.UI
{
selected = false;
GetComponent<Image>().sprite = normalSprite;
if (text == null)
text = transform.GetChild(0).gameObject.GetComponent<Text>();
text.color = Color.white;
if (scrollRect != null)
scrollRect.gameObject.SetActive(false);
......
using MDPro3.UI;
using UnityEngine;
namespace MDPro3.UI
{
public class ButtonListForOnline : ButtonList
{
public int id = 0;
public override void SelectThis()
{
base.SelectThis();
Program.I().online.SwitchFunction(id);
}
}
}
fileFormatVersion: 2
guid: b99721c2739756e4d830c98fd5f5ee56
\ No newline at end of file
This diff is collapsed.
......@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using MDPro3.Net;
namespace MDPro3.UI
{
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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