Commit Graph

96 Commits (c70d1b770010be0d9da170282a724a6016dd7f26)

Author SHA1 Message Date
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
PC-202302260912\Administrator 2ffaa9e7d5 银锭旋转 2023-09-20 17:17:36 +08:00
PC-202302260912\Administrator 24933b853c 修改头像 2023-08-31 21:51:08 +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 fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
PC-202302260912\Administrator 4f70ed6a2a 添加货币图片 2023-07-04 14:23:55 +08:00
lihaiyang 1b6edf1cee 新神兵 2023-06-02 15:43:36 +08:00
lihaiyang effa8b9dce 新增图标 2023-06-01 11:45:09 +08:00
lihaiyang 63fc1c6ee2 【天蓬】图标 2023-05-16 11:49:23 +08:00
lihaiyang a925e4f461 优化法宝图片 2023-04-21 11:00:03 +08:00
lihaiyang 9d60989032 更换法宝图标大小 2023-04-17 18:21:15 +08:00
lihaiyang 53f92c1562 【新将图标】 2023-04-17 17:26:50 +08:00
lihaiyang 531bada120 礼包图片 2023-04-12 16:45:39 +08:00
wangzhenxing 6d3fe931d3 [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
yuanshuai ac104c73ca 预设修改 2023-04-07 14:32:34 +08:00
lihaiyang d8a97002d5 神兵强化石 和货币上传 2023-04-07 10:21:41 +08:00
lihaiyang 8a737a3337 神兵图标 2023-03-24 17:52:32 +08:00
lihaiyang b6be5e9106 置换卡图片 2023-02-17 14:41:21 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
lihaiyang e6b6985ff0 法相宝箱 2023-02-16 14:33:34 +08:00
lihaiyang c2158cffde 法相强化石 2023-02-14 14:51:40 +08:00
yuanshuai 99a65d573a 挑战副本界面修改 2022-12-21 10:46:20 +08:00
lihaiyang 005c67d8c2 【GM余额】==========修正图标 2022-12-16 07:11:58 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
lihaiyang 4db7093fda 【图标】========添加代充券 2022-11-18 10:00:44 +08:00
lihaiyang 80ad0b4862 [技能】====飞升技能图标和名望经验 2022-11-02 18:09:51 +08:00
lihaiyang 55ce2188a9 欧皇红包图片上传 2022-10-17 15:33:24 +08:00
lihaiyang fd7a3214ad 添加四个直充卡图标 2022-10-13 15:50:44 +08:00
lihaiyang 702ad876a9 【添加图片】==============添加icon 2022-09-28 16:56:01 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing c4bb1948eb 新资源提交 2022-08-09 17:50:33 +08:00
yuanshuai e05cdfc388 数字游戏资源修改 2022-07-18 16:16:28 +08:00
luyao 5935f7a269 奇门遁甲资源2上传 2022-07-15 17:19:57 +08:00
luyao 97654a3f47 新宝物 奇门遁甲、东皇钟资源上传 2022-07-15 17:03:58 +08:00
lihaiyang 7186daf7f4 织女飞升图标 2022-06-10 11:46:48 +08:00
lihaiyang 5ca114484d 添加图片 2022-06-09 18:49:13 +08:00
jiaoyangna e8e381fb98 图片meta文件提交 2022-03-29 16:47:21 +08:00
luyao 6c50a54f5c 【阎魔王】技能图标上传 2022-03-15 14:47:24 +08:00
lihaiyang d8466e0676 【资源】====修行主角技能图片 2022-02-03 14:47:01 +08:00
zhangshanxue 18c1ef2de1 【物品】浮生门物品资源路径需修改 2022-01-14 17:23:40 +08:00
skuld 8f8e86d7c5 bat Resource Commit:2022/01/09, 4:55:32 2022-01-09 04:55:32 +08:00
skuld 7476af5fd9 bat Resource Commit:2021/12/18, 0:15:30 2021-12-18 00:15:31 +08:00
skuld d8979d77bc bat Resource Commit:2021/12/14,14:00:07 2021-12-14 14:00:07 +08:00
skuld e85d95b008 Revert "bat Resource Commit:2021/12/14,13:57:41"
This reverts commit c246aa8095.
2021-12-14 13:59:01 +08:00
skuld c246aa8095 bat Resource Commit:2021/12/14,13:57:41 2021-12-14 13:57:42 +08:00
wangzhenxing 8ccea4cf70 [资源]======牛魔王皮肤 头像 卡牌资源提交 2021-12-03 11:30:55 +08:00
luyao 158b202788 通天教主小头像方向反转左>右 2021-11-30 10:26:48 +08:00
luyao 5deba7853a 【资源】头像转向 2021-11-27 19:47:34 +08:00
luyao e4f02f3c7c 【神将头像t1左>右】【神将缩微图t3 部分左>右】 2021-11-27 16:16:01 +08:00