Commit Graph

13576 Commits (f42141a40eba0c7a3f3ae9acd12846b9f93673e4)
 

Author SHA1 Message Date
xiejun f42141a40e 修改灵兽代码 2023-08-30 21:31:29 +08:00
xiejun 87c1193f8b 修改BUG 2023-08-30 21:25:36 +08:00
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +08:00
PC-202302260912\Administrator bb967fb2b6 香克斯图片替换 2023-08-30 11:06:03 +08:00
PC-202302260912\Administrator e2ca24353a 布鲁克图片 2023-08-30 10:47:43 +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
PC-202302260912\Administrator a68e4b9326 上传图片 2023-08-29 14:52:10 +08:00
xiejun 4d8b08104c 七界资源 2023-08-28 18:52:15 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun 9d3234a34b 修改BUG 2023-08-18 21:40:29 +08:00
xiejun 65d783dae1 修改BUG 2023-08-18 17:55:02 +08:00
xiejun 21d0262140 修改预制体 2023-08-16 16:42:05 +08:00
xiejun 9b10e84e8c 去掉log 2023-08-16 15:49:41 +08:00
xiejun 46f5d0e897 路飞黑边 2023-08-16 15:08:37 +08:00
xiejun 15e6d575d0 修改战斗编辑器 2023-08-16 14:40:51 +08:00
xiejun 734cb92be9 去掉pating和spriteloader相关的代码 2023-08-16 11:55:55 +08:00
PC-202302260912\Administrator d54713749e 修改图片资源 2023-08-16 11:18:28 +08:00
xiejun edebfb4d63 修改bug 2023-08-16 10:49:55 +08:00
xiejun 636a7bc3eb 配置 2023-08-15 21:16:42 +08:00
xiejun 32d5e9bb97 修改BUG 2023-08-15 20:52:29 +08:00
PC-202302260912\Administrator 1209c49b97 修改图片 2023-08-15 20:46:43 +08:00
xiejun 5d7fcc5aec 修改bug 2023-08-15 20:25:06 +08:00
PC-202302260912\Administrator 00c5414b07 上传例会图片 2023-08-15 20:09:09 +08:00
PC-202302260912\Administrator 210bac8bfe Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-08-15 19:15:10 +08:00
PC-202302260912\Administrator 09d582af1e 立绘 2023-08-15 19:11:44 +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 58f205f22b 新图标 2023-08-15 17:03:19 +08:00
xiejun 01087658fc 公会UI 2023-08-15 16:26:36 +08:00
xiejun 73fea65fe8 立绘 2023-08-15 16:20:05 +08:00
xiejun 15b598237e 修改bug 2023-08-15 15:50:24 +08:00
xiejun 935b3ba42b 黑胡子 2023-08-15 15:30:06 +08:00
xiejun b089acd68c 修改 2023-08-15 15:08:56 +08:00
xiejun f20b9e3c02 修改表格 2023-08-15 14:37:14 +08:00
xiejun acefb9da0c 修改立绘 2023-08-15 14:11:32 +08:00
xiejun 49df3050d1 代码 2023-08-15 13:31:06 +08:00
xiejun bbde945918 新角色立绘 2023-08-15 12:36:04 +08:00
xiejun 19231ba20a 公会UI 2023-08-14 16:36:26 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
xiejun ed0681d015 路飞,萨博 2023-07-17 18:47:07 +08:00
xiejun 87dfec134c 修改代码 2023-07-13 17:04:48 +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