mushroom
/
squidGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
squidGame/tgx-games-client/assets/module_arean
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
..
Define 暂存 2025-02-21 10:51:34 +08:00
common 暂存 2025-02-21 11:06:39 +08:00
scripts Merge remote-tracking branch 'origin/feature/xk/language' into dajun 2025-02-21 14:15:16 +08:00
shop 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_announcement 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_bag 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_battle_loading 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_buy_prop_screen 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_chat 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_common_item_info 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_common_reward 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_create_room 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_enter_room 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_mail 多语言，登录完善 2025-02-18 09:45:06 +08:00
ui_more_model 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_notice 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_player_info 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_searching_rival Merge branch 'dajun' into dev 2025-02-21 11:06:26 +08:00
ui_set_room 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_settings 多语言，登录完善 2025-02-18 09:45:06 +08:00
Define.meta 暂存 2025-02-21 10:51:34 +08:00
GameHUD.prefab 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
GameHUD.prefab.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
GameScreen.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
HomeScreen.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
common.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
game_arean.scene 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
game_arean.scene.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
lobby_arean.scene 解决合并冲突 2025-02-21 11:22:13 +08:00
lobby_arean.scene.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
scripts.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
shop.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_announcement.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_bag.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_battle_loading.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_buy_prop_screen.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_chat.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_common_item_info.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_common_reward.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_create_room.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_enter_room.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_mail.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_more_model.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_notice.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_player_info.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_searching_rival.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_set_room.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00
ui_settings.meta 多语言，创建账号流程 2025-02-17 21:36:37 +08:00