Commit Graph

553 Commits (1212678fdb31dcf827cb6699db45d1ae64c676db)

Author SHA1 Message Date
PC-202302260912\Administrator 4d72b97d7a 修改图片 2024-11-08 15:50:04 +08:00
PC-202302260912\Administrator c5df825104 修改页面 2024-11-08 14:27:58 +08:00
PC-202302260912\Administrator 6ddce72569 神印界面 2024-11-08 12:58:38 +08:00
PC-202302260912\Administrator ad7ca90ccb 漏传的图片 2024-11-04 20:32:17 +08:00
PC-202302260912\Administrator b85f1a1f1a 优化页面 2024-11-04 19:39:00 +08:00
PC-202302260912\Administrator b875c64b48 优化页面 2024-11-04 18:52:30 +08:00
PC-202302260912\Administrator ff73787a57 头替换 2024-11-04 18:30:08 +08:00
PC-202302260912\Administrator fef7707cc1 周卡 2024-11-07 15:22:27 +08:00
zhangjiannan d34fc37a50 挂机角色压缩 2024-11-06 15:28:47 +08:00
PC-202302260912\Administrator a7a29489a0 冲榜等图片优化 2024-11-02 11:25:45 +08:00
PC-202302260912\Administrator eb3e040ec5 删除无用图片 2024-11-02 11:05:37 +08:00
PC-202302260912\Administrator 6efa4d2789 修改图片 2024-11-01 14:17:45 +08:00
PC-202302260912\Administrator 8de323924e 替换按钮 2024-10-31 17:27:24 +08:00
PC-202302260912\Administrator b4f98b61e6 工会战页面修改 2024-10-30 19:32:08 +08:00
PC-202302260912\Administrator d0eb885d88 漏传的按钮修改 2024-10-30 17:36:48 +08:00
PC-202302260912\Administrator 2790e1be8d 优化部分页面 2024-10-30 17:17:21 +08:00
PC-202302260912\Administrator a843f164ac 优化页面 2024-10-30 15:43:35 +08:00
PC-202302260912\Administrator ae3c3d45d8 战斗和七界页面修改 2024-10-30 14:27:28 +08:00
PC-202302260912\Administrator 79032f7480 竞技场相关页面优化 2024-10-29 18:26:57 +08:00
PC-202302260912\Administrator 25539942ff 百抽页面修改 2024-10-29 17:32:18 +08:00
PC-202302260912\Administrator 16840d5d9e 漏传的图片修改 2024-10-24 19:09:43 +08:00
PC-202302260912\Administrator e59c2bd678 聊天背景上传 2024-10-24 15:31:29 +08:00
PC-202302260912\Administrator e33adf73b4 漏传的图片 2024-10-24 15:26:07 +08:00
PC-202302260912\Administrator db97daa792 龙珠相关上传 2024-10-24 14:53:28 +08:00
PC-202302260912\Administrator 959ffb9a23 图标错误修改 2024-10-21 19:23:47 +08:00
PC-202302260912\Administrator c573269695 页面优化 2024-10-21 18:42:21 +08:00
PC-202302260912\Administrator 7abcf61da2 修改礼包购买 2024-10-21 17:42:19 +08:00
PC-202302260912\Administrator ee44f8c130 修改等级提升页面 2024-10-21 17:32:56 +08:00
PC-202302260912\Administrator 571a67b46f 修改页面 2024-10-21 17:22:02 +08:00
PC-202302260912\Administrator bb9a718ade 优化页面 2024-10-20 14:39:00 +08:00
PC-202302260912\Administrator b42652e9cd 优化页面 2024-10-16 18:27:30 +08:00
PC-202302260912\Administrator 182954e571 鸿蒙杯 2024-10-16 18:19:44 +08:00
PC-202302260912\Administrator 00e453f708 优化页面 2024-10-16 17:58:13 +08:00
PC-202302260912\Administrator e8788d9a4e 更换图片 2024-10-16 17:33:16 +08:00
PC-202302260912\Administrator 438ab3edf5 优化页面 2024-10-16 16:26:42 +08:00
PC-202302260912\Administrator 9dd81f082d 鸿蒙塔相关 还有其余一些零碎修改 2024-10-14 17:34:32 +08:00
PC-202302260912\Administrator 3d9fb78989 战斗页面缺少的图 2024-10-14 14:16:49 +08:00
PC-202302260912\Administrator 91d3f61fbd 商店遗漏图片上传 2024-10-14 14:05:10 +08:00
PC-202302260912\Administrator 5db7e33db2 图片上传 2024-10-14 13:59:59 +08:00
PC-202302260912\Administrator 55c174594f 替换两张loading图 2024-10-14 13:33:42 +08:00
PC-202302260912\Administrator 9d07674d7d 修改页面 2024-10-14 11:34:01 +08:00
PC-202302260912\Administrator 13028d37d4 修改图片 2024-10-11 17:58:34 +08:00
PC-202302260912\Administrator 194d935bd7 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/BG/UI/1All/X1_shouzha_beijing_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_liebiao_07.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_yindao_duihuakuang_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_zhuangbei_pinzhidi.png.meta
2024-10-11 17:09:33 +08:00
PC-202302260912\Administrator b60c878050 冲突图片修改 2024-10-11 17:03:08 +08:00
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
zhangjiannan d82cdf1bfd Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-10 16:54:17 +08:00
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
PC-202302260912\Administrator 1a6a9d9e96 创建公会页面底图修改 2024-10-10 16:08:02 +08:00
PC-202302260912\Administrator 1b061bc2ef 商店页面图片修改 2024-10-10 16:01:03 +08:00
PC-202302260912\Administrator 365ee67b4e 活动修改 2024-10-09 18:00:38 +08:00