mushroom
/
squidGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
squidGame/tgx-games-client/assets/module_arean/scripts
History
MushrooMagician b41f6e9453 Merge remote-tracking branch 'origin/feature/xk/language' into dajun 
# Conflicts:
#	tgx-games-client/assets/Prefebs.meta
#	tgx-games-client/assets/Prefebs/role/Character001.prefab
#	tgx-games-client/assets/Prefebs/role/Character002.prefab
#	tgx-games-client/assets/Prefebs/role/Character003.prefab
#	tgx-games-client/assets/level1/Script/AreanPlayer.ts.meta
#	tgx-games-client/assets/level1/Script/BattleView.ts.meta
#	tgx-games-client/assets/level1/Script/PlayerController.ts
#	tgx-games-client/assets/level1/Script/WoodenManGame.ts.meta
#	tgx-games-client/assets/level1/Script/gameManager.ts
#	tgx-games-client/assets/level1/Script/player.ts
#	tgx-games-client/assets/level1/UI/图层 0.png.meta
#	tgx-games-client/assets/level1/scene/level1Scene.scene
#	tgx-games-client/assets/level3/scene/BallScene.scene
#	tgx-games-client/assets/level3/script/GameManager.ts
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_bluegray.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_red.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_yellow.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_sqeure_01.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Label/label_tag_01_Demo.png.meta
#	tgx-games-client/assets/module_arean/common/role/doll.prefab
#	tgx-games-client/assets/module_arean/common/role/red_c.prefab
#	tgx-games-client/assets/module_arean/lobby_arean.scene
#	tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
#	tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
#	tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts
#	tgx-games-client/assets/module_arean/ui_searching_rival/ui_searching_rival.prefab
#	tgx-games-client/assets/module_basic/scripts/FrontConfig.ts
#	tgx-games-client/tsconfig.json
#	tgx-games-server/src/SrvGame/RoomArean.ts
#	tgx-games-server/src/db/mongodb/MongoDBHero.ts
#	tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
#	tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
 		2025-02-21 14:15:16 +08:00
..
DataConfig 多语言，登录完善 2025-02-18 09:45:06 +08:00
common Merge branch 'dajun' into dev 2025-02-21 11:06:26 +08:00
AreanGameAudioMgr.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanGameAudioMgr.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanGameHUD.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanGameHUD.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanGameScene.ts Merge remote-tracking branch 'origin/feature/xk/language' into dajun 2025-02-21 14:15:16 +08:00
AreanGameScene.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanLobbyScene.ts Merge branch 'dajun' into dev 2025-02-21 11:06:26 +08:00
AreanLobbyScene.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanManager.ts Merge remote-tracking branch 'origin/feature/xk/language' into dajun 2025-02-21 14:15:16 +08:00
AreanManager.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanNetMgr.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanNetMgr.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanPlayer.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
AreanPlayer.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
BaseUI.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
BaseUI.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
BottomNode.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
BottomNode.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ChatAndFriend.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ChatAndFriend.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
CommonFun.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
CommonFun.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
DataConfig.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
GamePlayerInfo.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
GamePlayerInfo.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
Layout_UICurrencyTips.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
Layout_UICurrencyTips.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
MidNode.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
MidNode.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ResourceBar.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ResourceBar.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
RoomList.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
RoomList.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
RoomListItem.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
RoomListItem.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
UICurrencyTips.ts 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
UICurrencyTips.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
UserHead.ts 多语言，登录完善 2025-02-18 09:45:06 +08:00
UserHead.ts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
common.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
interface.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00