Commit Graph

13606 Commits (5c4e04a1be90a02a88d20fc41322c7c02f53aaa3)
 

Author SHA1 Message Date
xiejun 5c4e04a1be 修改代码 2023-09-19 18:56:46 +08:00
xiejun af6b341a0c 修改子弹逻辑 2023-09-18 15:41:32 +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
PC-202302260912\Administrator 72f8c9a5c7 漏一个 2023-09-12 14:22:03 +08:00
PC-202302260912\Administrator 68de6e2686 上传模型相关 2023-09-12 14:20:46 +08:00
PC-202302260912\Administrator 7ac17afab4 上传 2023-09-12 14:18:19 +08:00
PC-202302260912\Administrator 1811bde7d9 乌尔基 2023-09-12 14:16:26 +08:00
PC-202302260912\Administrator ce772773cc 上传模型 2023-09-12 14:12:31 +08:00
xiejun ccb0cd4838 修改混乱之后角色不行动的BUG 2023-09-11 17:59:32 +08:00
PC-202302260912\Administrator b7c638b8b7 图标修改 2023-09-08 17:26:39 +08:00
PC-202302260912\Administrator 253858dfba 黄猿图片 2023-09-04 21:39:41 +08:00
PC-202302260912\Administrator d2f39af497 阿龙上传 2023-09-04 20:10:53 +08:00
xiejun 363b5a3818 图鉴UI 2023-09-04 18:27:40 +08:00
xiejun 731ca32f5b 修改BUG 2023-09-04 15:40:11 +08:00
xiejun 3993a248c0 修改bUG 2023-09-04 15:21:09 +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
PC-202302260912\Administrator 4bfa80709f 修正头像 2023-09-02 19:17:32 +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
PC-202302260912\Administrator f4e90a59c4 新增图片 2023-09-02 16:12:34 +08:00
xiejun 1a34fec66e 修复bug 2023-09-01 20:18:46 +08:00
xiejun 83a8e9ab56 修改 2023-09-01 18:27:39 +08:00
PC-202302260912\Administrator 24933b853c 修改头像 2023-08-31 21:51:08 +08:00
xiejun 837e769c14 七界 2023-08-30 22:07:43 +08:00
xiejun e50aa15b47 修改代码 2023-08-30 21:33:02 +08:00
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