wangzhenxing
|
f2e064faf3
|
易经宝库修改
|
2023-09-21 15:17:39 +08:00 |
wangzhenxing
|
083305249a
|
银条添加加号
|
2023-09-20 19:02:41 +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 |
wangzhenxing
|
33419ff012
|
[战斗]====================效果添加163 164
|
2023-09-20 18:42:20 +08:00 |
xiejun
|
88740201b3
|
排行榜UI
|
2023-09-20 18:00:40 +08:00 |
wangzhenxing
|
ff5bcbced9
|
礼物合成显示秀嘎,添加礼物商店跳转
|
2023-09-20 17:40:33 +08:00 |
wangzhenxing
|
a9150906de
|
礼物红点修改提交
|
2023-09-20 16:55:15 +08:00 |
wangzhenxing
|
b8a15b703b
|
礼物特效层级修改提交
|
2023-09-20 16:33:01 +08:00 |
wangzhenxing
|
5f6d51786d
|
礼物显示修改
|
2023-09-20 15:41:36 +08:00 |
wangzhenxing
|
266c5b12af
|
礼物修改 点将神符不足弹出提示
|
2023-09-20 14:37:05 +08:00 |
wangzhenxing
|
e37b4befbd
|
礼物显示修改
|
2023-09-20 11:52:31 +08:00 |
wangzhenxing
|
f0919b9ce8
|
礼物红点提交
|
2023-09-20 11:28:57 +08:00 |
xiejun
|
5c4e04a1be
|
修改代码
|
2023-09-19 18:56:46 +08:00 |
wangzhenxing
|
bb1ea1c7f8
|
[战斗]=======================添加主角连击逻辑
|
2023-09-19 18:49:29 +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
|
551579ca39
|
星际显示添加空判断
(cherry picked from commit fd5cd6836c)
|
2023-09-15 18:02:50 +08:00 |
wangzhenxing
|
fd5cd6836c
|
星际显示添加空判断
|
2023-09-15 18:00:39 +08:00 |
wangzhenxing
|
e7a19ce338
|
灵兽升星修改
(cherry picked from commit 51003c0c8c)
|
2023-09-15 15:39:11 +08:00 |
wangzhenxing
|
51003c0c8c
|
灵兽升星修改
|
2023-09-15 15:15:11 +08:00 |
wangzhenxing
|
b368ef5fe0
|
礼物修改提交
|
2023-09-15 14:42:17 +08:00 |
wangzhenxing
|
e3a8cd725f
|
合并冲突提交
|
2023-09-15 14:24:03 +08:00 |
wangzhenxing
|
14ce1fedbd
|
时空神将推荐阵容显示修改提交
(cherry picked from commit 883f9af02e)
|
2023-09-15 14:18:47 +08:00 |
wangzhenxing
|
51dc91cbda
|
[战斗]=======================效果162 提交
(cherry picked from commit 56736a3aca)
|
2023-09-15 14:18:14 +08:00 |
wangzhenxing
|
acdb5a21cd
|
礼物修改提交
|
2023-09-15 14:11:14 +08:00 |
wangzhenxing
|
049cebd574
|
灵兽星际显示修改提交
|
2023-09-15 13:56:38 +08:00 |
wangzhenxing
|
883f9af02e
|
时空神将推荐阵容显示修改提交
|
2023-09-14 16:21:33 +08:00 |
wangzhenxing
|
56736a3aca
|
[战斗]=======================效果162 提交
|
2023-09-14 16:20:43 +08:00 |
wangzhenxing
|
e80056fcd4
|
查看礼物信息提交
|
2023-09-13 15:44:06 +08:00 |
wangzhenxing
|
eeb3859f72
|
礼物功能提交
|
2023-09-13 14:57:48 +08:00 |
xiejun
|
ccb0cd4838
|
修改混乱之后角色不行动的BUG
|
2023-09-11 17:59:32 +08:00 |
wangzhenxing
|
b2e7822bf1
|
【战斗】===============效果10修改提交
|
2023-09-08 14:09:13 +08:00 |
wangzhenxing
|
4b34e64de7
|
工会开启 工会技能
|
2023-09-06 15:11:01 +08:00 |
wangzhenxing
|
6085b2193a
|
多对塔挑战修改
|
2023-09-06 14:43:33 +08:00 |
wangzhenxing
|
2a5188a8fc
|
协议提交
|
2023-09-05 14:55:38 +08:00 |
wangzhenxing
|
db3b8d9562
|
【战斗】====================被动添加479
|
2023-09-04 18:45:16 +08:00 |
xiejun
|
363b5a3818
|
图鉴UI
|
2023-09-04 18:27:40 +08:00 |
wangzhenxing
|
c889e67a43
|
英雄属性详情界面去除工会技能跳转
|
2023-09-04 16:57:01 +08:00 |
xiejun
|
731ca32f5b
|
修改BUG
|
2023-09-04 15:40:11 +08:00 |
xiejun
|
3993a248c0
|
修改bUG
|
2023-09-04 15:21:09 +08:00 |
xiejun
|
3ab79a59b7
|
副本UI
|
2023-09-02 18:53:21 +08:00 |
xiejun
|
5b8ef487f7
|
御灵
|
2023-09-02 17:16:34 +08:00 |
wangzhenxing
|
241fda7f84
|
命石修改提交
|
2023-09-02 12:28:14 +08:00 |
wangzhenxing
|
c39a4e1fcc
|
命石修改提交
|
2023-09-01 23:41:45 +08:00 |
xiejun
|
1a34fec66e
|
修复bug
|
2023-09-01 20:18:46 +08:00 |
wangzhenxing
|
f792ab4c7d
|
命石修改
|
2023-09-01 19:35:49 +08:00 |
wangzhenxing
|
1318c74f59
|
红点修改提交
|
2023-09-01 19:26:54 +08:00 |
wangzhenxing
|
c9418f9821
|
命石奖励预设修改
|
2023-09-01 19:01:33 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
ffaab0f625
|
命石飘战力提交
|
2023-09-01 18:29:25 +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
|
0e083205a3
|
命格修改提交
|
2023-09-01 12:34:34 +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 |
wangzhenxing
|
e0cd811e75
|
百抽活动去掉时间显示
|
2023-08-31 10:31:27 +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 |
wangzhenxing
|
f9774fd187
|
百抽活动修改提交,最多只显示七天奖励
|
2023-08-29 18:58:09 +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 |
wangzhenxing
|
f838e2d0f2
|
轩辕宝镜修改
|
2023-08-29 15:21:53 +08:00 |
xiejun
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
wangzhenxing
|
4ade868f90
|
抽卡去掉妖精限制提示
|
2023-08-28 14:04:41 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
wangzhenxing
|
595487091b
|
【战斗】=======battlelogic修改
|
2023-08-25 18:58:32 +08:00 |
wangzhenxing
|
47edf3b630
|
【战斗】==================被动477 478修改
|
2023-08-25 18:32:56 +08:00 |
wangzhenxing
|
0d6566c725
|
【战斗】============被动472修改
|
2023-08-25 17:14:55 +08:00 |
wangzhenxing
|
d9778dbae4
|
【战斗】=================被动修改提交
|
2023-08-25 16:03:57 +08:00 |
wangzhenxing
|
91c292a809
|
[战斗]================被动475修改
|
2023-08-25 11:49:56 +08:00 |
wangzhenxing
|
d28ca0a5fb
|
【战斗】===============新英雄被动修改
|
2023-08-24 18:20:04 +08:00 |
wangzhenxing
|
461029ab50
|
[战斗]=================战斗battleutil 修改
|
2023-08-24 14:48:59 +08:00 |
wangzhenxing
|
4205ce3afc
|
[战斗]==============被动474修改
|
2023-08-24 10:27:30 +08:00 |
wangzhenxing
|
178ba22181
|
[战斗]======================时空女儿国王 新英雄提交
|
2023-08-23 16:33:16 +08:00 |
wangzhenxing
|
07ffec7f1f
|
【合服】=============登录协议添加serverid
|
2023-08-22 13:59:39 +08:00 |
xiejun
|
9d3234a34b
|
修改BUG
|
2023-08-18 21:40:29 +08:00 |
xiejun
|
65d783dae1
|
修改BUG
|
2023-08-18 17:55:02 +08:00 |
wangzhenxing
|
4e388c1923
|
礼包提示修改
|
2023-08-17 13:44:14 +08:00 |
xiejun
|
9b10e84e8c
|
去掉log
|
2023-08-16 15:49:41 +08:00 |
xiejun
|
15e6d575d0
|
修改战斗编辑器
|
2023-08-16 14:40:51 +08:00 |
xiejun
|
734cb92be9
|
去掉pating和spriteloader相关的代码
|
2023-08-16 11:55:55 +08:00 |
wangzhenxing
|
a2ed294523
|
英雄信息界面变身卡星级显示修改
|
2023-08-16 11:36:58 +08:00 |
xiejun
|
edebfb4d63
|
修改bug
|
2023-08-16 10:49:55 +08:00 |
xiejun
|
32d5e9bb97
|
修改BUG
|
2023-08-15 20:52:29 +08:00 |
xiejun
|
5d7fcc5aec
|
修改bug
|
2023-08-15 20:25:06 +08:00 |
xiejun
|
7a898b34a6
|
no message
|
2023-08-15 19:04:16 +08:00 |
xiejun
|
58f205f22b
|
新图标
|
2023-08-15 17:03:19 +08:00 |
xiejun
|
15b598237e
|
修改bug
|
2023-08-15 15:50:24 +08:00 |
xiejun
|
49df3050d1
|
代码
|
2023-08-15 13:31:06 +08:00 |
xiejun
|
bbde945918
|
新角色立绘
|
2023-08-15 12:36:04 +08:00 |
wangzhenxing
|
9cb8cd4b06
|
玩家战斗力计算提交注释
|
2023-08-14 16:15:07 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
wangzhenxing
|
67e00f2348
|
神兵上阵列表显示修改提交
|
2023-08-10 13:50:58 +08:00 |
wangzhenxing
|
bd11611e2d
|
易经宝库层级显示修改提交 最终大奖名字显示修改
|
2023-08-10 13:47:37 +08:00 |
wangzhenxing
|
14db632938
|
屏蔽宝物 树添加的属性==================战斗力不一致问题
|
2023-08-09 17:57:35 +08:00 |