Commit Graph

9820 Commits (98e6123052373ce23d0b31e44cd30ffa0c57db2a)

Author SHA1 Message Date
PC-202302260912\Administrator 6d9e176164 优化页面1 2024-12-02 14:11:16 +08:00
PC-202302260912\Administrator a3d665513b 修改字体颜色 2024-11-16 15:54:43 +08:00
DESKTOP-RH64908\Administrator 838a42cfad Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/StreamingAssets/Android.meta
2024-11-22 20:14:14 +08:00
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
PC-202302260912\Administrator 8a1a77bd52 修改海贼相关引用 2024-11-22 20:05:41 +08:00
PC-202302260912\Administrator 99514e3422 更换按钮 2024-11-18 17:06:17 +08:00
zhangjiannan 5c9cd56597 1 2024-11-15 14:08:52 +08:00
zhangjiannan 84096616d2 修改挂机奖励按钮 2024-11-13 14:58:05 +08:00
PC-202302260912\Administrator 560050ddb2 1 2024-11-13 14:31:41 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
zhangjiannan 1212678fdb 1 2024-11-12 18:01:23 +08:00
zhangjiannan caec443165 1 2024-11-12 16:57:51 +08:00
zhangjiannan a5f5894185 1 2024-11-12 16:22:23 +08:00
zhangjiannan 24acdc63bd 1 2024-11-12 15:30:54 +08:00
PC-202302260912\Administrator ce56acfe48 战斗报错修正 2024-11-08 19:14:38 +08:00
PC-202302260912\Administrator 3c5fca333e 漏传的lua 2024-11-08 13:02:13 +08:00
DESKTOP-RH64908\Administrator a384bda644 差异meta上传 2024-11-08 11:13:44 +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 19c908f543 页面再次优化 2024-10-30 17:57:16 +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 e928165542 竞技场头像修改 2024-10-25 19:29:48 +08:00
zhangjiannan 37afbae4a5 1 2024-10-24 16:14:19 +08:00
zhangjiannan c3f6ca697b 1 2024-10-24 15:32:47 +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
zhangjiannan 8091b18371 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-21 14:44:48 +08:00
zhangjiannan 0434c4060f 1 2024-10-21 14:43:59 +08:00
PC-202302260912\Administrator bb9a718ade 优化页面 2024-10-20 14:39:00 +08:00
PC-202302260912\Administrator 00e453f708 优化页面 2024-10-16 17:58:13 +08:00
PC-202302260912\Administrator 700e9be6ec 强者招募券改为招募龙珠 2024-10-16 16:55:42 +08:00
DESKTOP-MMO982B\User 645fa025a8 1 2024-10-17 19:57:06 +08:00
zhangjiannan f5e0ae31d6 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-15 11:57:41 +08:00
zhangjiannan cabdcc8ddf 地图修改 2024-10-15 11:57:20 +08:00
PC-202302260912\Administrator 92782ed852 修改战斗页面 2024-10-14 11:48:06 +08:00
PC-202302260912\Administrator 9d07674d7d 修改页面 2024-10-14 11:34:01 +08:00
zhangjiannan ce0ee8ec33 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-11 19:11:55 +08:00
zhangjiannan 3287d0b938 龙珠修改 2024-10-11 19:11:47 +08:00
PC-202302260912\Administrator 8c0599853e 灵脉页面优化 2024-10-11 18:25:12 +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 67e966f3ab 1 2024-10-11 15:57:22 +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 46484359f7 页面优化 2024-10-09 19:39:19 +08:00
PC-202302260912\Administrator f7aa0a5134 优化页面 2024-10-09 16:02:10 +08:00