Commit Graph

3913 Commits (55aa1ed9670416b4250c38f663045117f65b7741)

Author SHA1 Message Date
PC-202302260912\Administrator 34ba7a787d 月卡相关 2023-10-19 22:43:48 +08:00
xiejun 2212a7443d 邮件和邮件内容UI 2023-10-19 21:05:35 +08:00
xiejun bfbce921a3 屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑 2023-10-19 17:42:21 +08:00
xiejun 432fc640f3 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-18 20:45:10 +08:00
xiejun 077b82bd84 好友,公会副本等UI修改 2023-10-18 20:41:04 +08:00
wangzhenxing b7949c7e91 法灵信息界面提交 2023-10-18 17:28:34 +08:00
PC-202302260912\Administrator 70a04e965a 布鲁克相关 2023-10-17 15:33:44 +08:00
PC-202302260912\Administrator e54b9f5f58 图片和布鲁克相关 2023-10-17 14:33:47 +08:00
wangzhenxing 152e0bcde0 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-16 17:11:50 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
xiejun bb83290058 排行榜UI 2023-10-16 16:16:02 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
PC-202302260912\Administrator f39a4b6c20 资源上传 2023-10-19 11:53:27 +08:00
PC-202302260912\Administrator 8f9d608240 8个模型 2023-10-13 11:50:50 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
PC-202302260912\Administrator 54837f83b2 模型上传第一波 2023-10-12 17:49:35 +08:00
PC-202302260912\Administrator 975da0144f 小兵1相关 2023-10-11 14:42:47 +08:00
xiejun ff21cd74d2 竞技场部分预制体修改 2023-10-10 18:53:44 +08:00
wangzhenxing fff8911f19 英雄信息界面预设修改 2023-10-10 10:29:23 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +08:00
wangzhenxing de562386e0 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
2023-09-28 16:01:34 +08:00
wangzhenxing 1e1fd36489 玩家信息界面修改 2023-09-28 16:00:26 +08:00
wangzhenxing db71c4df20 神将主界面修改 2023-09-21 18:58:21 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
xiejun d53329f6fb 灵兽部分UI 2023-09-21 18:36:44 +08:00
wangzhenxing b0650bbb20 主角礼物显示修改 2023-09-21 16:41:59 +08:00
xiejun 253e73f8a4 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-09-20 18:58:27 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
PC-202302260912\Administrator 0ca224a599 乌索普添加 2023-09-20 18:06:04 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
wangzhenxing ff5bcbced9 礼物合成显示秀嘎,添加礼物商店跳转 2023-09-20 17:40:33 +08:00
wangzhenxing 266c5b12af 礼物修改 点将神符不足弹出提示 2023-09-20 14:37:05 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +08:00
wangzhenxing c037d9a2a2 玩家信息预设修改
(cherry picked from commit a6c2a99bbb)
2023-09-15 15:38:55 +08:00
wangzhenxing a6c2a99bbb 玩家信息预设修改 2023-09-15 14:58:13 +08:00
wangzhenxing e3a8cd725f 合并冲突提交 2023-09-15 14:24:03 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
PC-202302260912\Administrator dca95dff13 修改页面布局 2023-09-13 16:38:07 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
PC-202302260912\Administrator 739e495a60 罗杰相关 2023-09-12 16:19:20 +08:00
PC-202302260912\Administrator d6aa6d2c90 添加模型 2023-09-12 14:35:12 +08:00
xiejun 363b5a3818 图鉴UI 2023-09-04 18:27:40 +08:00
PC-202302260912\Administrator fcf92fcc50 添加动作 2023-09-04 14:51:27 +08:00
PC-202302260912\Administrator d73b462e1d 上传美术资源 2023-09-04 14:00:24 +08:00
xiejun 87bd10593d 工会 2023-09-02 18:59:49 +08:00
xiejun 3ab79a59b7 副本UI 2023-09-02 18:53:21 +08:00
xiejun c6d6e21e57 修改 2023-09-02 18:04:06 +08:00
xiejun 0a3533dbfe 挑战副本 2023-09-02 17:17:15 +08:00
xiejun 5b8ef487f7 御灵 2023-09-02 17:16:34 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
wangzhenxing c9418f9821 命石奖励预设修改 2023-09-01 19:01:33 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 5e1cc83b2a 命石修改提交 2023-08-31 15:20:27 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
xiejun 96efe07502 prefab布鲁克 2023-08-29 19:18:35 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
wangzhenxing 3037378c42 神将热榜, 图鉴预设修改提交 2023-08-23 16:04:46 +08:00
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
xiejun 21d0262140 修改预制体 2023-08-16 16:42:05 +08:00
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun 32d5e9bb97 修改BUG 2023-08-15 20:52:29 +08:00
xiejun 7a898b34a6 no message 2023-08-15 19:04:16 +08:00
xiejun 06733b98e2 配置 2023-08-15 17:36:26 +08:00
xiejun 01087658fc 公会UI 2023-08-15 16:26:36 +08:00
xiejun acefb9da0c 修改立绘 2023-08-15 14:11:32 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
wangzhenxing 3e08e50ea5 周卡预设修改提交 2023-08-11 19:25:16 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing 9b7627ffe0 商店界面预设修改提交 2023-07-31 18:12:46 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
wangzhenxing 5ac2ed1220 山河设计图添加关卡提示 2023-07-24 11:31:36 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator a1294d8746 天宫寻宝文字修改 2023-07-20 15:42:56 +08:00
PC-202302260912\Administrator da7727ba02 item预设特效显示修改 2023-07-18 16:09:16 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
PC-202302260912\Administrator 2082425679 抽卡界面预设修改,添加未开启信息提示 2023-07-17 17:38:43 +08:00
PC-202302260912\Administrator 65b4f5fc20 周卡活动名称修改 2023-07-17 14:48:27 +08:00
xiejun 937ec44bf5 立绘和代码修改 2023-07-13 14:38:34 +08:00
xiejun ab2e8eb833 增加技能特效spine 2023-07-06 14:08:10 +08:00
xiejun 17bf4a4e10 索隆的资源 2023-07-04 14:59:26 +08:00
xiejun 214151b5ca 修改 2023-07-04 10:28:57 +08:00
xiejun ab6a726b3a 增加凯多角色 2023-07-02 21:52:32 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
xiejun 0bb8dfbb6e 凱多的live2d 2023-06-29 15:04:58 +08:00